Merge pull request #11791 from taosdata/feature/sync-vnode-merge-3.0

Feature/sync vnode merge 3.0

source/libs/sync/src/syncEnv.c

@@ -29,7 +29,8 @@ static void      syncEnvTick(void *param, void *tmrId);
 int32_t syncEnvStart() {
   int32_t ret = 0;
   taosSeedRand(taosGetTimestampSec());
-  gSyncEnv = doSyncEnvStart(gSyncEnv);
+  //gSyncEnv = doSyncEnvStart(gSyncEnv);
+  gSyncEnv = doSyncEnvStart();
   assert(gSyncEnv != NULL);
   sTrace("syncEnvStart ok!");
   return ret;
@@ -91,10 +92,12 @@ static SSyncEnv *doSyncEnvStart() {
 }
 
 static int32_t doSyncEnvStop(SSyncEnv *pSyncEnv) {
+  assert(pSyncEnv == gSyncEnv);
   if (pSyncEnv != NULL) {
     taosTmrCleanUp(pSyncEnv->pTimerManager);
     taosMemoryFree(pSyncEnv);
   }
+  gSyncEnv = NULL;
   return 0;
 }