diff --git a/include/common/tglobal.h b/include/common/tglobal.h index 501f1cabc1..0800b3ea50 100644 --- a/include/common/tglobal.h +++ b/include/common/tglobal.h @@ -291,7 +291,6 @@ extern int tsStreamAggCnt; extern bool tsFilterScalarMode; extern int32_t tsMaxStreamBackendCache; extern int32_t tsPQSortMemThreshold; -extern int32_t tsResolveFQDNRetryTime; extern bool tsStreamCoverage; extern int8_t tsS3EpNum; diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index c58ad32a18..355a34d05b 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -327,7 +327,6 @@ char tsUdfdLdLibPath[512] = ""; bool tsDisableStream = false; int64_t tsStreamBufferSize = 128 * 1024 * 1024; bool tsFilterScalarMode = false; -int tsResolveFQDNRetryTime = 100; // seconds int tsStreamAggCnt = 100000; bool tsStreamCoverage = false; @@ -956,7 +955,6 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { TAOS_CHECK_RETURN(cfgAddBool(pCfg, "filterScalarMode", tsFilterScalarMode, CFG_SCOPE_SERVER, CFG_DYN_NONE,CFG_CATEGORY_LOCAL)); TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "maxStreamBackendCache", tsMaxStreamBackendCache, 16, 1024, CFG_SCOPE_SERVER, CFG_DYN_ENT_SERVER_LAZY,CFG_CATEGORY_LOCAL)); TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "pqSortMemThreshold", tsPQSortMemThreshold, 1, 10240, CFG_SCOPE_SERVER, CFG_DYN_NONE,CFG_CATEGORY_LOCAL)); - TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "resolveFQDNRetryTime", tsResolveFQDNRetryTime, 1, 10240, CFG_SCOPE_SERVER, CFG_DYN_NONE,CFG_CATEGORY_GLOBAL)); TAOS_CHECK_RETURN(cfgAddString(pCfg, "s3Accesskey", tsS3AccessKey[0], CFG_SCOPE_SERVER, CFG_DYN_ENT_SERVER_LAZY,CFG_CATEGORY_GLOBAL)); TAOS_CHECK_RETURN(cfgAddString(pCfg, "s3Endpoint", tsS3Endpoint[0], CFG_SCOPE_SERVER, CFG_DYN_ENT_SERVER_LAZY,CFG_CATEGORY_GLOBAL)); @@ -1822,9 +1820,6 @@ static int32_t taosSetServerCfg(SConfig *pCfg) { TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "pqSortMemThreshold"); tsPQSortMemThreshold = pItem->i32; - TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "resolveFQDNRetryTime"); - tsResolveFQDNRetryTime = pItem->i32; - TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "minDiskFreeSize"); tsMinDiskFreeSize = pItem->i64; @@ -2453,7 +2448,6 @@ static int32_t taosCfgDynamicOptionsForServer(SConfig *pCfg, const char *name) { {"randErrorDivisor", &tsRandErrDivisor}, {"randErrorScope", &tsRandErrScope}, {"syncLogBufferMemoryAllowed", &tsLogBufferMemoryAllowed}, - {"resolveFQDNRetryTime", &tsResolveFQDNRetryTime}, {"syncHeartbeatInterval", &tsHeartbeatInterval}, {"syncHeartbeatTimeout", &tsHeartbeatTimeout}, {"syncSnapReplMaxWaitN", &tsSnapReplMaxWaitN}, diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c index 0fedd96e4c..d9eff2e9b8 100644 --- a/source/libs/sync/src/syncUtil.c +++ b/source/libs/sync/src/syncUtil.c @@ -45,14 +45,10 @@ void syncUtilNodeInfo2EpSet(const SNodeInfo* pInfo, SEpSet* pEpSet) { bool syncUtilNodeInfo2RaftId(const SNodeInfo* pInfo, SyncGroupId vgId, SRaftId* raftId) { uint32_t ipv4 = 0xFFFFFFFF; sDebug("vgId:%d, resolve sync addr from fqdn, ep:%s:%u", vgId, pInfo->nodeFqdn, pInfo->nodePort); - for (int32_t i = 0; i < tsResolveFQDNRetryTime; i++) { - int32_t code = taosGetIpv4FromFqdn(pInfo->nodeFqdn, &ipv4); - if (code) { - sError("vgId:%d, failed to resolve sync addr, dnode:%d fqdn:%s, retry", vgId, pInfo->nodeId, pInfo->nodeFqdn); - taosSsleep(1); - } else { - break; - } + + int32_t code = taosGetIpv4FromFqdn(pInfo->nodeFqdn, &ipv4); + if (code) { + sError("vgId:%d, failed to resolve sync addr, dnode:%d fqdn:%s, retry", vgId, pInfo->nodeId, pInfo->nodeFqdn); } if (ipv4 == 0xFFFFFFFF || ipv4 == 1) { diff --git a/tests/army/alter/test_alter_config.py b/tests/army/alter/test_alter_config.py index 1b59293187..229f3150b3 100644 --- a/tests/army/alter/test_alter_config.py +++ b/tests/army/alter/test_alter_config.py @@ -310,11 +310,6 @@ class TDTestCase: "value": 1024 * 1024 * 20 * 10, "category": "global" }, - { - "name": "resolveFQDNRetryTime", - "value": 500, - "category": "global" - }, { "name": "syncHeartbeatInterval", "value": 3000, diff --git a/tests/script/tsim/show/basic.sim b/tests/script/tsim/show/basic.sim index 4c4f9da912..7569cd832c 100644 --- a/tests/script/tsim/show/basic.sim +++ b/tests/script/tsim/show/basic.sim @@ -230,7 +230,7 @@ endi sql_error show create stable t0; sql show variables; -if $rows != 94 then +if $rows != 93 then return -1 endi diff --git a/tests/script/tsim/valgrind/checkError1.sim b/tests/script/tsim/valgrind/checkError1.sim index b7b04a030f..64f9cdec1f 100644 --- a/tests/script/tsim/valgrind/checkError1.sim +++ b/tests/script/tsim/valgrind/checkError1.sim @@ -120,7 +120,7 @@ if $rows != 3 then endi sql show variables; -if $rows != 94 then +if $rows != 93 then return -1 endi diff --git a/tests/system-test/0-others/test_alter_config.py b/tests/system-test/0-others/test_alter_config.py index 14e77bb489..bdc3a0e835 100644 --- a/tests/system-test/0-others/test_alter_config.py +++ b/tests/system-test/0-others/test_alter_config.py @@ -207,11 +207,6 @@ class TDTestCase: "value": 1024 * 1024 * 20 * 10, "category": "global" }, - { - "name": "resolveFQDNRetryTime", - "value": 500, - "category": "global" - }, { "name": "syncElectInterval", "value": 50000, diff --git a/tests/system-test/2-query/db.py b/tests/system-test/2-query/db.py index 0c5c9773c8..66776e0a23 100644 --- a/tests/system-test/2-query/db.py +++ b/tests/system-test/2-query/db.py @@ -47,7 +47,7 @@ class TDTestCase: def case2(self): tdSql.query("show variables") - tdSql.checkRows(94) + tdSql.checkRows(93) for i in range(self.replicaVar): tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1))