diff --git a/SOURCES/classify-device-connectivity-issues-as-global-errors.patch b/SOURCES/classify-device-connectivity-issues-as-global-errors.patch new file mode 100644 index 0000000..9babdcb --- /dev/null +++ b/SOURCES/classify-device-connectivity-issues-as-global-errors.patch @@ -0,0 +1,35 @@ +From 093f1aa2f13cf4d77374ded12161e832196da548 Mon Sep 17 00:00:00 2001 +From: "Martin K. Petersen" +Date: Thu, 21 May 2015 17:42:15 -0400 +Subject: oracleasm: Classify device connectivity issues as global errors + +We used to set the ASM_LOCAL_ERROR qualifier when we got ENOLINK, EBADE +or ENODEV status from the storage stack. The assumption was that the +error could be caused by a pulled cable or a bad switch port and that +other nodes in a cluster might still have access to the storage. + +The ASM team would prefer these types of errors to be treated as global, +however, as this would be consistent with database behavior when ASMLIB +is not in the picture. + +Remove the ASM_LOCAL_ERROR flag from the device connectivity error code +path. + +Orabug: 20117903 + +Signed-off-by: Martin K. Petersen + +diff --git a/drivers/block/oracleasm/driver.c b/drivers/block/oracleasm/driver.c +index 7eb1707..94acab2 100644 +--- a/drivers/block/oracleasm/driver.c ++++ b/drivers/block/oracleasm/driver.c +@@ -1176,7 +1176,6 @@ static void asm_end_ioc(struct asm_request *r, unsigned int bytes_done, + case -EBADE: + case -ENODEV: + r->r_error = ASM_ERR_NODEV; +- r->r_status |= ASM_LOCAL_ERROR; + break; + + case -ENOMEM: +-- +cgit v0.10.2 diff --git a/SOURCES/kmodtool b/SOURCES/kmodtool index 4b766ce..1d49fdb 100755 --- a/SOURCES/kmodtool +++ b/SOURCES/kmodtool @@ -42,7 +42,7 @@ shopt -s extglob myprog="kmodtool" -myver="rhel6-rh2" +myver="rhel7-rh1" knownvariants=@(debug|kdump) kmod_name= kver= @@ -159,7 +159,7 @@ get_rpmtemplate () # Turn of the internal dep generator so we will use the kmod scripts. echo "%global _use_internal_dependency_generator 0" cat <= ${verrel_dep}${dotvariant} Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): /usr/sbin/depmod Requires(postun): /usr/sbin/depmod diff --git a/SOURCES/oracleasm.preamble b/SOURCES/oracleasm.preamble index ebf8805..e9286c6 100644 --- a/SOURCES/oracleasm.preamble +++ b/SOURCES/oracleasm.preamble @@ -1,3 +1,2 @@ -Requires: kernel >= 3.10.0-229.el7 -Requires: kernel < 3.10.0-230.el7 +Requires: kernel >= 3.10.0-326.el7 Provides: oracleasm = %{version}-%{release} diff --git a/SPECS/oracleasm.spec b/SPECS/oracleasm.spec index 729c2a3..472385d 100644 --- a/SPECS/oracleasm.spec +++ b/SPECS/oracleasm.spec @@ -1,24 +1,25 @@ %define kmod_name oracleasm %define kmod_driver_version 2.0.8 -%define kmod_rpm_release 8 -%define kmod_git_hash 73eec1df4b6aec6e850db5015d74dbf6dee01e01 -%define kmod_kernel_version 3.10.0-229.el7 -%define kernel_version 3.10.0-229.el7 +%define kmod_rpm_release 15 +%define kmod_git_hash 73eec1df4b6aec6e850db5015d74dbf6dee01e01 +%define kmod_kernel_version 3.10.0-326.el7 +%define kernel_version 3.10.0-326.el7 %define kmod_kbuild_dir drivers/block/oracleasm %{!?dist: %define dist .el7} -Source0: %{kmod_name}-%{kmod_driver_version}.tar.bz2 -Source1: %{kmod_name}.files -Source2: depmodconf -Source3: find-requires.ksyms -Source4: find-provides.ksyms -Source5: kmodtool -Source6: symbols.greylist-x86_64 +Source0: %{kmod_name}-%{kmod_driver_version}.tar.bz2 +Source1: %{kmod_name}.files +Source2: depmodconf +Source3: find-requires.ksyms +Source4: find-provides.ksyms +Source5: kmodtool +Source6: symbols.greylist-x86_64 Source7: oracleasm.preamble Patch0: oracleasm.patch +Patch1: classify-device-connectivity-issues-as-global-errors.patch %define __find_requires %_sourcedir/find-requires.ksyms %define __find_provides %_sourcedir/find-provides.ksyms %{kmod_name} %{?epoch:%{epoch}:}%{version}-%{release} @@ -46,6 +47,7 @@ ExclusiveArch: x86_64 %prep %setup %patch0 -p1 +%patch1 -p1 set -- * mkdir source @@ -105,6 +107,35 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 26 2015 Petr Oros 2.0.8-15 +- For >= kernel-3.10.0-326.el7 +- Resolves: #1265218 + +* Tue Sep 22 2015 Petr Oros 2.0.8-14 +- Classify device connectivity issues as global errors +- For >= kernel-3.10.0-319.el7 +- Resolves: #1265218 + +* Wed Sep 9 2015 Petr Oros 2.0.8-13 +- rebuild for >= kernel-3.10.0-315.el7 +- Resolves: #1245327 + +* Thu Sep 3 2015 Petr Oros 2.0.8-12 +- rebuild for kernel-3.10.0-313.el7 +- Resolves: #1245327 + +* Wed Aug 19 2015 Petr Oros 2.0.8-11 +- rebuild for kernel-3.10.0-306.0.1.el7 +- Resolves: #1245327 + +* Tue Aug 18 2015 Petr Oros 2.0.8-10 +- rebuild for kernel-3.10.0-306.el7 +- Resolves: #1245327 + +* Tue Aug 4 2015 Petr Oros 2.0.8-9 +- rebuild for kernel-3.10.0-302.el7 +- Resolves: #1245327 + * Wed Jan 30 2015 Dave Anderson 2.0.8-8 - rebuild for kernel-3.10.0-229.el7