Fix SignalBarrier

Author: baobao0206

src/backend/commands/dbcommands.c

@@ -3470,15 +3470,15 @@ dbase_redo(XLogReaderState *record)
 		}
 		pfree(parentdir);
 
+		/* Close all sgmr fds in all backends. */
+		WaitForProcSignalBarrier(EmitProcSignalBarrier(PROCSIGNAL_BARRIER_SMGRRELEASE));
+
 		/*
 		 * Force dirty buffers out to disk, to ensure source database is
 		 * up-to-date for the copy.
 		 */
 		FlushDatabaseBuffers(xlrec->src_db_id);
 
-		/* Close all sgmr fds in all backends. */
-		WaitForProcSignalBarrier(EmitProcSignalBarrier(PROCSIGNAL_BARRIER_SMGRRELEASE));
-
 		/*
 		 * Copy this subdirectory to the new location
 		 *

src/backend/utils/misc/faultinjector.c

@@ -876,6 +876,7 @@ FaultInjector_SetFaultInjection(
 				   entryLocal->faultInjectorState != FaultInjectorStateCompleted &&
 				   entryLocal->numTimesTriggered - entryLocal->startOccurrence < entry->extraArg - 1)
 			{
+				CHECK_FOR_INTERRUPTS();
 				pg_usleep(200000);  /* 0.2 sec */
 				retry_count--;
 				if (!retry_count)