From c622094fc7d8bdab64809f4e212403d4921ba216 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 7 Aug 2020 14:12:41 +0800 Subject: [PATCH] TD-1096 --- src/balance/src/balance.c | 6 +++++- src/inc/taosdef.h | 2 +- src/sync/src/syncMain.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/balance/src/balance.c b/src/balance/src/balance.c index db5dd6a520..53ed860aa1 100644 --- a/src/balance/src/balance.c +++ b/src/balance/src/balance.c @@ -415,7 +415,11 @@ static int32_t balanceMonitorVgroups() { } else if (vgReplica < dbReplica) { mInfo("vgId:%d, replica:%d numOfVnodes:%d, try add one vnode", pVgroup->vgId, dbReplica, vgReplica); hasUpdatingVgroup = true; - balanceAddVnode(pVgroup, NULL, NULL); + int32_t code = balanceAddVnode(pVgroup, NULL, NULL); + if (code == TSDB_CODE_SUCCESS) { + mnodeDecVgroupRef(pVgroup); + break; + } } mnodeDecVgroupRef(pVgroup); diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index c3a808b765..9faf903c3a 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -303,7 +303,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); #define TSDB_MIN_DAYS_PER_FILE 1 #define TSDB_MAX_DAYS_PER_FILE 3650 -#define TSDB_DEFAULT_DAYS_PER_FILE 10 +#define TSDB_DEFAULT_DAYS_PER_FILE 5 #define TSDB_MIN_KEEP 1 // data in db to be reserved. #define TSDB_MAX_KEEP 365000 // data in db to be reserved. diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c index 2cc026484b..7c4b57350a 100644 --- a/src/sync/src/syncMain.c +++ b/src/sync/src/syncMain.c @@ -30,7 +30,7 @@ #include "syncInt.h" // global configurable -int tsMaxSyncNum = 4; +int tsMaxSyncNum = 2; int tsSyncTcpThreads = 2; int tsMaxWatchFiles = 100; int tsMaxFwdInfo = 200; -- GitLab