提交 f1531534 编写于 作者: M Minglei Jin

[TS-981]<fix>(other): allow dynamic config offlineInterval

上级 4f501850
...@@ -6392,6 +6392,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) { ...@@ -6392,6 +6392,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
const int tokenMonitor = 3; const int tokenMonitor = 3;
const int tokenDebugFlag = 4; const int tokenDebugFlag = 4;
const int tokenDebugFlagEnd = 20; const int tokenDebugFlagEnd = 20;
const int tokenOfflineInterval = 21;
const SDNodeDynConfOption cfgOptions[] = { const SDNodeDynConfOption cfgOptions[] = {
{"resetLog", 8}, {"resetQueryCache", 15}, {"balance", 7}, {"monitor", 7}, {"resetLog", 8}, {"resetQueryCache", 15}, {"balance", 7}, {"monitor", 7},
{"debugFlag", 9}, {"monDebugFlag", 12}, {"vDebugFlag", 10}, {"mDebugFlag", 10}, {"debugFlag", 9}, {"monDebugFlag", 12}, {"vDebugFlag", 10}, {"mDebugFlag", 10},
...@@ -6399,6 +6400,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) { ...@@ -6399,6 +6400,7 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
{"uDebugFlag", 10}, {"tsdbDebugFlag", 13}, {"sDebugflag", 10}, {"rpcDebugFlag", 12}, {"uDebugFlag", 10}, {"tsdbDebugFlag", 13}, {"sDebugflag", 10}, {"rpcDebugFlag", 12},
{"dDebugFlag", 10}, {"mqttDebugFlag", 13}, {"wDebugFlag", 10}, {"tmrDebugFlag", 12}, {"dDebugFlag", 10}, {"mqttDebugFlag", 13}, {"wDebugFlag", 10}, {"tmrDebugFlag", 12},
{"cqDebugFlag", 11}, {"cqDebugFlag", 11},
{"offlineInterval", 15},
}; };
SStrToken* pOptionToken = taosArrayGet(pOptions->a, 1); SStrToken* pOptionToken = taosArrayGet(pOptions->a, 1);
...@@ -6430,6 +6432,14 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) { ...@@ -6430,6 +6432,14 @@ int32_t validateDNodeConfig(SMiscInfo* pOptions) {
return TSDB_CODE_TSC_INVALID_OPERATION; // options value is invalid return TSDB_CODE_TSC_INVALID_OPERATION; // options value is invalid
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} else if ((strncasecmp(cfgOptions[tokenOfflineInterval].name, pOptionToken->z, pOptionToken->n) == 0) &&
(cfgOptions[tokenOfflineInterval].len == pOptionToken->n)) {
SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
int32_t val = strtol(pValToken->z, NULL, 10);
if (val < 1 || val > 600) {
return TSDB_CODE_TSC_INVALID_OPERATION; // options value is invalid
}
return TSDB_CODE_SUCCESS;
} else { } else {
SStrToken* pValToken = taosArrayGet(pOptions->a, 2); SStrToken* pValToken = taosArrayGet(pOptions->a, 2);
......
...@@ -51,7 +51,7 @@ sleep 1000 ...@@ -51,7 +51,7 @@ sleep 1000
sql connect sql connect
sleep 1000 sleep 1000
sql create dnode $hostname2 sql create dnode $hostname2
sleep 1000 sleep 3000
print ============== step2: create database with replica 2, and create table, insert data print ============== step2: create database with replica 2, and create table, insert data
$totalTableNum = 10 $totalTableNum = 10
...@@ -272,4 +272,4 @@ system sh/exec.sh -n dnode4 -s stop -x SIGINT ...@@ -272,4 +272,4 @@ system sh/exec.sh -n dnode4 -s stop -x SIGINT
system sh/exec.sh -n dnode5 -s stop -x SIGINT system sh/exec.sh -n dnode5 -s stop -x SIGINT
system sh/exec.sh -n dnode6 -s stop -x SIGINT system sh/exec.sh -n dnode6 -s stop -x SIGINT
system sh/exec.sh -n dnode7 -s stop -x SIGINT system sh/exec.sh -n dnode7 -s stop -x SIGINT
system sh/exec.sh -n dnode8 -s stop -x SIGINT system sh/exec.sh -n dnode8 -s stop -x SIGINT
\ No newline at end of file
...@@ -51,7 +51,7 @@ sleep 1000 ...@@ -51,7 +51,7 @@ sleep 1000
sql connect sql connect
sleep 1000 sleep 1000
sql create dnode $hostname2 sql create dnode $hostname2
sleep 1000 sleep 2000
print ============== step2: create database with replica 2, and create table, insert data print ============== step2: create database with replica 2, and create table, insert data
$totalTableNum = 10 $totalTableNum = 10
...@@ -268,4 +268,4 @@ system sh/exec.sh -n dnode4 -s stop -x SIGINT ...@@ -268,4 +268,4 @@ system sh/exec.sh -n dnode4 -s stop -x SIGINT
system sh/exec.sh -n dnode5 -s stop -x SIGINT system sh/exec.sh -n dnode5 -s stop -x SIGINT
system sh/exec.sh -n dnode6 -s stop -x SIGINT system sh/exec.sh -n dnode6 -s stop -x SIGINT
system sh/exec.sh -n dnode7 -s stop -x SIGINT system sh/exec.sh -n dnode7 -s stop -x SIGINT
system sh/exec.sh -n dnode8 -s stop -x SIGINT system sh/exec.sh -n dnode8 -s stop -x SIGINT
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册