xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Rename dnode initialization path. 

Per reviews from Jeff, rename dnode initialization path as he suggested.
This commit is contained in:
yifan hao 2020-05-05 20:31:38 -06:00
parent e061343664
commit 86cbe53fb1
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dnode/src/dnodeMain.c
View File

@ -41,16 +41,16 @@ static void dnodeSetRunStatus(SDnodeRunStatus status);
static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context); static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context);
static void dnodeCheckDataDirOpenned(char *dir); static void dnodeCheckDataDirOpenned(char *dir);
static SDnodeRunStatus tsDnodeRunStatus = TSDB_DNODE_RUN_STATUS_STOPPED; static SDnodeRunStatus tsDnodeRunStatus = TSDB_DNODE_RUN_STATUS_STOPPED;
static int32_t dnodeInitSteps(); static int32_t dnodeInitComponents();
static void dnodeCleanupSteps(int32_t stepId); static void dnodeCleanupComponents(int32_t stepId);
typedef struct { typedef struct {
const char *const name; const char *const name;
int (*init)(); int (*init)();
void (*cleanup)(); void (*cleanup)();
} DnodeStep; } SDnodeComponent;
static const DnodeStep DnodeSteps[] = { static const SDnodeComponent SDnodeComponents[] = {
{"storage", dnodeInitStorage, dnodeCleanupStorage}, {"storage", dnodeInitStorage, dnodeCleanupStorage},
{"read", dnodeInitRead, dnodeCleanupRead}, {"read", dnodeInitRead, dnodeCleanupRead},
{"write", dnodeInitWrite, dnodeCleanupWrite}, {"write", dnodeInitWrite, dnodeCleanupWrite},
@ -152,17 +152,17 @@ static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context) {
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
static void dnodeCleanupSteps(int32_t stepId) { static void dnodeCleanupComponents(int32_t stepId) {
for (int32_t i = stepId; i >= 0; i--) { for (int32_t i = stepId; i >= 0; i--) {
DnodeSteps[i].cleanup(); SDnodeComponents[i].cleanup();
} }
} }
static int32_t dnodeInitSteps() { static int32_t dnodeInitComponents() {
int32_t code = 0; int32_t code = 0;
for (int32_t i = 0; i < sizeof(DnodeSteps) / sizeof(DnodeSteps[0]); i++) { for (int32_t i = 0; i < sizeof(SDnodeComponents) / sizeof(SDnodeComponents[0]); i++) {
if (DnodeSteps[i].init() != 0) { if (SDnodeComponents[i].init() != 0) {
dnodeCleanupSteps(i); dnodeCleanupComponents(i);
code = -1; code = -1;
break; break;
} }
@ -199,7 +199,7 @@ static int32_t dnodeInitSystem() {
dPrint("start to initialize TDengine on %s", tsLocalEp); dPrint("start to initialize TDengine on %s", tsLocalEp);
if (dnodeInitSteps() != 0) { if (dnodeInitComponents() != 0) {
return -1; return -1;
} }
@ -214,7 +214,7 @@ static int32_t dnodeInitSystem() {
static void dnodeCleanUpSystem() { static void dnodeCleanUpSystem() {
if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_STOPPED) { if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_STOPPED) {
dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_STOPPED); dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_STOPPED);
dnodeCleanupSteps(sizeof(DnodeSteps) / sizeof(DnodeSteps[0]) - 1); dnodeCleanupComponents(sizeof(SDnodeComponents) / sizeof(SDnodeComponents[0]) - 1);
taos_cleanup(); taos_cleanup();
} }
} }