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

fix recovery_get_global_full_filename

pull/484/head
YuQing 2019-12-04 20:00:34 +08:00
parent edb3f6bb4d
commit 856ef15ab7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storage/storage_disk_recovery.c
View File

@ -104,7 +104,7 @@ static inline char *recovery_get_global_full_filename(const char *pBasePath,
const char *filename, char *full_filename) const char *filename, char *full_filename)
{ {
return recovery_get_full_filename_ex(pBasePath, -1, return recovery_get_full_filename_ex(pBasePath, -1,
RECOVERY_FLAG_FILENAME, full_filename); filename, full_filename);
} }
static inline char *recovery_get_global_binlog_filename(const char *pBasePath, static inline char *recovery_get_global_binlog_filename(const char *pBasePath,
@ -1266,6 +1266,7 @@ static int storage_disk_recovery_do_restore(const char *pBasePath)
int bytes; int bytes;
int i; int i;
int k; int k;
int sig;
pthread_t *recovery_tids; pthread_t *recovery_tids;
void **args; void **args;
RecoveryThreadData *thread_data; RecoveryThreadData *thread_data;
@ -1329,7 +1330,10 @@ static int storage_disk_recovery_do_restore(const char *pBasePath)
if (__sync_fetch_and_add(&current_recovery_thread_count, 0) > 0) if (__sync_fetch_and_add(&current_recovery_thread_count, 0) > 0)
{ {
for (i=0; i<30; i++) #define MAX_WAIT_COUNT 30
sig = SIGINT;
for (i=0; i<MAX_WAIT_COUNT; i++)
{ {
if ((thread_count=__sync_fetch_and_add( if ((thread_count=__sync_fetch_and_add(
&current_recovery_thread_count, 0)) == 0) &current_recovery_thread_count, 0)) == 0)
@ -1337,11 +1341,16 @@ static int storage_disk_recovery_do_restore(const char *pBasePath)
break; break;
} }
if (i >= MAX_WAIT_COUNT / 2)
{
sig = SIGTERM;
}
for (k=0; k<g_disk_recovery_threads; k++) for (k=0; k<g_disk_recovery_threads; k++)
{ {
if (__sync_fetch_and_add(&thread_data[k].alive, 0) > 0) if (__sync_fetch_and_add(&thread_data[k].alive, 0) > 0)
{ {
pthread_kill(thread_data[k].tid, SIGINT); pthread_kill(thread_data[k].tid, sig);
} }
} }