device-mapper-multipath/0132-UPBZ-1259831-lock-retry.patch
Benjamin Marzinski 7050d56134 device-mapper-multipath-0.4.9-80
Add 0131-RHBZ-1259523-host_name_len.patch
  * increase size of host string
Add 0132-UPBZ-1259831-lock-retry.patch
  * retry locking when creating multipath devices
2015-09-25 15:30:22 -05:00

34 lines
937 B
Diff

---
multipathd/main.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
Index: multipath-tools-130222/multipathd/main.c
===================================================================
--- multipath-tools-130222.orig/multipathd/main.c
+++ multipath-tools-130222/multipathd/main.c
@@ -462,6 +462,7 @@ ev_add_path (struct path * pp, struct ve
char params[PARAMS_SIZE] = {0};
int retries = 3;
int start_waiter = 0;
+ int ret;
/*
* need path UID to go any further
@@ -540,7 +541,15 @@ rescan:
/*
* reload the map for the multipath mapped device
*/
- if (domap(mpp, params) <= 0) {
+retry:
+ ret = domap(mpp, params);
+ if (ret <= 0) {
+ if (ret < 0 && retries-- > 0) {
+ condlog(0, "%s: retry domap for addition of new "
+ "path %s", mpp->alias, pp->dev);
+ sleep(1);
+ goto retry;
+ }
condlog(0, "%s: failed in domap for addition of new "
"path %s", mpp->alias, pp->dev);
/*