fix compile errors
This commit is contained in:
parent
0dddcdfbeb
commit
89a19fdbe1
|
@ -21,8 +21,8 @@ extern "C" {
|
|||
#endif
|
||||
#include "dnodeInt.h"
|
||||
|
||||
int32_t dnodeInitMsg();
|
||||
void dnodeCleanupMsg();
|
||||
int32_t dnodeInitDnode();
|
||||
void dnodeCleanupDnode();
|
||||
void dnodeProcessStatusRsp(SRpcMsg *pMsg);
|
||||
void dnodeProcessStartupReq(SRpcMsg *pMsg);
|
||||
void dnodeProcessConfigDnodeReq(SRpcMsg *pMsg);
|
||||
|
|
|
@ -21,8 +21,8 @@ extern "C" {
|
|||
#endif
|
||||
#include "dnodeInt.h"
|
||||
|
||||
int32_t dnodeInitMsg();
|
||||
void dnodeCleanupMsg();
|
||||
int32_t dnodeInitDnode();
|
||||
void dnodeCleanupDnode();
|
||||
void dnodeProcessStatusRsp(SRpcMsg *pMsg);
|
||||
void dnodeProcessStartupReq(SRpcMsg *pMsg);
|
||||
void dnodeProcessCreateMnodeReq(SRpcMsg *pMsg);
|
||||
|
|
|
@ -30,7 +30,7 @@ static struct {
|
|||
pthread_mutex_t mutex;
|
||||
} tsConfig;
|
||||
|
||||
vstaticoid dnodeGetEpSetForPeer(SRpcEpSet *epSet) {
|
||||
void dnodeGetEpSetForPeer(SRpcEpSet *epSet) {
|
||||
pthread_mutex_lock(&tsConfig.mutex);
|
||||
*epSet = tsConfig.mnodeEpSetForPeer;
|
||||
pthread_mutex_unlock(&tsConfig.mutex);
|
||||
|
|
|
@ -25,7 +25,7 @@ static struct {
|
|||
pthread_t *threadId;
|
||||
bool stop;
|
||||
uint32_t rebootTime;
|
||||
} tsMsg;
|
||||
} tsDnode;
|
||||
|
||||
static void dnodeSendStatusMsg() {
|
||||
int32_t contLen = sizeof(SStatusMsg) + TSDB_MAX_VNODES * sizeof(SVnodeLoad);
|
||||
|
@ -39,7 +39,7 @@ static void dnodeSendStatusMsg() {
|
|||
pStatus->dnodeId = htonl(dnodeGetDnodeId());
|
||||
tstrncpy(pStatus->dnodeEp, tsLocalEp, TSDB_EP_LEN);
|
||||
pStatus->clusterId = htobe64(dnodeGetClusterId());
|
||||
pStatus->lastReboot = htonl(tsMsg.rebootTime);
|
||||
pStatus->lastReboot = htonl(tsDnode.rebootTime);
|
||||
pStatus->numOfCores = htonl(tsNumOfCores);
|
||||
pStatus->diskAvailable = tsAvailDataDirGB;
|
||||
|
||||
|
@ -93,17 +93,17 @@ void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
|
|||
|
||||
static void *dnodeThreadRoutine(void *param) {
|
||||
int32_t ms = tsStatusInterval * 1000;
|
||||
while (!tsMsg.stop) {
|
||||
while (!tsDnode.stop) {
|
||||
taosMsleep(ms);
|
||||
dnodeSendStatusMsg();
|
||||
}
|
||||
}
|
||||
|
||||
int32_t dnodeInitMsg() {
|
||||
tsMsg.stop = false;
|
||||
tsMsg.rebootTime = taosGetTimestampSec();
|
||||
tsMsg.threadId = taosCreateThread(dnodeThreadRoutine, NULL);
|
||||
if (tsMsg.threadId == NULL) {
|
||||
int32_t dnodeInitDnode() {
|
||||
tsDnode.stop = false;
|
||||
tsDnode.rebootTime = taosGetTimestampSec();
|
||||
tsDnode.threadId = taosCreateThread(dnodeThreadRoutine, NULL);
|
||||
if (tsDnode.threadId == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -111,11 +111,11 @@ int32_t dnodeInitMsg() {
|
|||
return 0;
|
||||
}
|
||||
|
||||
void dnodeCleanupMsg() {
|
||||
if (tsMsg.threadId != NULL) {
|
||||
tsMsg.stop = true;
|
||||
taosDestoryThread(tsMsg.threadId);
|
||||
tsMsg.threadId = NULL;
|
||||
void dnodeCleanupDnode() {
|
||||
if (tsDnode.threadId != NULL) {
|
||||
tsDnode.stop = true;
|
||||
taosDestoryThread(tsDnode.threadId);
|
||||
tsDnode.threadId = NULL;
|
||||
}
|
||||
|
||||
dInfo("dnode msg is cleanuped");
|
||||
|
|
|
@ -31,27 +31,27 @@ static struct {
|
|||
EDnStat runStatus;
|
||||
SStartupStep startup;
|
||||
SSteps *steps;
|
||||
} tsDnode;
|
||||
} tsInt;
|
||||
|
||||
EDnStat dnodeGetRunStat() { return tsDnode.runStatus; }
|
||||
EDnStat dnodeGetRunStat() { return tsInt.runStatus; }
|
||||
|
||||
void dnodeSetRunStat(EDnStat stat) { tsDnode.runStatus = stat; }
|
||||
void dnodeSetRunStat(EDnStat stat) { tsInt.runStatus = stat; }
|
||||
|
||||
void dnodeReportStartup(char *name, char *desc) {
|
||||
SStartupStep *startup = &tsDnode.startup;
|
||||
SStartupStep *startup = &tsInt.startup;
|
||||
tstrncpy(startup->name, name, strlen(startup->name));
|
||||
tstrncpy(startup->desc, desc, strlen(startup->desc));
|
||||
startup->finished = 0;
|
||||
}
|
||||
|
||||
static void dnodeReportStartupFinished(char *name, char *desc) {
|
||||
SStartupStep *startup = &tsDnode.startup;
|
||||
SStartupStep *startup = &tsInt.startup;
|
||||
tstrncpy(startup->name, name, strlen(startup->name));
|
||||
tstrncpy(startup->desc, desc, strlen(startup->desc));
|
||||
startup->finished = 1;
|
||||
}
|
||||
|
||||
void dnodeGetStartup(SStartupStep *pStep) { memcpy(pStep, &tsDnode.startup, sizeof(SStartupStep)); }
|
||||
void dnodeGetStartup(SStartupStep *pStep) { memcpy(pStep, &tsInt.startup, sizeof(SStartupStep)); }
|
||||
|
||||
static int32_t dnodeInitVnode() {
|
||||
return vnodeInit();
|
||||
|
@ -72,7 +72,7 @@ static int32_t dnodeInitMnode() {
|
|||
static int32_t dnodeInitTfs() {}
|
||||
|
||||
static int32_t dnodeInitMain() {
|
||||
tsDnode.runStatus = DN_RUN_STAT_STOPPED;
|
||||
tsInt.runStatus = DN_RUN_STAT_STOPPED;
|
||||
tscEmbedded = 1;
|
||||
taosIgnSIGPIPE();
|
||||
taosBlockSIGPIPE();
|
||||
|
@ -175,10 +175,10 @@ int32_t dnodeInit() {
|
|||
taosStepAdd(steps, "dnode-vnode", dnodeInitVnode, vnodeCleanup);
|
||||
taosStepAdd(steps, "dnode-mnode", dnodeInitMnode, mnodeCleanup);
|
||||
taosStepAdd(steps, "dnode-trans", dnodeInitTrans, dnodeCleanupTrans);
|
||||
taosStepAdd(steps, "dnode-msg", dnodeInitMsg, dnodeCleanupMsg);
|
||||
taosStepAdd(steps, "dnode-msg", dnodeInitDnode, dnodeCleanupDnode);
|
||||
|
||||
tsDnode.steps = steps;
|
||||
taosStepExec(tsDnode.steps);
|
||||
tsInt.steps = steps;
|
||||
taosStepExec(tsInt.steps);
|
||||
|
||||
dnodeSetRunStat(DN_RUN_STAT_RUNNING);
|
||||
dnodeReportStartupFinished("TDengine", "initialized successfully");
|
||||
|
@ -190,8 +190,8 @@ int32_t dnodeInit() {
|
|||
void dnodeCleanup() {
|
||||
if (dnodeGetRunStat() != DN_RUN_STAT_STOPPED) {
|
||||
dnodeSetRunStat(DN_RUN_STAT_STOPPED);
|
||||
taosStepCleanup(tsDnode.steps);
|
||||
tsDnode.steps = NULL;
|
||||
taosStepCleanup(tsInt.steps);
|
||||
tsInt.steps = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue