diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 76ec5b2d222e5875e38d707147cbc524b9aa7090..6dc78d6400c6beb9f4dd1e976410896affc75af1 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -183,7 +183,7 @@ bool tsStartUdfd = true; int32_t tsTransPullupInterval = 2; int32_t tsMqRebalanceInterval = 2; int32_t tsTtlUnit = 86400; -int32_t tsTtlPushInterval = 60; +int32_t tsTtlPushInterval = 86400; int32_t tsGrantHBInterval = 60; void taosAddDataDir(int32_t index, char *v1, int32_t level, int32_t primary) { @@ -466,7 +466,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { if (cfgAddInt32(pCfg, "transPullupInterval", tsTransPullupInterval, 1, 10000, 1) != 0) return -1; if (cfgAddInt32(pCfg, "mqRebalanceInterval", tsMqRebalanceInterval, 1, 10000, 1) != 0) return -1; if (cfgAddInt32(pCfg, "ttlUnit", tsTtlUnit, 1, 86400 * 365, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "ttlPushInterval", tsTtlPushInterval, 1, 10000, 1) != 0) return -1; + if (cfgAddInt32(pCfg, "ttlPushInterval", tsTtlPushInterval, 1, 100000, 1) != 0) return -1; if (cfgAddBool(pCfg, "udf", tsStartUdfd, 0) != 0) return -1; return 0; diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c index 5255724b5857af96667c600dfab852c6a7379c30..c4299181bd9f8828d409fc955f64ff6b9eccc60d 100644 --- a/source/dnode/vnode/src/meta/metaTable.c +++ b/source/dnode/vnode/src/meta/metaTable.c @@ -438,12 +438,15 @@ int metaDropTable(SMeta *pMeta, int64_t version, SVDropTbReq *pReq, SArray *tbUi } int metaTtlDropTable(SMeta *pMeta, int64_t ttl, SArray *tbUids) { - metaWLock(pMeta); int ret = metaTtlSmaller(pMeta, ttl, tbUids); if (ret != 0) { - metaULock(pMeta); return ret; } + if (taosArrayGetSize(tbUids) == 0){ + return 0; + } + + metaWLock(pMeta); for (int i = 0; i < taosArrayGetSize(tbUids); ++i) { tb_uid_t *uid = (tb_uid_t *)taosArrayGet(tbUids, i); metaDropTableByUid(pMeta, *uid, NULL);