fix: he3db as salve restart failed

src/backend/access/transam/pthreadpool.c

@@ -52,7 +52,7 @@ int initPthreadPool(void) {
     }
 	//default 8 thread read
     if(he3mirror){
-        gpool = g_thread_pool_new(produceWalFunc,NULL,1,FALSE,NULL);
+        gpool = g_thread_pool_new(produceWalFunc,NULL,4,FALSE,NULL);
     }else{
         gpool = g_thread_pool_new(getWalFunc,NULL,8,FALSE,NULL);
     }
@@ -75,7 +75,12 @@ void WalTaskFree(void) {
 }
 
 void WalTaskImmediateFree(void) {
-	return g_thread_pool_free(gpool,TRUE,TRUE);
+    g_thread_pool_free(gpool,TRUE,TRUE);
+    gpool = NULL;
+}
+
+bool IsFreePthreadPool(void) {
+    return gpool == NULL;
 }
 
 

src/backend/access/transam/xlog.c

@@ -8321,6 +8321,7 @@ void StartupXLOG(void)
                                   ),
                                   &private);
 		tmpxlogreader = he3xlogreader;
+        he3xlogreader->system_identifier = ControlFile->system_identifier;
     } else {
         xlogreader =
                 XLogReaderAllocate(wal_segment_size, NULL,
@@ -8335,7 +8336,6 @@ void StartupXLOG(void)
 				 errmsg("out of memory"),
 				 errdetail("Failed while allocating a WAL reading processor.")));
 	xlogreader->system_identifier = ControlFile->system_identifier;
-	he3xlogreader->system_identifier = ControlFile->system_identifier;
 	/*
 	 * Allocate two page buffers dedicated to WAL consistency checks.  We do
 	 * it this way, rather than just making static arrays, for two reasons:
@@ -8755,7 +8755,7 @@ void StartupXLOG(void)
 	 */
 	abortedRecPtr = InvalidXLogRecPtr;
 	missingContrecPtr = InvalidXLogRecPtr;
-	pthread_t ntid;
+	pthread_t ntid = 0;
 	/* REDO */
 	if (InRecovery)
 	{
@@ -9108,6 +9108,8 @@ void StartupXLOG(void)
 			if(IsBootstrapProcessingMode() != true && InitdbSingle != true) {
 				*g_redoStartLsn = xlogreader->EndRecPtr;
 				if (he3mirror) {
+                    XLogPageReadPrivate *private = he3xlogreader->private_data;
+                    private->fetching_ckpt = false;
 					err = pthread_create(&ntid,NULL,thr_fn,(void*)he3xlogreader);
 				} else {
 					err = pthread_create(&ntid,NULL,thr_fn,(void*)xlogreader);
@@ -9129,6 +9131,8 @@ void StartupXLOG(void)
 			if(IsBootstrapProcessingMode() != true && InitdbSingle != true) {
 				*g_redoStartLsn = xlogreader->EndRecPtr;
 				if (he3mirror) {
+                    XLogPageReadPrivate *private = he3xlogreader->private_data;
+                    private->fetching_ckpt = false;
 					err = pthread_create(&ntid,NULL,thr_fn,(void*)he3xlogreader);
 				} else {
 					err = pthread_create(&ntid,NULL,thr_fn,(void*)xlogreader);
@@ -14511,9 +14515,10 @@ consumerXLogBatchRead(XLogReaderState *xlogreader, XLogRecPtr startPtr, int reqL
 			if (gRingBufferManger->maxIdx != 0 ) {
 				ring_buffer_dequeue_arr(gRingBufferManger,gRingBufferManger->maxIdx);
 				gRingBufferManger->maxIdx = 0;
-				if (pushFlag == true) {
+				if (pushFlag == true && EnableHotStandby) {
-					//pushFlag = false;
                     return -1;
+                } else {
+                    pushFlag = false;
                 }
 			}
 		}
@@ -14528,10 +14533,12 @@ consumerXLogBatchRead(XLogReaderState *xlogreader, XLogRecPtr startPtr, int reqL
 					return FirstData->dataLen;
 				} else if (startPtr > FirstData->startLsn) {
 					if (FirstData->startLsn == 0) {
-						if (FirstData->checkPointLsn == 0) {
+						if (!he3mirror) {
 							count++;
 						} else {
+                            if (FirstData->checkPointLsn != 0){
                                 SetFileReplayLsn(FirstData->checkPointLsn);
+                            }
 						}
 						gRingBufferManger->maxIdx++;
 						pushFlag = true;
@@ -14712,6 +14719,9 @@ producerXLogParallelBatchRead(XLogReaderState *xlogreader, XLogRecPtr startPtr,
 			wal_batch_t *curElem = NULL;
 			while((curElem = ring_buffer_queue(gRingBufferManger,walElem)) == NULL) {
 				usleep(10);
+                if (IsFreePthreadPool()){
+                    return 0;
+                }
 			}
 			WalTaskPool(curElem);
 		}

src/include/access/pthreadpool.h

@@ -5,6 +5,7 @@ extern int initPthreadPool(void);
 extern int WalTaskPool(wal_batch_t*data);
 extern void WalTaskFree(void);
 extern void WalTaskImmediateFree(void);
+extern bool IsFreePthreadPool(void);
 
 #endif