f9dfbb37ac
Modify 0136-RHBZ-1304687-wait-for-map-add.patch
* switch to missing_uev_wait_timeout to stop waiting for uev
Refresh 0137-RHBZ-1280524-clear-chkr-msg.patch
Refresh 0150-RHBZ-1253913-fix-startup-msg.patch
Refresh 0154-UPBZ-1291406-disable-reinstate.patch
Refresh 0156-UPBZ-1313324-dont-fail-discovery.patch
Refresh 0161-RHBZ-1311659-no-kpartx.patch
Refresh 0167-RHBZ-1335176-fix-show-cmds.patch
Add 0173-RH-update-man-page.patch
Add 0174-RHBZ-1362396-modprobe.patch
* make starting the multipathd service modprobe dm-multipath in the
sysvinit scripts
Add 0175-RHBZ-1357382-ordering.patch
* force multipathd.service to start after systemd-udev-trigger.service
Add 0176-RHBZ-1363830-fix-rename.patch
* initialized a variable to make dm_rename not fail randomly
Add 0177-libmultipath-correctly-initialize-pp-sg_id.patch
* This and all the following patches add the rbd patch checker
Add 0178-libmultipath-add-rbd-discovery.patch
Add 0179-multipath-tools-add-checker-callout-to-repair-path.patch
Add 0180-multipath-tools-Add-rbd-checker.patch
Add 0181-multipath-tools-Add-rbd-to-the-hwtable.patch
Add 0182-multipath-tools-check-for-initialized-checker-before.patch
Add 0183-multipathd-Don-t-call-repair-on-blacklisted-path.patch
Add 0184-rbd-fix-sync-repair-support.patch
Add 0185-rbd-check-for-nonshared-clients.patch
Add 0186-rbd-check-for-exclusive-lock-enabled.patch
Add 0187-rbd-fixup-log-messages.patch
Add 0188-RHBZ-1368501-dont-exit.patch
* make multipathd not exit if it encounters recoverable errors on startup
Add 0189-RHBZ-1368211-remove-retries.patch
* add "remove_retries" multipath.conf parameter to make multiple attempts
to remove a multipath device if it is busy.
Add 0190-RHBZ-1380602-rbd-lock-on-read.patch
* pass lock_on_read when remapping image
Add 0191-RHBZ-1169168-disable-changed-paths.patch
* add "disabled_changed_wwids" multipath.conf parameter to disable
paths whose wwid changes
Add 0192-RHBZ-1362409-infinibox-config.patch
Add 0194-RHBZ-1351964-kpartx-recurse.patch
* fix recursion on corrupt dos partitions
Add 0195-RHBZ-1359510-no-daemon-msg.patch
* print a messages when multipathd isn't running
Add 0196-RHBZ-1239173-dont-set-flag.patch
* don't set reload flag on reloads when you gain your first
valid path
Add 0197-RHBZ-1394059-max-sectors-kb.patch
* add "max_sectors_kb" multipath.conf parameter to set max_sectors_kb
on a multipath device and all its path devices
Add 0198-RHBZ-1372032-detect-path-checker.patch
* add "detect_checker" multipath.conf parameter to detect ALUA arrays
and set the path checker to TUR
Add 0199-RHBZ-1279355-3pardata-config.patch
Add 0200-RHBZ-1402092-orphan-status.patch
* clear status on orphan paths
Add 0201-RHBZ-1403552-silence-warning.patch
Add 0202-RHBZ-1362120-skip-prio.patch
* don't run prio on failed paths
Add 0203-RHBZ-1363718-add-msgs.patch
Add 0204-RHBZ-1406226-nimble-config.patch
Add 0205-RHBZ-1416569-reset-stats.patch
* add "reset maps stats" and "reset map <map> stats" multipathd
interactive commands to reset the stats tracked by multipathd
Add 0206-RHBZ-1239173-pt2-no-paths.patch
* make multipath correctly disable scanning and rules running when
it gets a uevent and there are not valid paths.
Add 0207-UP-add-libmpathcmd.patch
* New shared library, libmpathcmd, that sends and receives messages from
multipathd. device-mapper-multipath now uses this library internally.
Add 0208-UPBZ-1430097-multipathd-IPC-changes.patch
* validation that modifying commands are coming from root.
Add 0209-UPBZ-1430097-multipath-C-API.patch
* New shared library. libdmmp, that presents the information from multipathd
in a structured manner to make it easier for callers to use
Add 0210-RH-fix-uninstall.patch
* Minor compilation fixes
Add 0211-RH-strlen-fix.patch
* checks that variables are not NULL before passing them to strlen
Add 0212-RHBZ-1431562-for-read-only.patch
Make 3 new subpackages
* device-mapper-multipath-devel, libdmmp, and libdmmp-devel. libmpathcmd
and libmpathprio are in device-mapper-multipath-libs and
device-mapper-multipath-devel. libdmmp is in its own subpackages
Move libmpathprio devel files to device-mapper-multipath-devel
Added BuildRequires on librados2-devel
112 lines
3.3 KiB
Diff
112 lines
3.3 KiB
Diff
---
|
|
libmultipath/configure.c | 21 ++++++++++++++++++++-
|
|
libmultipath/configure.h | 1 +
|
|
multipath/main.c | 21 +++++++++++++++++++++
|
|
3 files changed, 42 insertions(+), 1 deletion(-)
|
|
|
|
Index: multipath-tools-130222/libmultipath/configure.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/configure.c
|
|
+++ multipath-tools-130222/libmultipath/configure.c
|
|
@@ -743,7 +743,8 @@ deadmap (struct multipath * mpp)
|
|
return 1; /* dead */
|
|
}
|
|
|
|
-int check_daemon(void)
|
|
+extern int
|
|
+check_daemon(void)
|
|
{
|
|
int fd;
|
|
char *reply;
|
|
@@ -776,6 +777,7 @@ coalesce_paths (struct vectors * vecs, v
|
|
{
|
|
int r = 1;
|
|
int k, i;
|
|
+ int map_processed = 0;
|
|
char empty_buff[WWID_SIZE];
|
|
char params[PARAMS_SIZE];
|
|
struct multipath * mpp;
|
|
@@ -936,6 +938,13 @@ coalesce_paths (struct vectors * vecs, v
|
|
else
|
|
remove_map(mpp, vecs, 0);
|
|
}
|
|
+
|
|
+ /* By now at least one multipath device map is processed,
|
|
+ * so set map_processed = 1
|
|
+ */
|
|
+ if (!map_processed)
|
|
+ map_processed = 1;
|
|
+
|
|
}
|
|
/*
|
|
* Flush maps with only dead paths (ie not in sysfs)
|
|
@@ -963,6 +972,16 @@ coalesce_paths (struct vectors * vecs, v
|
|
condlog(2, "%s: remove (dead)", alias);
|
|
}
|
|
}
|
|
+
|
|
+ /* If there is at least one multipath device map processed then
|
|
+ * check if 'multipathd' service is running or not?
|
|
+ */
|
|
+ if (map_processed) {
|
|
+ if (!conf->daemon && !check_daemon())
|
|
+ condlog(0, "'multipathd' service is currently not "
|
|
+ "running, IO failover/failback will not work");
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
Index: multipath-tools-130222/libmultipath/configure.h
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/configure.h
|
|
+++ multipath-tools-130222/libmultipath/configure.h
|
|
@@ -27,6 +27,7 @@ enum actions {
|
|
int setup_map (struct multipath * mpp, char * params, int params_size );
|
|
int domap (struct multipath * mpp, char * params);
|
|
int reinstate_paths (struct multipath *mpp);
|
|
+int check_daemon(void);
|
|
int coalesce_paths (struct vectors *vecs, vector curmp, char * refwwid, int force_reload);
|
|
int get_refwwid (char * dev, enum devtypes dev_type, vector pathvec, char **wwid);
|
|
int reload_map(struct vectors *vecs, struct multipath *mpp, int refresh);
|
|
Index: multipath-tools-130222/multipath/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipath/main.c
|
|
+++ multipath-tools-130222/multipath/main.c
|
|
@@ -178,6 +178,7 @@ static int
|
|
get_dm_mpvec (vector curmp, vector pathvec, char * refwwid)
|
|
{
|
|
int i;
|
|
+ int maps_present = 0;
|
|
struct multipath * mpp;
|
|
char params[PARAMS_SIZE], status[PARAMS_SIZE];
|
|
|
|
@@ -226,7 +227,27 @@ get_dm_mpvec (vector curmp, vector pathv
|
|
|
|
if (conf->cmd == CMD_CREATE)
|
|
reinstate_paths(mpp);
|
|
+
|
|
+ /* At this place we have found at least one multipath
|
|
+ * device map, so set maps_present = 1
|
|
+ */
|
|
+ if (!maps_present)
|
|
+ maps_present = 1;
|
|
+
|
|
}
|
|
+
|
|
+ /* If there is at least one multipath device map present then
|
|
+ * check if 'multipathd' service is running or not?
|
|
+ */
|
|
+ if (maps_present) {
|
|
+ if (!conf->daemon && !check_daemon()) {
|
|
+ condlog(0, "multipath device maps are present, but "
|
|
+ "'multipathd' service is not running");
|
|
+ condlog(0, "IO failover/failback will not work without "
|
|
+ "'multipathd' service running");
|
|
+ }
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|