6738b34a0b
- Modify 0005-RH-add-mpathconf.patch
* changed warning message
- Modify 0102-RHBZ-1160478-mpathconf-template.patch
* updated man page
- Modify 0104-RHBZ-631009-deferred-remove.patch
* refactor code and minor fix
- Refresh 0107-RHBZ-1169935-no-new-devs.patch
- Refresh 0112-RHBZ-1194917-add-config_dir-option.patch
- Refresh 0126-RHBZ-1211383-alias-collision.patch
- Add 0133-RHBZ-1296979-fix-define.patch
* look for the correct libudev function to set define
- Add 0134-RHBZ-1241528-check-mpath-prefix.patch
* only touch devices with a "mpath-" dm uuid prefix
- Add 0135-RHBZ-1299600-path-dev-uevents.patch
* trigger path uevent the first time a path is claimed by multipath
- Add 0136-RHBZ-1304687-wait-for-map-add.patch
* wait for the device to finish being added before reloading it.
- Add 0137-RHBZ-1280524-clear-chkr-msg.patch
- Add 0138-RHBZ-1288660-fix-mpathconf-allow.patch
* don't remove existing lines from blacklist_exceptions section
- Add 0139-RHBZ-1273173-queue-no-daemon-doc.patch
- Add 0140-RHBZ-1299647-fix-help.patch
- Add 0141-RHBZ-1303953-mpathpersist-typo.patch
- Add 0142-RHBZ-1283750-kpartx-fix.patch
* only remove devices if their uuid says that they are the correct
partition device
- Add 0143-RHBZ-1299648-kpartx-sync.patch
* default to using udev sync mode
- Add 0144-RHBZ-1299652-alua-pref-arg.patch
* allow "exclusive_pref_bit" argument to alua prioritizer
- Add 0145-UP-resize-help-msg.patch
- Add 0146-UPBZ-1299651-raw-output.patch
* allow raw format mutipathd show commands, that remove headers and padding
- Add 0147-RHBZ-1272620-fail-rm-msg.patch
- Add 0148-RHBZ-1292599-verify-before-remove.patch
* verify that all partitions are unused before attempting to remove a device
- Add 0149-RHBZ-1292599-restore-removed-parts.patch
* don't disable kpartx when restoring the first path of a device.
- Add 0150-RHBZ-1253913-fix-startup-msg.patch
* wait for multipathd daemon to write pidfile before returning
- Add 0151-RHBZ-1297456-weighted-fix.patch
* add wwn keyword to weighted prioritizer for persistent naming
- Add 0152-RHBZ-1269293-fix-blk-unit-file.patch
* use "Wants" instead of "Requires"
- Add 0153-RH-fix-i686-size-bug.patch
* use 64-bit keycodes for multipathd client commands
- Add 0154-UPBZ-1291406-disable-reinstate.patch
* don't automatically reinstate ghost paths for implicit alua devices
- Add 0155-UPBZ-1300415-PURE-config.patch
* Add default config for PURE FlashArray
- Add 0156-UPBZ-1313324-dont-fail-discovery.patch
* don't fail discovery because individual paths failed.
- Add 0157-RHBZ-1319853-multipath-c-error-msg.patch
* better error reporting for multipath -c
- Add 0158-RHBZ-1318581-timestamp-doc-fix.patch
* add documentation for -T
- Add 0159-UPBZ-1255885-udev-waits.patch
* make multipath and kpartx wait after for udev after each command
129 lines
2.8 KiB
Diff
129 lines
2.8 KiB
Diff
---
|
|
multipathd/main.c | 38 +++++++++++++++++++++++++++++---------
|
|
1 file changed, 29 insertions(+), 9 deletions(-)
|
|
|
|
Index: multipath-tools-130222/multipathd/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/main.c
|
|
+++ multipath-tools-130222/multipathd/main.c
|
|
@@ -87,6 +87,7 @@ unsigned int mpath_mx_alloc_len;
|
|
int logsink;
|
|
enum daemon_status running_state;
|
|
pid_t daemon_pid;
|
|
+pid_t parent_pid = -1;
|
|
|
|
static sem_t exit_sem;
|
|
/*
|
|
@@ -1704,6 +1705,12 @@ sigusr2 (int sig)
|
|
}
|
|
|
|
static void
|
|
+sigalrm (int sig)
|
|
+{
|
|
+ exit(0);
|
|
+}
|
|
+
|
|
+static void
|
|
signal_init(void)
|
|
{
|
|
sigset_t set;
|
|
@@ -1806,6 +1813,9 @@ child (void * param)
|
|
}
|
|
|
|
running_state = DAEMON_START;
|
|
+ pid_rc = pidfile_create(DEFAULT_PIDFILE, daemon_pid);
|
|
+ if (parent_pid > 0)
|
|
+ kill(parent_pid, SIGALRM);
|
|
|
|
condlog(2, "--------start up--------");
|
|
condlog(2, "read " DEFAULT_CONFIGFILE);
|
|
@@ -1897,8 +1907,6 @@ child (void * param)
|
|
}
|
|
pthread_attr_destroy(&misc_attr);
|
|
|
|
- /* Startup complete, create logfile */
|
|
- pid_rc = pidfile_create(DEFAULT_PIDFILE, daemon_pid);
|
|
update_timestamp(1);
|
|
/* Ignore errors, we can live without */
|
|
|
|
@@ -1978,7 +1986,10 @@ daemonize(void)
|
|
{
|
|
int pid;
|
|
int dev_null_fd;
|
|
+ struct sigaction oldsig;
|
|
|
|
+ oldsig.sa_handler = signal_set(SIGALRM, sigalrm);
|
|
+ parent_pid = getpid();
|
|
if( (pid = fork()) < 0){
|
|
fprintf(stderr, "Failed first fork : %s\n", strerror(errno));
|
|
return -1;
|
|
@@ -1986,10 +1997,13 @@ daemonize(void)
|
|
else if (pid != 0)
|
|
return pid;
|
|
|
|
+ signal_set(SIGALRM, oldsig.sa_handler);
|
|
setsid();
|
|
|
|
- if ( (pid = fork()) < 0)
|
|
+ if ( (pid = fork()) < 0) {
|
|
fprintf(stderr, "Failed second fork : %s\n", strerror(errno));
|
|
+ goto fail;
|
|
+ }
|
|
else if (pid != 0)
|
|
_exit(0);
|
|
|
|
@@ -2000,30 +2014,34 @@ daemonize(void)
|
|
if (dev_null_fd < 0){
|
|
fprintf(stderr, "cannot open /dev/null for input & output : %s\n",
|
|
strerror(errno));
|
|
- _exit(0);
|
|
+ goto fail;
|
|
}
|
|
|
|
close(STDIN_FILENO);
|
|
if (dup(dev_null_fd) < 0) {
|
|
fprintf(stderr, "cannot dup /dev/null to stdin : %s\n",
|
|
strerror(errno));
|
|
- _exit(0);
|
|
+ goto fail;
|
|
}
|
|
close(STDOUT_FILENO);
|
|
if (dup(dev_null_fd) < 0) {
|
|
fprintf(stderr, "cannot dup /dev/null to stdout : %s\n",
|
|
strerror(errno));
|
|
- _exit(0);
|
|
+ goto fail;
|
|
}
|
|
close(STDERR_FILENO);
|
|
if (dup(dev_null_fd) < 0) {
|
|
fprintf(stderr, "cannot dup /dev/null to stderr : %s\n",
|
|
strerror(errno));
|
|
- _exit(0);
|
|
+ goto fail;
|
|
}
|
|
close(dev_null_fd);
|
|
daemon_pid = getpid();
|
|
return 0;
|
|
+
|
|
+fail:
|
|
+ kill(parent_pid, SIGALRM);
|
|
+ _exit(0);
|
|
}
|
|
|
|
int
|
|
@@ -2102,10 +2120,12 @@ main (int argc, char *argv[])
|
|
if (err < 0)
|
|
/* error */
|
|
exit(1);
|
|
- else if (err > 0)
|
|
+ else if (err > 0) {
|
|
+ /* wait up to 3 seconds for the child to start */
|
|
+ sleep(3);
|
|
/* parent dies */
|
|
exit(0);
|
|
- else
|
|
+ } else
|
|
/* child lives */
|
|
return (child(NULL));
|
|
}
|