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

remove recovery_init_flag_file_ex

pull/484/head
YuQing 2019-12-05 12:04:30 +08:00
parent a424a06cf3
commit 983a21ba51
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
storage/storage_disk_recovery.c
View File

@ -495,7 +495,7 @@ static int recovery_init_global_binlog_file(const char *pBasePath)
return writeToFile(full_binlog_filename, buff, 0); return writeToFile(full_binlog_filename, buff, 0);
} }
static int recovery_init_flag_file_ex(const char *pBasePath, static int recovery_init_flag_file(const char *pBasePath,
const bool fetch_binlog_done, const int recovery_threads) const bool fetch_binlog_done, const int recovery_threads)
{ {
char full_filename[MAX_PATH_SIZE]; char full_filename[MAX_PATH_SIZE];
@ -505,13 +505,6 @@ static int recovery_init_flag_file_ex(const char *pBasePath,
fetch_binlog_done, recovery_threads); fetch_binlog_done, recovery_threads);
} }
static inline int recovery_init_flag_file(const char *pBasePath,
const bool fetch_binlog_done, const int recovery_threads)
{
return recovery_init_flag_file_ex(pBasePath,
fetch_binlog_done, recovery_threads);
}
static int recovery_load_params_from_flag_file(const char *full_flag_filename) static int recovery_load_params_from_flag_file(const char *full_flag_filename)
{ {
IniContext iniContext; IniContext iniContext;
@ -1017,7 +1010,7 @@ static int storage_disk_recovery_old_version_migrate(const char *pBasePath)
return result; return result;
} }
if ((result=recovery_init_flag_file_ex(pBasePath, true, 1)) != 0) if ((result=recovery_init_flag_file(pBasePath, true, 1)) != 0)
{ {
return result; return result;
} }