Accepting request 505625 from network:ha-clustering:Unstable

bsc#1045473, update to 9.0.8

OBS-URL: https://build.opensuse.org/request/show/505625
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=49
This commit is contained in:
nick wang 2017-06-22 08:38:38 +00:00 committed by Git OBS Bridge
parent 283d692841
commit 5d7f6b839f
7 changed files with 28 additions and 27 deletions

View File

@ -7,10 +7,10 @@
To update to a new release, change "revision" to the desired
git commit hash and bump "version" if necessary
<param name="version">9.0.7rc2</param>
<param name="version">9.0.8</param>
-->
<param name="versionformat">9.0.7rc2+git.%h</param>
<param name="revision">36abd387b6e4341a58117711b2e95777c1dad8ab</param>
<param name="versionformat">9.0.8+git.%h</param>
<param name="revision">c8bc36701c7c7ffc2c208f620c6d89e4ec265704</param>
</service>
<service name="recompress" mode="disabled">

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f787bb1f975bcaa67568315c9ea53ea5c7439846cf1271ce6e398afc09f88591
size 304456

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95de509dfb3038613f1fbea8c6725f2a572c7b0c94fc77f2f2b167d5577bdf73
size 305477

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jun 14 03:21:59 UTC 2017 - nwang@suse.com
- bsc#1045473, update to 9.0.8
fix a race condition between adding connections and receiving data
fix a OOPS on a diskfull node when a request from a diskless node
fix a distributed deadlock when doing a discard/write-same burst
fix an issue with diskless nodes adopting wrong current UUIDs
fix wrongly rejected two-phase-state transactions
fix initial resync, triggered by "--force primary"(regression 9.0.7)
Speed-up AL-updates with bio flags REQ_META and REQ_PRIO
Merged changes from 8.4.10 and with that compatibility with Linux-4.12
- Remove patch fix-initial-sync-stop.patch
- Fix the license to GPL-2.0+
-------------------------------------------------------------------
Thu May 25 07:55:55 UTC 2017 - nwang@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package drbd
#
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -25,10 +25,10 @@
%endif
Name: drbd
Version: 9.0.7rc2+git.36abd387
Version: 9.0.8+git.c8bc3670
Release: 0
Summary: DRBD driver for Linux
License: GPL-2.0
License: GPL-2.0+
Group: Productivity/Clustering/HA
Url: http://drbd.linbit.com/
Source: %{name}-%{version}.tar.bz2
@ -37,12 +37,11 @@ Source1: preamble
Source2: Module.supported
Source3: drbd_git_revision
Patch1: fix-resync-finished-with-syncs-have-bits-set.patch
Patch2: fix-initial-sync-stop.patch
BuildRequires: kernel-source
BuildRequires: kernel-syms
BuildRequires: module-init-tools
Requires: drbd-utils >= 8.9.11
Supplements: drbd-utils >= 8.9.11
Requires: drbd-utils >= 9.0.0
Supplements: drbd-utils >= 9.0.0
Obsoletes: drbd-kmp < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: i586 s390
@ -70,7 +69,6 @@ installed kernel.
%prep
%setup -q -n drbd-%{version}
%patch1 -p1
%patch2 -p1
mkdir source
cp -a drbd/. source/. || :
@ -100,7 +98,7 @@ for flavor in %{flavors_to_build}; do
done
mkdir -p %{buildroot}/%{_sbindir}
%{__ln_s} -f %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
ln -s -f %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
rm -f drbd.conf
%clean

View File

@ -1 +1 @@
GIT-hash: 36abd387b6e4341a58117711b2e95777c1dad8ab
GIT-hash: c8bc36701c7c7ffc2c208f620c6d89e4ec265704

View File

@ -1,12 +0,0 @@
diff -Naur drbd-9.0.7rc2+git.36abd387.orig/drbd/drbd_state.c drbd-9.0.7rc2+git.36abd387/drbd/drbd_state.c
--- drbd-9.0.7rc2+git.36abd387.orig/drbd/drbd_state.c 2017-05-25 13:50:27.713884206 +0800
+++ drbd-9.0.7rc2+git.36abd387/drbd/drbd_state.c 2017-05-25 15:47:29.354091027 +0800
@@ -3039,7 +3039,7 @@
send_new_state_to_all_peer_devices(state_change, n_device);
/* Outdated myself, or became D_UP_TO_DATE tell peers */
- if (disk_state[NEW] >= D_INCONSISTENT && disk_state[NEW] != disk_state[OLD] &&
+ if (disk_state[OLD] >= D_OUTDATED && disk_state[NEW] != disk_state[OLD] &&
repl_state[OLD] >= L_ESTABLISHED && repl_state[NEW] >= L_ESTABLISHED)
send_state = true;