Merge remote-tracking branch 'origin/develop' into patch/TD-1632

Jenkinsfile

+pipeline {
+  agent any
+  stages {
+    stage('build TDengine') {
+      steps {
+        sh '''cd ${WORKSPACE}
+export TZ=Asia/Harbin
+date
+rm -rf ${WORKSPACE}/debug
+mkdir debug
+cd debug
+cmake .. > /dev/null
+make > /dev/null
+cd ${WORKSPACE}/debug'''
+      }
+    }
+
+    stage('test_tsim') {
+      parallel {
+        stage('test') {
+          steps {
+            sh '''cd ${WORKSPACE}/tests
+#./test-all.sh smoke
+sudo ./test-all.sh full'''
+          }
+        }
+
+        stage('test_crash_gen') {
+          steps {
+            sh '''cd ${WORKSPACE}/tests/pytest
+sudo ./crash_gen.sh -a -p -t 4 -s 2000'''
+          }
+        }
+
+        stage('test_valgrind') {
+          steps {
+            sh '''cd ${WORKSPACE}/tests/pytest
+sudo ./valgrind-test.sh 2>&1 > mem-error-out.log
+grep \'start to execute\\|ERROR SUMMARY\' mem-error-out.log|grep -v \'grep\'|uniq|tee uniq-mem-error-out.log
+
+for memError in `grep \'ERROR SUMMARY\' uniq-mem-error-out.log | awk \'{print $4}\'`
+do
+  if [ -n "$memError" ]; then
+    if [ "$memError" -gt 12 ]; then
+      echo -e "${RED} ## Memory errors number valgrind reports is $memError.\\
+               More than our threshold! ## ${NC}"
+      travis_terminate $memError
+    fi
+  fi
+done
+
+grep \'start to execute\\|definitely lost:\' mem-error-out.log|grep -v \'grep\'|uniq|tee uniq-definitely-lost-out.log
+for defiMemError in `grep \'definitely lost:\' uniq-definitely-lost-out.log | awk \'{print $7}\'`
+do
+  if [ -n "$defiMemError" ]; then
+    if [ "$defiMemError" -gt 13 ]; then
+      echo -e "${RED} ## Memory errors number valgrind reports \\
+               Definitely lost is $defiMemError. More than our threshold! ## ${NC}"
+      travis_terminate $defiMemError
+    fi
+  fi
+done'''
+          }
+        }
+
+      }
+    }
+
+  }
+}
\ No newline at end of file

documentation20/webdocs/markdowndocs/administrator-ch.md

@@ -250,10 +250,10 @@ ALTER USER <user_name> PASS <'password'>;
 修改用户密码, 为避免被转换为小写，密码需要用单引号引用,单引号为英文半角
 
 ```
-ALTER USER <user_name> PRIVILEDGE <'super'|'write'|'read'>;
+ALTER USER <user_name> PRIVILEDGE <super|write|read>;
 ```
 
-修改用户权限为：super/write/read。 为避免被转换为小写，密码需要用单引号引用,单引号为英文半角
+修改用户权限为：super/write/read，不需要添加单引号
 
 ```
 SHOW USERS;

src/dnode/src/dnodeMgmt.c

@@ -464,7 +464,14 @@ void dnodeUpdateMnodeEpSetForPeer(SRpcEpSet *pEpSet) {
   dInfo("mnode EP list for peer is changed, numOfEps:%d inUse:%d", pEpSet->numOfEps, pEpSet->inUse);
   for (int i = 0; i < pEpSet->numOfEps; ++i) {
     pEpSet->port[i] -= TSDB_PORT_DNODEDNODE;
-    dInfo("mnode index:%d %s:%u", i, pEpSet->fqdn[i], pEpSet->port[i])
+    dInfo("mnode index:%d %s:%u", i, pEpSet->fqdn[i], pEpSet->port[i]);
+
+    if (!mnodeIsRunning()) {
+      if (strcmp(pEpSet->fqdn[i], tsLocalFqdn) == 0 && pEpSet->port[i] == tsServerPort) {
+        dInfo("mnode index:%d %s:%u should work as master", i, pEpSet->fqdn[i], pEpSet->port[i]);
+        sdbUpdateSync();
+      }
+    }
   }
 
   tsDMnodeEpSet = *pEpSet;

src/inc/taosdef.h

@@ -64,7 +64,7 @@ extern const int32_t TYPE_BYTES[11];
 // TODO: replace and remove code below
 #define CHAR_BYTES   sizeof(char)
 #define SHORT_BYTES  sizeof(int16_t)
-#define INT_BYTES    sizeof(int)
+#define INT_BYTES    sizeof(int32_t)
 #define LONG_BYTES   sizeof(int64_t)
 #define FLOAT_BYTES  sizeof(float)
 #define DOUBLE_BYTES sizeof(double)
@@ -73,7 +73,7 @@ extern const int32_t TYPE_BYTES[11];
 #define TSDB_DATA_BOOL_NULL             0x02
 #define TSDB_DATA_TINYINT_NULL          0x80
 #define TSDB_DATA_SMALLINT_NULL         0x8000
-#define TSDB_DATA_INT_NULL              0x80000000
+#define TSDB_DATA_INT_NULL              0x80000000L
 #define TSDB_DATA_BIGINT_NULL           0x8000000000000000L
 
 #define TSDB_DATA_FLOAT_NULL            0x7FF00000              // it is an NAN
@@ -304,7 +304,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf
 #define TSDB_MIN_VNODES           64
 #define TSDB_MAX_VNODES           2048
 #define TSDB_MIN_VNODES_PER_DB    2
-#define TSDB_MAX_VNODES_PER_DB    16
+#define TSDB_MAX_VNODES_PER_DB    64
 
 #define TSDB_DNODE_ROLE_ANY       0
 #define TSDB_DNODE_ROLE_MGMT      1

src/rpc/src/rpcCache.c

@@ -216,6 +216,7 @@ static void rpcCleanConnCache(void *handle, void *tmrId) {
   if (pCache == NULL || pCache->maxSessions == 0) return;
   if (pCache->pTimer != tmrId) return;
 
+  pthread_mutex_lock(&pCache->mutex);
   uint64_t time = taosGetTimestampMs();
 
   for (hash = 0; hash < pCache->maxSessions; ++hash) {
@@ -227,6 +228,7 @@ static void rpcCleanConnCache(void *handle, void *tmrId) {
 
   // tTrace("timer, total connections in cache:%d", pCache->total);
   taosTmrReset(rpcCleanConnCache, (int32_t)(pCache->keepTimer * 2), pCache, pCache->tmrCtrl, &pCache->pTimer);
+  pthread_mutex_unlock(&pCache->mutex);
 }
 
 static void rpcRemoveExpiredNodes(SConnCache *pCache, SConnHash *pNode, int hash, uint64_t time) {

src/util/inc/tscompression.h

@@ -26,7 +26,7 @@ extern "C" {
 #define COMP_OVERFLOW_BYTES 2
 #define BITS_PER_BYTE 8
 // Masks
-#define INT64MASK(_x) ((1ul << _x) - 1)
+#define INT64MASK(_x) ((((uint64_t)1) << _x) - 1)
 #define INT32MASK(_x) (((uint32_t)1 << _x) - 1)
 #define INT8MASK(_x) (((uint8_t)1 << _x) - 1)
 // Compression algorithm

tests/script/jenkins/basic.txt

@@ -303,8 +303,8 @@ cd ../../../debug; make
 ./test.sh -f unique/mnode/mgmt22.sim
 ./test.sh -f unique/mnode/mgmt23.sim
 ./test.sh -f unique/mnode/mgmt24.sim
-#./test.sh -f unique/mnode/mgmt25.sim
-#./test.sh -f unique/mnode/mgmt26.sim
+./test.sh -f unique/mnode/mgmt25.sim
+./test.sh -f unique/mnode/mgmt26.sim
 ./test.sh -f unique/mnode/mgmt33.sim
 ./test.sh -f unique/mnode/mgmt34.sim
 ./test.sh -f unique/mnode/mgmtr2.sim

tests/script/unique/mnode/mgmt23.sim

@@ -65,7 +65,7 @@ endi
 
 print ============== step4
 sql drop dnode $hostname2
-sleep 8000
+sleep 16000
 
 sql show mnodes
 $dnode1Role = $data2_1