Accepting request 498239 from network:ha-clustering:Factory
1 OBS-URL: https://build.opensuse.org/request/show/498239 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=58
This commit is contained in:
commit
7ff6cdb1ce
2
_service
2
_service
@ -10,7 +10,7 @@
|
|||||||
<param name="version">9.0.7rc2</param>
|
<param name="version">9.0.7rc2</param>
|
||||||
-->
|
-->
|
||||||
<param name="versionformat">9.0.7rc2+git.%h</param>
|
<param name="versionformat">9.0.7rc2+git.%h</param>
|
||||||
<param name="revision">0677d8b1ce8a81bc8913391cf8ebd09ad30d32c0</param>
|
<param name="revision">36abd387b6e4341a58117711b2e95777c1dad8ab</param>
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:67b4754aaf4b662e6e7d6e5d38f86b75c2d6f702efc3173a067c252db7b410d4
|
|
||||||
size 304389
|
|
3
drbd-9.0.7rc2+git.36abd387.tar.bz2
Normal file
3
drbd-9.0.7rc2+git.36abd387.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f787bb1f975bcaa67568315c9ea53ea5c7439846cf1271ce6e398afc09f88591
|
||||||
|
size 304456
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 25 07:55:55 UTC 2017 - nwang@suse.com
|
||||||
|
|
||||||
|
- bsc#1038852, fix initial sync not triggered
|
||||||
|
add patch fix-initial-sync-stop.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 26 09:03:00 UTC 2017 - nwang@suse.com
|
Wed Apr 26 09:03:00 UTC 2017 - nwang@suse.com
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: drbd
|
Name: drbd
|
||||||
Version: 9.0.7rc2+git.0677d8b1
|
Version: 9.0.7rc2+git.36abd387
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: DRBD driver for Linux
|
Summary: DRBD driver for Linux
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
@ -37,6 +37,7 @@ Source1: preamble
|
|||||||
Source2: Module.supported
|
Source2: Module.supported
|
||||||
Source3: drbd_git_revision
|
Source3: drbd_git_revision
|
||||||
Patch1: fix-resync-finished-with-syncs-have-bits-set.patch
|
Patch1: fix-resync-finished-with-syncs-have-bits-set.patch
|
||||||
|
Patch2: fix-initial-sync-stop.patch
|
||||||
BuildRequires: kernel-source
|
BuildRequires: kernel-source
|
||||||
BuildRequires: kernel-syms
|
BuildRequires: kernel-syms
|
||||||
BuildRequires: module-init-tools
|
BuildRequires: module-init-tools
|
||||||
@ -69,6 +70,7 @@ installed kernel.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n drbd-%{version}
|
%setup -q -n drbd-%{version}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
mkdir source
|
mkdir source
|
||||||
cp -a drbd/. source/. || :
|
cp -a drbd/. source/. || :
|
||||||
|
@ -1 +1 @@
|
|||||||
GIT-hash: 0677d8b1ce8a81bc8913391cf8ebd09ad30d32c0
|
GIT-hash: 36abd387b6e4341a58117711b2e95777c1dad8ab
|
||||||
|
12
fix-initial-sync-stop.patch
Normal file
12
fix-initial-sync-stop.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user