diff --git a/_service b/_service index 7227c6e..1bda7f2 100644 --- a/_service +++ b/_service @@ -7,10 +7,10 @@ To update to a new release, change "revision" to the desired git commit hash and bump "version" if necessary - 9.0.17-1 + 9.0.18-1 --> - 9.0.17+git.%h - b9abab2dd27313922797d026542b399870bfd13e + 9.0.18+git.%h + 08cff482579f0dbbc0aed76b65d9b1a1870d2292 diff --git a/drbd-9.0.17+git.b9abab2d.tar.bz2 b/drbd-9.0.17+git.b9abab2d.tar.bz2 deleted file mode 100644 index 826ee04..0000000 --- a/drbd-9.0.17+git.b9abab2d.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:350585501737e48f30ae785ea95db65588ab8abca1ac9fa3ec7480d16889c86c -size 444681 diff --git a/drbd-9.0.18+git.08cff482.tar.bz2 b/drbd-9.0.18+git.08cff482.tar.bz2 new file mode 100644 index 0000000..98cd6d4 --- /dev/null +++ b/drbd-9.0.18+git.08cff482.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:530631b92b2f07be5e81bbcc5d9d6c5f528db56ff2540a3a4372b6c7d4a48152 +size 331095 diff --git a/drbd.changes b/drbd.changes index a93d5df..0d66447 100644 --- a/drbd.changes +++ b/drbd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue May 28 05:52:07 UTC 2019 - nwang@suse.com + +- Upgrade to 9.0.18-1 + * Fix an IO deadlock under memory pressure + * Fix disconnect timing in case the network connection suddenly + drops all packets + * Fix some misbehavior that surfaced with Ahead/Behind + * Fix potential spinlock deadlock in IRQ + * Minor fixes: forget-peer, _rcu iterators + * Quickly stop resync during AHEAD/BEHIND by introducing new + packet for that purpose. + * The quorum feature can now use the connectivity to + the majority of Diskless nodes as tiebreaker + * Access meta-data using DAX if it is on persistent memory + (NVDIMM or PMEM); For write intense workloads this is a x2 to x4 speedup! +- Remove patch fix-make-error.patch since merged into upstream(46e8e3fc) + ------------------------------------------------------------------- Fri Mar 22 02:10:17 UTC 2019 - nwang@suse.com diff --git a/drbd.spec b/drbd.spec index acde91b..f501f98 100644 --- a/drbd.spec +++ b/drbd.spec @@ -24,7 +24,7 @@ %endif Name: drbd -Version: 9.0.17+git.b9abab2d +Version: 9.0.18+git.08cff482 Release: 0 Summary: DRBD driver for Linux License: GPL-2.0+ @@ -38,7 +38,6 @@ Source3: drbd_git_revision Patch1: fix-resync-finished-with-syncs-have-bits-set.patch Patch2: compat_no_bioset_initialized.patch Patch3: rely-on-sb-handlers.patch -Patch4: fix-make-error.patch BuildRequires: kernel-source BuildRequires: kernel-syms BuildRequires: libelf-devel @@ -74,7 +73,6 @@ installed kernel. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 mkdir source cp -a drbd/. source/. || : diff --git a/drbd_git_revision b/drbd_git_revision index 516014e..7a4b59d 100644 --- a/drbd_git_revision +++ b/drbd_git_revision @@ -1 +1 @@ -GIT-hash: b9abab2dd27313922797d026542b399870bfd13e +GIT-hash: 08cff482579f0dbbc0aed76b65d9b1a1870d2292 diff --git a/fix-make-error.patch b/fix-make-error.patch deleted file mode 100644 index da07a02..0000000 --- a/fix-make-error.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix the grace build/ld error when build against openSUSE TW. - -"$(filter-out drbd_buildtag.o,$(drbd-y))" will translate to -all the .o except drbd_buildtag.o - -Error log: -[ 110s] UPD /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/compat.h -[ 110s] CC [M] /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_debugfs.o -[ 111s] GEN /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_buildtag.c -[ 111s] CC [M] /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_buildtag.o -[ 112s] LD [M] /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd.o -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_bitmap.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_proc.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_sender.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_receiver.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_req.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_actlog.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/lru_cache.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_main.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_strings.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_nl.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_interval.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_state.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd-kernel-compat/drbd_wrappers.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_nla.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_transport.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/kref_debug.o: No such file or directory -[ 112s] ld: cannot find /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd_kref_debug.o: No such file or directory -[ 112s] make[3]: *** [/usr/src/linux-5.0.3-1/scripts/Makefile.build:465: /home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default/drbd.o] Error 1 -[ 112s] make[2]: *** [/usr/src/linux-5.0.3-1/Makefile:1568: _module_/home/abuild/rpmbuild/BUILD/drbd-9.0.17~1+git.b9abab2d/default] Error 2 -[ 112s] make[1]: *** [Makefile:152: sub-make] Error 2 - -diff -Naur drbd-9.0.17+git.b9abab2d.orig/drbd/Kbuild drbd-9.0.17+git.b9abab2d/drbd/Kbuild ---- drbd-9.0.17+git.b9abab2d.orig/drbd/Kbuild 2019-04-01 16:13:18.819447480 +0800 -+++ drbd-9.0.17+git.b9abab2d/drbd/Kbuild 2019-04-03 15:13:56.227029581 +0800 -@@ -124,7 +124,7 @@ - # and not in e.g. dash. I'm too lazy to fix it to be compatible. - SHELL=/bin/bash - --$(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y)) -+$(obj)/drbd_buildtag.c: - @$(kecho) ' GEN $@ $(echo-why)' - @set -e; exec > $@.new; \ - echo -e "/* automatically generated. DO NOT EDIT. */"; \ diff --git a/preamble b/preamble index d4699ba..56f977e 100644 --- a/preamble +++ b/preamble @@ -1,4 +1,4 @@ -Requires: kernel-%1 +Requires: kernel-%1 Requires: drbd-utils >= 9.2.0 Supplements: drbd-utils >= 9.2.0 Supplements: packageand(kernel-%1:%name)