Merge remote-tracking branch 'origin/feature/sim' into feature/win

src/balance/src/bnThread.c

@@ -56,7 +56,7 @@ int32_t bnInitThread() {
   pthread_attr_destroy(&thattr);
 
   if (ret != 0) {
-    mError("failed to create balance thread since %s", strerror(errno));
+    mError("failed to create balance thread since %s", strerror(ret));
     return -1;
   }
 

src/dnode/src/dnodeTelemetry.c

@@ -290,7 +290,7 @@ int32_t dnodeInitTelemetry() {
   int32_t code = pthread_create(&tsTelemetryThread, &attr, telemetryThread, NULL);
   pthread_attr_destroy(&attr);
   if (code != 0) {
-    dTrace("failed to create telemetry thread, reason:%s", strerror(errno));
+    dTrace("failed to create telemetry thread, reason:%s", strerror(code));
   }
 
   dInfo("dnode telemetry is initialized");

src/plugins/http/src/httpServer.c

@@ -56,7 +56,10 @@ void httpCleanUpConnect() {
   HttpServer *pServer = &tsHttpServer;
   if (pServer->pThreads == NULL) return;
 
-  pthread_join(pServer->thread, NULL);
+  if (taosCheckPthreadValid(pServer->thread)) {
+    pthread_join(pServer->thread, NULL);
+  }
+
   for (int32_t i = 0; i < pServer->numOfThreads; ++i) {
     HttpThread* pThread = pServer->pThreads + i;
     if (pThread != NULL) {

src/plugins/monitor/src/monMain.c

@@ -246,7 +246,10 @@ void monStopSystem() {
 void monCleanupSystem() {
   tsMonitor.quiting = 1;
   monStopSystem();
-  pthread_join(tsMonitor.thread, NULL);
+  if (taosCheckPthreadValid(tsMonitor.thread)) {
+    pthread_join(tsMonitor.thread, NULL);
+  }
+
   if (tsMonitor.conn != NULL) {
     taos_close(tsMonitor.conn);
     tsMonitor.conn = NULL;

src/rpc/src/rpcTcp.c

@@ -156,7 +156,7 @@ void *taosInitTcpServer(uint32_t ip, uint16_t port, char *label, int numOfThread
   if (code == 0) { 
     code = pthread_create(&pServerObj->thread, &thattr, taosAcceptTcpConnection, (void *)pServerObj);
     if (code != 0) {
-      tError("%s failed to create TCP accept thread(%s)", label, strerror(errno));
+      tError("%s failed to create TCP accept thread(%s)", label, strerror(code));
     }
   }
 

src/util/src/tcache.c

@@ -510,7 +510,9 @@ void taosCacheCleanup(SCacheObj *pCacheObj) {
   }
 
   pCacheObj->deleting = 1;
-  pthread_join(pCacheObj->refreshWorker, NULL);
+  if (taosCheckPthreadValid(pCacheObj->refreshWorker)) {
+    pthread_join(pCacheObj->refreshWorker, NULL);
+  }
 
   uInfo("cache:%s will be cleaned up", pCacheObj->name);
   doCleanupDataCache(pCacheObj);

src/vnode/src/vnodeMain.c

@@ -201,6 +201,8 @@ int32_t vnodeOpen(int32_t vgId) {
   pthread_mutex_init(&pVnode->statusMutex, NULL);
   vnodeSetInitStatus(pVnode);
 
+  tsdbIncCommitRef(pVnode->vgId);
+
   int32_t code = vnodeReadCfg(pVnode);
   if (code != TSDB_CODE_SUCCESS) {
     vnodeCleanUp(pVnode);
@@ -297,7 +299,6 @@ int32_t vnodeOpen(int32_t vgId) {
   pVnode->events = NULL;
 
   vDebug("vgId:%d, vnode is opened in %s, pVnode:%p", pVnode->vgId, rootDir, pVnode);
-  tsdbIncCommitRef(pVnode->vgId);
 
   vnodeAddIntoHash(pVnode);
 

tests/tsim/src/simMain.c

@@ -20,6 +20,7 @@
 #undef TAOS_MEM_CHECK
 
 bool simAsyncQuery = false;
+bool simExecSuccess = false;
 
 void simHandleSignal(int32_t signo) {
   simSystemCleanUp();
@@ -62,5 +63,8 @@ int32_t main(int32_t argc, char *argv[]) {
   simScriptList[++simScriptPos] = script;
   simExecuteScript(script);
 
-  return 0;
+  int32_t ret = simExecSuccess ? 0 : -1;
+  simError("execute result %d", ret);
+
+  return ret;
 }
\ No newline at end of file

tests/tsim/src/simSystem.c

@@ -21,6 +21,7 @@
 #include "ttimer.h"
 #include "tutil.h"
 #include "tsocket.h"
+#include "taoserror.h"
 #undef TAOS_MEM_CHECK
 
 SScript *simScriptList[MAX_MAIN_SCRIPT_NUM];
@@ -31,6 +32,8 @@ int32_t  simDebugFlag = 135;
 void     simCloseTaosdConnect(SScript *script);
 char     simHostName[128];
 
+extern bool simExecSuccess;
+
 char *simParseArbitratorName(char *varName) {
   static char hostName[140];
   sprintf(hostName, "%s:%d", simHostName, 8000);
@@ -118,10 +121,12 @@ SScript *simProcessCallOver(SScript *script) {
   if (script->type == SIM_SCRIPT_TYPE_MAIN) {
     simDebug("script:%s, is main script, set stop flag", script->fileName);
     if (script->killed) {
+      simExecSuccess = false;
       simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX "failed" FAILED_POSTFIX ", error:%s",
               script->fileName, script->error);
       return NULL;
     } else {
+      simExecSuccess = true;
       simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX "success" SUCCESS_POSTFIX,
               script->fileName);
       simCloseTaosdConnect(script);