diff --git a/docs/en/14-reference/12-config/index.md b/docs/en/14-reference/12-config/index.md index c0512aef7b..011db81b92 100755 --- a/docs/en/14-reference/12-config/index.md +++ b/docs/en/14-reference/12-config/index.md @@ -731,16 +731,6 @@ The charset that takes effect is UTF-8. | Value Range | 0: not change; 1: change by modification | | Default Value | 0 | -### keepTimeOffset - -| Attribute | Description | -| ------------- | ------------------------- | -| Applicable | Server Only | -| Meaning | Latency of data migration | -| Unit | hour | -| Value Range | 0-23 | -| Default Value | 0 | - ### tmqMaxTopicNum | Attribute | Description | @@ -807,4 +797,4 @@ The charset that takes effect is UTF-8. | 53 | udf | Yes | Yes | | | 54 | enableCoreFile | Yes | Yes | | | 55 | ttlChangeOnWrite | No | Yes | | -| 56 | keepTimeOffset | Yes | Yes | | +| 56 | keepTimeOffset | Yes | Yes(discarded since 3.2.0.0) | | diff --git a/docs/zh/14-reference/12-config/index.md b/docs/zh/14-reference/12-config/index.md index 519b84ba71..c7323da271 100755 --- a/docs/zh/14-reference/12-config/index.md +++ b/docs/zh/14-reference/12-config/index.md @@ -716,16 +716,6 @@ charset 的有效值是 UTF-8。 | 取值范围 | 0: 不改变；1：改变 | | 缺省值 | 0 | -### keepTimeOffset - -| 属性 | 说明 | -| -------- | -------------- | -| 适用范围 | 仅服务端适用 | -| 含义 | 迁移操作的延时 | -| 单位 | 小时 | -| 取值范围 | 0-23 | -| 缺省值 | 0 | - ### tmqMaxTopicNum | 属性 | 说明 | @@ -803,7 +793,7 @@ charset 的有效值是 UTF-8。 | 53 | udf | 是 | 是 | | | 54 | enableCoreFile | 是 | 是 | | | 55 | ttlChangeOnWrite | 否 | 是 | | -| 56 | keepTimeOffset | 是 | 是 | | +| 56 | keepTimeOffset | 否 | 是（从3.2.0.0开始，该配置废弃） | | ## 2.x->3.0 的废弃参数 diff --git a/include/common/tglobal.h b/include/common/tglobal.h index 1c5510ba0d..be03d07681 100644 --- a/include/common/tglobal.h +++ b/include/common/tglobal.h @@ -206,7 +206,6 @@ extern int32_t tsRpcRetryInterval; extern bool tsDisableStream; extern int64_t tsStreamBufferSize; extern bool tsFilterScalarMode; -extern int32_t tsKeepTimeOffset; extern int32_t tsMaxStreamBackendCache; extern int32_t tsPQSortMemThreshold; extern int32_t tsResolveFQDNRetryTime; diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg index 236cf1f520..2159899aa2 100644 --- a/packaging/cfg/taos.cfg +++ b/packaging/cfg/taos.cfg @@ -108,9 +108,6 @@ # time period of keeping log files, in days # logKeepDays 0 -# unit Hour. Latency of data migration -# keepTimeOffset 0 - ############ 3. Debug Flag and levels ############################################# diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 791fe34440..f581e0b19a 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -253,7 +253,6 @@ char tsUdfdLdLibPath[512] = ""; bool tsDisableStream = false; int64_t tsStreamBufferSize = 128 * 1024 * 1024; bool tsFilterScalarMode = false; -int32_t tsKeepTimeOffset = 0; // latency of data migration int tsResolveFQDNRetryTime = 100; // seconds char tsS3Endpoint[TSDB_FQDN_LEN] = ""; @@ -652,7 +651,6 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { return -1; if (cfgAddBool(pCfg, "filterScalarMode", tsFilterScalarMode, CFG_SCOPE_SERVER) != 0) return -1; - if (cfgAddInt32(pCfg, "keepTimeOffset", tsKeepTimeOffset, 0, 23, CFG_SCOPE_SERVER) != 0) return -1; if (cfgAddInt32(pCfg, "maxStreamBackendCache", tsMaxStreamBackendCache, 16, 1024, CFG_SCOPE_SERVER) != 0) return -1; if (cfgAddInt32(pCfg, "pqSortMemThreshold", tsPQSortMemThreshold, 1, 10240, CFG_SCOPE_SERVER) != 0) return -1; if (cfgAddInt32(pCfg, "resolveFQDNRetryTime", tsResolveFQDNRetryTime, 1, 10240, 0) != 0) return -1; @@ -1071,7 +1069,6 @@ static int32_t taosSetServerCfg(SConfig *pCfg) { tsStreamBufferSize = cfgGetItem(pCfg, "streamBufferSize")->i64; tsFilterScalarMode = cfgGetItem(pCfg, "filterScalarMode")->bval; - tsKeepTimeOffset = cfgGetItem(pCfg, "keepTimeOffset")->i32; tsMaxStreamBackendCache = cfgGetItem(pCfg, "maxStreamBackendCache")->i32; tsPQSortMemThreshold = cfgGetItem(pCfg, "pqSortMemThreshold")->i32; tsResolveFQDNRetryTime = cfgGetItem(pCfg, "resolveFQDNRetryTime")->i32; @@ -1667,13 +1664,6 @@ void taosCfgDynamicOptions(const char *option, const char *value) { return; } - if (strcasecmp(option, "keepTimeOffset") == 0) { - int32_t newKeepTimeOffset = atoi(value); - uInfo("keepTimeOffset set from %d to %d", tsKeepTimeOffset, newKeepTimeOffset); - tsKeepTimeOffset = newKeepTimeOffset; - return; - } - if (strcasecmp(option, "ttlPushInterval") == 0) { int32_t newTtlPushInterval = atoi(value); uInfo("ttlPushInterval set from %d to %d", tsTtlPushIntervalSec, newTtlPushInterval); diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c index f38cf70dc6..c5682379db 100644 --- a/source/dnode/mnode/impl/src/mndDnode.c +++ b/source/dnode/mnode/impl/src/mndDnode.c @@ -1144,21 +1144,7 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) { strcpy(dcfgReq.config, "monitor"); snprintf(dcfgReq.value, TSDB_DNODE_VALUE_LEN, "%d", flag); - } else if (strncasecmp(cfgReq.config, "keeptimeoffset", 14) == 0) { - int32_t optLen = strlen("keeptimeoffset"); - int32_t flag = -1; - int32_t code = mndMCfgGetValInt32(&cfgReq, optLen, &flag); - if (code < 0) return code; - - if (flag < 0 || flag > 23) { - mError("dnode:%d, failed to config keepTimeOffset since value:%d. Valid range: [0, 23]", cfgReq.dnodeId, flag); - terrno = TSDB_CODE_INVALID_CFG; - return -1; - } - - strcpy(dcfgReq.config, "keeptimeoffset"); - snprintf(dcfgReq.value, TSDB_DNODE_VALUE_LEN, "%d", flag); - } else if (strncasecmp(cfgReq.config, "ttlpushinterval", 14) == 0) { +} else if (strncasecmp(cfgReq.config, "ttlpushinterval", 14) == 0) { int32_t optLen = strlen("ttlpushinterval"); int32_t flag = -1; int32_t code = mndMCfgGetValInt32(&cfgReq, optLen, &flag);