From 99bc6a5ffecb3f391086cfe7122ac15fbac3e714 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sun, 28 Jun 2020 08:48:14 +0000
Subject: [PATCH] [TD-776] http cleanup

---
 .../tdenginedocs-cn/administrator/index.html          |  2 +-
 src/common/src/tglobal.c                              | 11 ++++++++++-
 src/plugins/http/src/httpServer.c                     |  3 +++
 tests/script/sh/deploy.sh                             |  2 +-
 tests/script/test.sh                                  |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/documentation/tdenginedocs-cn/administrator/index.html b/documentation/tdenginedocs-cn/administrator/index.html
index 52d942479e..eaaf04ff95 100644
--- a/documentation/tdenginedocs-cn/administrator/index.html
+++ b/documentation/tdenginedocs-cn/administrator/index.html
@@ -55,7 +55,7 @@
 <li>enableMonitor: 系统监测标志位，0：关闭，1：打开</li>
 <li>logDir: 日志文件目录，缺省是/var/log/taos</li>
 <li>numOfLogLines：日志文件的最大行数</li>
-<li>debugFlag: 系统debug日志开关，131：仅错误和报警信息，135：调试信息，151：非常详细的调试信息</li>
+<li>debugFlag: 系统debug日志开关，131：仅错误和报警信息，135：调试信息，143：非常详细的调试信息</li>
 </ul>
 <p>不同应用场景的数据往往具有不同的数据特征，比如保留天数、副本数、采集频次、记录大小、采集点的数量、压缩等都可完全不同。为获得在存储上的最高效率，TDengine提供如下存储相关的系统配置参数：</p>
 <ul>
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 2058cfa7f1..6dc6a82d09 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -1080,7 +1080,6 @@ static void doInitGlobalConfig() {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
-
   cfg.option = "monitorDebugFlag";
   cfg.ptr = &monitorDebugFlag;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
@@ -1101,6 +1100,16 @@ static void doInitGlobalConfig() {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "vDebugFlag";
+  cfg.ptr = &vDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   cfg.option = "tsdbDebugFlag";
   cfg.ptr = &tsdbDebugFlag;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
index ee7acbce59..cef0e80690 100644
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
@@ -365,6 +365,7 @@ bool httpInitConnect() {
     pThread->pollFd = epoll_create(HTTP_MAX_EVENTS);  // size does not matter
     if (pThread->pollFd < 0) {
       httpError("http thread:%s, failed to create HTTP epoll", pThread->label);
+      pthread_mutex_destroy(&(pThread->threadMutex));
       return false;
     }
 
@@ -374,6 +375,7 @@ bool httpInitConnect() {
     if (pthread_create(&(pThread->thread), &thattr, (void *)httpProcessHttpData, (void *)(pThread)) != 0) {
       httpError("http thread:%s, failed to create HTTP process data thread, reason:%s", pThread->label,
                 strerror(errno));
+      pthread_mutex_destroy(&(pThread->threadMutex));        
       return false;
     }
     pthread_attr_destroy(&thattr);
@@ -387,6 +389,7 @@ bool httpInitConnect() {
   pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
   if (pthread_create(&(pServer->thread), &thattr, (void *)httpAcceptHttpConnection, (void *)(pServer)) != 0) {
     httpError("http server:%s, failed to create Http accept thread, reason:%s", pServer->label, strerror(errno));
+    httpCleanUpConnect();
     return false;
   }
   pthread_attr_destroy(&thattr);
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index a95949bc36..ee7093a2ca 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -113,7 +113,7 @@ echo "logDir              $LOG_DIR"       >> $TAOS_CFG
 echo "mDebugFlag          135"            >> $TAOS_CFG
 echo "sdbDebugFlag        135"            >> $TAOS_CFG
 echo "dDebugFlag          135"            >> $TAOS_CFG
-echo "vDebugFlag          151"            >> $TAOS_CFG
+echo "vDebugFlag          143"            >> $TAOS_CFG
 echo "cDebugFlag          135"            >> $TAOS_CFG
 echo "jnidebugFlag        135"            >> $TAOS_CFG
 echo "odbcdebugFlag       135"            >> $TAOS_CFG
diff --git a/tests/script/test.sh b/tests/script/test.sh
index a6d57e548a..cba0a0fe4b 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -112,7 +112,7 @@ echo "numOfLogLines    100000000"            >> $TAOS_CFG
 echo "dDebugFlag       135"                  >> $TAOS_CFG
 echo "mDebugFlag       135"                  >> $TAOS_CFG
 echo "sdbDebugFlag     135"                  >> $TAOS_CFG
-echo "rpcDebugFlag     151"                  >> $TAOS_CFG
+echo "rpcDebugFlag     143"                  >> $TAOS_CFG
 echo "tmrDebugFlag     131"                  >> $TAOS_CFG
 echo "cDebugFlag       135"                  >> $TAOS_CFG
 echo "httpDebugFlag    135"                  >> $TAOS_CFG
-- 
GitLab