diff --git a/HISTORY b/HISTORY index f8bf7f4..0df7ff1 100644 --- a/HISTORY +++ b/HISTORY @@ -1,8 +1,10 @@ -Version 5.07 2015-08-14 +Version 5.07 2015-08-15 * schedule task add the "second" field * make.sh changed, you must upgrade libfastcommon to V1.20 or later * bug fixed: storage_disk_recovery.c skip the first file (binlog first line) + * bug fixed: should close connection after fetch binlog + * fdfs_storaged.c: advance the position of daemon_init Version 5.06 2015-05-12 * compile passed in mac OS Darwin diff --git a/storage/fdfs_storaged.c b/storage/fdfs_storaged.c index 7ad74df..7cf38bd 100644 --- a/storage/fdfs_storaged.c +++ b/storage/fdfs_storaged.c @@ -144,6 +144,9 @@ int main(int argc, char *argv[]) } #endif + daemon_init(false); + umask(0); + memset(g_bind_addr, 0, sizeof(g_bind_addr)); if ((result=storage_func_init(conf_filename, \ g_bind_addr, sizeof(g_bind_addr))) != 0) @@ -168,8 +171,6 @@ int main(int argc, char *argv[]) return result; } - daemon_init(false); - umask(0); if ((result=write_to_pid_file(pidFilename)) != 0) { log_destroy(); diff --git a/storage/storage_disk_recovery.c b/storage/storage_disk_recovery.c index 9c5445c..859c34d 100644 --- a/storage/storage_disk_recovery.c +++ b/storage/storage_disk_recovery.c @@ -1117,7 +1117,7 @@ int storage_disk_recovery_start(const int store_path_index) } result = storage_do_fetch_binlog(pStorageConn, store_path_index); - tracker_disconnect_server(pStorageConn, true); + tracker_disconnect_server_ex(pStorageConn, true); if (result != 0) { return result;