f

Author: reshke

src/backend/postmaster/postmaster.c

@@ -4501,8 +4501,9 @@ BackendStartup(Port *port)
 	pid = backend_forkexec(port);
 #else							/* !EXEC_BACKEND */
 
-	if (gp_enable_fork_lock)
-		SpinLockAcquire(ForkLock);
+	if (gp_enable_fork_sleep)
+		pg_usleep(gp_enable_fork_sleep * 1000 /*ms*/);
+
 	pid = fork_process();
 	if (pid == 0)				/* child */
 	{
@@ -4527,8 +4528,6 @@ BackendStartup(Port *port)
 
 		/* Perform additional initialization and collect startup packet */
 		BackendInitialize(port);
-		if (gp_enable_fork_lock)
-			SpinLockRelease(ForkLock);
 
 		/* And run the backend */
 		BackendRun(port);

src/backend/storage/ipc/ipci.c

@@ -372,7 +372,7 @@ CreateSharedMemoryAndSemaphores(int port)
 
 	if (gp_enable_resqueue_priority)
 		BackoffStateInit();
-	if (gp_enable_fork_lock) {
+	if (gp_enable_fork_sleep) {
 			/* Create ProcStructLock spinlock, too */
 		ForkLock = (slock_t *) ShmemAlloc(sizeof(slock_t));
 		SpinLockInit(ForkLock);

src/backend/utils/misc/guc_gp.c

@@ -215,7 +215,7 @@ static char *gp_resource_manager_str;
 
 /* Backoff-related GUCs */
 bool		gp_enable_resqueue_priority;
-bool		gp_enable_fork_lock;
+int			gp_enable_fork_sleep;
 int			gp_resqueue_priority_local_interval;
 int			gp_resqueue_priority_sweeper_interval;
 int			gp_resqueue_priority_inactivity_timeout;
@@ -1744,17 +1744,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true,
 		NULL, NULL, NULL
 	},
-
-	{
-		{"gp_enable_fork_lock", PGC_POSTMASTER, RESOURCES_MGM,
-			gettext_noop("Enables priority scheduling."),
-			NULL
-		},
-		&gp_enable_fork_lock,
-		true,
-		NULL, NULL, NULL
-	},
-
 	{
 		{"debug_resource_group", PGC_USERSET, DEVELOPER_OPTIONS,
 			gettext_noop("Prints resource groups debug logs."),
@@ -3350,6 +3339,19 @@ struct config_bool ConfigureNamesBool_gp[] =
 
 struct config_int ConfigureNamesInt_gp[] =
 {
+
+	{
+		{"gp_enable_fork_sleep", PGC_USERSET, RESOURCES_MGM,
+			gettext_noop("Enables priority scheduling."),
+			gettext_noop("Enables priority scheduling."),
+			GUC_UNIT_S | GUC_NOT_IN_SAMPLE
+		},
+		&gp_enable_fork_sleep,
+		100, 0, 7200,
+		NULL, NULL, NULL
+	},
+
+	
 	{
 		{"readable_external_table_timeout", PGC_USERSET, EXTERNAL_TABLES,
 			gettext_noop("Cancel the query if no data read within N seconds."),

src/include/postmaster/backoff.h

@@ -12,7 +12,7 @@
 
 /* GUCs */
 extern bool gp_enable_resqueue_priority;
-extern bool gp_enable_fork_lock;
+extern bool gp_enable_fork_sleep;
 extern int gp_resqueue_priority_local_interval;
 extern int gp_resqueue_priority_sweeper_interval;
 extern int gp_resqueue_priority_inactivity_timeout;

src/include/utils/sync_guc_name.h

@@ -23,7 +23,7 @@
 		"gp_enable_mk_sort",
 		"gp_enable_motion_mk_sort",
 		"gp_enable_segment_copy_checking",
-		"gp_enable_fork_lock",
+		"gp_enable_fork_sleep",
 		"gp_external_enable_filter_pushdown",
 		"gp_gpperfmon_send_interval",
 		"gp_hashagg_default_nbatches",