From f2840cd7ba43c89ced2bed1b66d9421160cec1d6 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Mon, 26 Feb 2024 08:48:47 +0800 Subject: [PATCH 1/5] fix: task reschedule issue --- source/libs/scheduler/inc/schInt.h | 2 +- source/libs/scheduler/src/scheduler.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/libs/scheduler/inc/schInt.h b/source/libs/scheduler/inc/schInt.h index 1c90e61ea3..1aa21e73a3 100644 --- a/source/libs/scheduler/inc/schInt.h +++ b/source/libs/scheduler/inc/schInt.h @@ -57,7 +57,7 @@ typedef enum { #define SCHEDULE_DEFAULT_POLICY SCH_LOAD_SEQ #define SCHEDULE_DEFAULT_MAX_NODE_NUM 20 -#define SCH_DEFAULT_TASK_TIMEOUT_USEC 5000000 +#define SCH_DEFAULT_TASK_TIMEOUT_USEC 30000000 #define SCH_MAX_TASK_TIMEOUT_USEC 300000000 #define SCH_DEFAULT_MAX_RETRY_NUM 6 #define SCH_MIN_AYSNC_EXEC_NUM 3 diff --git a/source/libs/scheduler/src/scheduler.c b/source/libs/scheduler/src/scheduler.c index 841066a4c9..795c21c234 100644 --- a/source/libs/scheduler/src/scheduler.c +++ b/source/libs/scheduler/src/scheduler.c @@ -33,7 +33,7 @@ int32_t schedulerInit() { schMgmt.cfg.maxJobNum = SCHEDULE_DEFAULT_MAX_JOB_NUM; schMgmt.cfg.maxNodeTableNum = tsQueryMaxConcurrentTables; schMgmt.cfg.schPolicy = SCHEDULE_DEFAULT_POLICY; - schMgmt.cfg.enableReSchedule = true; + schMgmt.cfg.enableReSchedule = false; qDebug("schedule init, policy: %d, maxNodeTableNum: %" PRId64", reSchedule:%d", schMgmt.cfg.schPolicy, schMgmt.cfg.maxNodeTableNum, schMgmt.cfg.enableReSchedule); From ca6ed89f6f566fe16fcb0915d7f5eeddd9d23851 Mon Sep 17 00:00:00 2001 From: shenglian zhou Date: Mon, 26 Feb 2024 10:22:48 +0800 Subject: [PATCH 2/5] fix: return error code instead of just out of memory --- source/libs/executor/src/projectoperator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c index cc83ecd84e..691210e5ba 100644 --- a/source/libs/executor/src/projectoperator.c +++ b/source/libs/executor/src/projectoperator.c @@ -461,7 +461,7 @@ SOperatorInfo* createIndefinitOutputOperatorInfo(SOperatorInfo* downstream, SPhy _error: destroyIndefinitOperatorInfo(pInfo); taosMemoryFree(pOperator); - pTaskInfo->code = TSDB_CODE_OUT_OF_MEMORY; + pTaskInfo->code = code; return NULL; } From 323938df369be7c61c982aaaaf74e8710f339a15 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 26 Feb 2024 12:29:33 +0800 Subject: [PATCH 3/5] fix(meta/table): remove cache table dropping --- source/dnode/vnode/src/meta/metaTable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c index a2c7a04ab3..4a978c8f41 100644 --- a/source/dnode/vnode/src/meta/metaTable.c +++ b/source/dnode/vnode/src/meta/metaTable.c @@ -1008,11 +1008,11 @@ void metaDropTables(SMeta *pMeta, SArray *tbUids) { } tSimpleHashPut(suidHash, &suid, sizeof(tb_uid_t), &nCtbDropped, sizeof(int64_t)); } - + /* if (!TSDB_CACHE_NO(pMeta->pVnode->config)) { tsdbCacheDropTable(pMeta->pVnode->pTsdb, uid, suid, NULL); } - + */ metaDebug("batch drop table:%" PRId64, uid); } metaULock(pMeta); From a00daa0287bcf681f36f3c67282abe10523c2c9d Mon Sep 17 00:00:00 2001 From: dmchen Date: Mon, 26 Feb 2024 11:37:10 +0000 Subject: [PATCH 4/5] column name --- source/libs/monitor/src/monFramework.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/libs/monitor/src/monFramework.c b/source/libs/monitor/src/monFramework.c index d58cee7b9a..70b9dd9f0e 100644 --- a/source/libs/monitor/src/monFramework.c +++ b/source/libs/monitor/src/monFramework.c @@ -65,8 +65,8 @@ extern char* tsMonFwUri; #define DISK_ENGINE DNODE_TABLE":disk_engine" #define DISK_USED DNODE_TABLE":disk_used" #define DISK_TOTAL DNODE_TABLE":disk_total" -#define NET_IN DNODE_TABLE":net_in" -#define NET_OUT DNODE_TABLE":net_out" +#define NET_IN DNODE_TABLE":system_net_in" +#define NET_OUT DNODE_TABLE":system_net_out" #define IO_READ DNODE_TABLE":io_read" #define IO_WRITE DNODE_TABLE":io_write" #define IO_READ_DISK DNODE_TABLE":io_read_disk" From 49fe44ab7439aee571c416a172dd835e2927f903 Mon Sep 17 00:00:00 2001 From: dmchen Date: Mon, 26 Feb 2024 11:46:39 +0000 Subject: [PATCH 5/5] column name --- source/libs/monitor/src/monFramework.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/monitor/src/monFramework.c b/source/libs/monitor/src/monFramework.c index 70b9dd9f0e..488b4d1d58 100644 --- a/source/libs/monitor/src/monFramework.c +++ b/source/libs/monitor/src/monFramework.c @@ -60,7 +60,7 @@ extern char* tsMonFwUri; #define CPU_SYSTEM DNODE_TABLE":cpu_system" #define CPU_CORE DNODE_TABLE":cpu_cores" #define MEM_ENGINE DNODE_TABLE":mem_engine" -#define MEM_SYSTEM DNODE_TABLE":mem_system" +#define MEM_SYSTEM DNODE_TABLE":mem_free" #define MEM_TOTAL DNODE_TABLE":mem_total" #define DISK_ENGINE DNODE_TABLE":disk_engine" #define DISK_USED DNODE_TABLE":disk_used"