diff --git a/0131-RHBZ-1259523-host_name_len.patch b/0131-RHBZ-1259523-host_name_len.patch new file mode 100644 index 0000000..1460550 --- /dev/null +++ b/0131-RHBZ-1259523-host_name_len.patch @@ -0,0 +1,17 @@ +--- + libmultipath/structs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: multipath-tools-130222/libmultipath/structs.h +=================================================================== +--- multipath-tools-130222.orig/libmultipath/structs.h ++++ multipath-tools-130222/libmultipath/structs.h +@@ -15,7 +15,7 @@ + #define BLK_DEV_SIZE 33 + #define PATH_SIZE 512 + #define NAME_SIZE 512 +-#define HOST_NAME_LEN 8 ++#define HOST_NAME_LEN 16 + #define SLOT_NAME_SIZE 40 + + #define SCSI_VENDOR_SIZE 9 diff --git a/0132-UPBZ-1259831-lock-retry.patch b/0132-UPBZ-1259831-lock-retry.patch new file mode 100644 index 0000000..3f5bd4d --- /dev/null +++ b/0132-UPBZ-1259831-lock-retry.patch @@ -0,0 +1,33 @@ +--- + 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); + /* diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index 8e68955..628f0f5 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath Version: 0.4.9 -Release: 79%{?dist} +Release: 80%{?dist} License: GPL+ Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -138,6 +138,8 @@ Patch0127: 0127-RHBZ-1201030-use-blk-availability.patch Patch0128: 0128-RHBZ-1222123-mpathconf-allow.patch Patch0129: 0129-RHBZ-1241774-sun-partition-numbering.patch Patch0130: 0130-UPBZ-1254292-iscsi-targetname.patch +Patch0131: 0131-RHBZ-1259523-host_name_len.patch +Patch0132: 0132-UPBZ-1259831-lock-retry.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -321,6 +323,8 @@ kpartx manages partition creation and removal for device-mapper devices. %patch0128 -p1 %patch0129 -p1 %patch0130 -p1 +%patch0131 -p1 +%patch0132 -p1 cp %{SOURCE1} . %build @@ -422,6 +426,12 @@ fi %{_mandir}/man8/kpartx.8.gz %changelog +* Fri Sep 25 2015 Benjamin Marzinski 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 + * Mon Aug 17 2015 Benjamin Marzinski 0.4.9-79 - Add 0130-UPBZ-1254292-iscsi-targetname.patch * check for targetname iscsi sysfs value