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

Merge pull request #1578 from taosdata/hotfix/releasevnode 

turn on the arbitrator code
This commit is contained in:
slguan 2020-04-10 15:47:01 +08:00 committed by GitHub
parent 88b06baf89 e4d2b5bb5e
commit 8f13b5022f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/inc/tsync.h
View File

@ -99,6 +99,7 @@ extern int tsMaxSyncNum;
extern int tsSyncTcpThreads; extern int tsSyncTcpThreads;
extern int tsMaxWatchFiles; extern int tsMaxWatchFiles;
extern short tsSyncPort; extern short tsSyncPort;
extern int tsSyncTimer;
extern int tsMaxFwdInfo; extern int tsMaxFwdInfo;
extern int sDebugFlag; extern int sDebugFlag;

2
src/vnode/main/src/vnodeMain.c
View File

@ -375,7 +375,7 @@ static int32_t vnodeReadCfg(SVnodeObj *pVnode) {
if (num != 2) return TSDB_CODE_INVALID_FILE_FORMAT; if (num != 2) return TSDB_CODE_INVALID_FILE_FORMAT;
if (strcmp(option[0], "arbitratorIp") != 0) return TSDB_CODE_INVALID_FILE_FORMAT; if (strcmp(option[0], "arbitratorIp") != 0) return TSDB_CODE_INVALID_FILE_FORMAT;
if (arbitratorIp == -1) return TSDB_CODE_INVALID_FILE_FORMAT; if (arbitratorIp == -1) return TSDB_CODE_INVALID_FILE_FORMAT;
pVnode->syncCfg.arbitratorIp = 0; pVnode->syncCfg.arbitratorIp = arbitratorIp;
int32_t quorum = -1; int32_t quorum = -1;
num = fscanf(fp, "%s %d", option[0], &quorum); num = fscanf(fp, "%s %d", option[0], &quorum);