fpm: fix blocked signals while reloading

Author: m6w6

sapi/fpm/fpm/fpm_process_ctl.c

@@ -77,11 +77,6 @@ static void fpm_pctl_exit() /* {{{ */
 
 static void fpm_pctl_exec() /* {{{ */
 {
-	zlog(ZLOG_DEBUG, "Blocking some signals before reexec");
-	if (0 > fpm_signals_block()) {
-		zlog(ZLOG_WARNING, "concurrent reloads may be unstable");
-	}
-
 	switch (fork()) {
 	case 0:
 		break;
@@ -109,6 +104,11 @@ static void fpm_pctl_exec() /* {{{ */
 		optional_arg(10)
 	);
 
+	zlog(ZLOG_DEBUG, "Blocking some signals before reexec");
+	if (0 > fpm_signals_block()) {
+		zlog(ZLOG_WARNING, "concurrent reloads may be unstable");
+	}
+
 	fpm_cleanups_run(FPM_CLEANUP_PARENT_EXEC);
 	execvp(saved_argv[0], saved_argv);
 	zlog(ZLOG_SYSERROR, "failed to reload: execvp() failed");

sapi/fpm/tests/bug68442-signal-reload.phpt

@@ -29,9 +29,11 @@ $tester->ping('{{ADDR}}');
 $tester->signal('USR2');
 $tester->expectLogNotice('Reloading in progress ...');
 $tester->expectLogNotice('reloading: .*');
+$tester->expectLogNotice('exiting after reload');
 $tester->expectLogNotice('using inherited socket fd=\d+, "127.0.0.1:\d+"');
 $tester->expectLogStartNotices();
 $tester->ping('{{ADDR}}');
+$tester->signal('TERM');
 $tester->terminate();
 $tester->expectLogTerminatingNotices();
 $tester->close();

sapi/fpm/tests/bug74083-concurrent-reload.phpt

@@ -57,10 +57,12 @@ $tester->getLogLines(2000);
 $tester->signal('USR2');
 $tester->expectLogNotice('Reloading in progress ...');
 $tester->expectLogNotice('reloading: .*');
+$tester->expectLogNotice('exiting after reload');
 $tester->expectLogNotice('using inherited socket fd=\d+, "127.0.0.1:\d+"');
 $tester->expectLogStartNotices();
 $tester->ping('{{ADDR}}');
 
+$tester->signal('TERM');
 $tester->terminate();
 $tester->expectLogTerminatingNotices();
 $tester->close();

sapi/fpm/tests/bug76601-reload-child-signals.phpt

@@ -73,9 +73,11 @@ if (!$tester->expectLogNotice('reloading: .*')) {
     echo "Skipped messages\n";
     echo implode('', $skipped);
 }
+$tester->expectLogNotice('exiting after reload');
 $tester->expectLogNotice('using inherited socket fd=\d+, "127.0.0.1:\d+"');
 $tester->expectLogStartNotices();
 
+$tester->signal('TERM');
 $tester->terminate();
 $tester->expectLogTerminatingNotices();
 $tester->close();

sapi/fpm/tests/bug77934-reload-process-control.phpt

@@ -30,9 +30,12 @@ $tester->ping('{{ADDR}}');
 $tester->signal('USR2');
 $tester->expectLogNotice('Reloading in progress ...');
 $tester->expectLogNotice('reloading: .*');
+$tester->expectLogNotice('exiting after reload');
 $tester->expectLogNotice('using inherited socket fd=\d+, "127.0.0.1:\d+"');
 $tester->expectLogStartNotices();
 $tester->ping('{{ADDR}}');
+
+$tester->signal('TERM');
 $tester->terminate();
 $tester->expectLogTerminatingNotices();
 $tester->close();