Merge branch 'feature/sync2-merge' of https://github.com/taosdata/TDengine into feature/sync2-merge

2022-10-21 15:47:51 +08:00 · 2022-10-21 15:47:51 +08:00 · 40ec6ba970
parent 11a4ef3508 b8fdafe8ee
commit 40ec6ba970
2 changed files with 2 additions and 2 deletions
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@ -2065,7 +2065,7 @@ static bool syncIsConfigChanged(const SSyncCfg* pOldCfg, const SSyncCfg* pNewCfg

 void syncNodeDoConfigChange(SSyncNode* pSyncNode, SSyncCfg* pNewConfig, SyncIndex lastConfigChangeIndex) {
  SSyncCfg oldConfig = pSyncNode->pRaftCfg->cfg;
-#if 0 
+#if 1
  if (!syncIsConfigChanged(&oldConfig, pNewConfig)) {
    sInfo("vgId:1, sync not reconfig since not changed");
    return;
--- a/tests/script/tsim/mnode/basic5.sim
+++ b/tests/script/tsim/mnode/basic5.sim
@ -183,7 +183,7 @@ $x = 0
 step71: 
 	$x = $x + 1
 	sleep 1000
-	if $x == 10 then
+	if $x == 50 then
 		return -1
 	endi
 sql select * from information_schema.ins_dnodes