pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set schedule id by sched_generate_next_id()

use_libserverframe
YuQing 2022-09-13 20:35:09 +08:00
parent d7c0594565
commit c6a92de3d2
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storage/fdfs_storaged.c
View File

@ -242,7 +242,6 @@ int main(int argc, char *argv[])
return result; return result;
} }
if ((result=setup_schedule_tasks()) != 0) if ((result=setup_schedule_tasks()) != 0)
{ {
logCrit("exit abnormally!\n"); logCrit("exit abnormally!\n");
@ -430,19 +429,19 @@ static int setup_schedule_tasks()
memset(scheduleEntries, 0, sizeof(scheduleEntries)); memset(scheduleEntries, 0, sizeof(scheduleEntries));
INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, TIME_NONE, TIME_NONE, TIME_NONE, sched_generate_next_id(), TIME_NONE, TIME_NONE, TIME_NONE,
g_sync_binlog_buff_interval, fdfs_binlog_sync_func, NULL); g_sync_binlog_buff_interval, fdfs_binlog_sync_func, NULL);
scheduleArray.count++; scheduleArray.count++;
INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, TIME_NONE, TIME_NONE, TIME_NONE, sched_generate_next_id(), TIME_NONE, TIME_NONE, TIME_NONE,
g_sync_stat_file_interval, fdfs_stat_file_sync_func, NULL); g_sync_stat_file_interval, fdfs_stat_file_sync_func, NULL);
scheduleArray.count++; scheduleArray.count++;
if (g_if_use_trunk_file) if (g_if_use_trunk_file)
{ {
INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, TIME_NONE, TIME_NONE, TIME_NONE, sched_generate_next_id(), TIME_NONE, TIME_NONE, TIME_NONE,
1, trunk_binlog_sync_func, NULL); 1, trunk_binlog_sync_func, NULL);
scheduleArray.count++; scheduleArray.count++;
} }
@ -450,7 +449,7 @@ static int setup_schedule_tasks()
if (g_use_access_log) if (g_use_access_log)
{ {
INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, TIME_NONE, TIME_NONE, TIME_NONE, sched_generate_next_id(), TIME_NONE, TIME_NONE, TIME_NONE,
g_sf_global_vars.error_log.sync_log_buff_interval, g_sf_global_vars.error_log.sync_log_buff_interval,
log_sync_func, &g_access_log_context); log_sync_func, &g_access_log_context);
scheduleArray.count++; scheduleArray.count++;
@ -458,7 +457,7 @@ static int setup_schedule_tasks()
if (g_rotate_access_log) if (g_rotate_access_log)
{ {
INIT_SCHEDULE_ENTRY_EX(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY_EX(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, g_access_log_rotate_time, sched_generate_next_id(), g_access_log_rotate_time,
24 * 3600, log_notify_rotate, &g_access_log_context); 24 * 3600, log_notify_rotate, &g_access_log_context);
scheduleArray.count++; scheduleArray.count++;
@ -468,7 +467,7 @@ static int setup_schedule_tasks()
g_sf_global_vars.error_log.keep_days); g_sf_global_vars.error_log.keep_days);
INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, 1, 0, 0, 24 * 3600, sched_generate_next_id(), 1, 0, 0, 24 * 3600,
log_delete_old_files, &g_access_log_context); log_delete_old_files, &g_access_log_context);
scheduleArray.count++; scheduleArray.count++;
} }
@ -478,7 +477,7 @@ static int setup_schedule_tasks()
if (g_compress_binlog) if (g_compress_binlog)
{ {
INIT_SCHEDULE_ENTRY_EX(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY_EX(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, g_compress_binlog_time, sched_generate_next_id(), g_compress_binlog_time,
24 * 3600, fdfs_binlog_compress_func, NULL); 24 * 3600, fdfs_binlog_compress_func, NULL);
scheduleArray.count++; scheduleArray.count++;
} }

6
tracker/fdfs_trackerd.c
View File

@ -125,7 +125,7 @@ static int setup_signal_handlers()
static int setup_schedule_tasks() static int setup_schedule_tasks()
{ {
#define SCHEDULE_ENTRIES_COUNT 5 #define SCHEDULE_ENTRIES_COUNT 4
ScheduleEntry scheduleEntries[SCHEDULE_ENTRIES_COUNT]; ScheduleEntry scheduleEntries[SCHEDULE_ENTRIES_COUNT];
ScheduleArray scheduleArray; ScheduleArray scheduleArray;
@ -134,12 +134,12 @@ static int setup_schedule_tasks()
memset(scheduleEntries, 0, sizeof(scheduleEntries)); memset(scheduleEntries, 0, sizeof(scheduleEntries));
INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, TIME_NONE, TIME_NONE, TIME_NONE, sched_generate_next_id(), TIME_NONE, TIME_NONE, TIME_NONE,
g_check_active_interval, tracker_mem_check_alive, NULL); g_check_active_interval, tracker_mem_check_alive, NULL);
scheduleArray.count++; scheduleArray.count++;
INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count], INIT_SCHEDULE_ENTRY(scheduleEntries[scheduleArray.count],
scheduleArray.count + 1, 0, 0, 0, sched_generate_next_id(), 0, 0, 0,
TRACKER_SYNC_STATUS_FILE_INTERVAL, TRACKER_SYNC_STATUS_FILE_INTERVAL,
tracker_write_status_to_file, NULL); tracker_write_status_to_file, NULL);
scheduleArray.count++; scheduleArray.count++;