From 283d692841f74dbf4373e6e504e17b5e6319fd6e8096030363a2e3baa0efb951 Mon Sep 17 00:00:00 2001
From: nick wang <nwang@suse.com>
Date: Thu, 25 May 2017 08:04:01 +0000
Subject: [PATCH] Accepting request 498238 from
 home:wanghaisu:branches:network:ha-clustering:Factory

fix bsc#1038852, initial sync not triggered.

OBS-URL: https://build.opensuse.org/request/show/498238
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=47
---
 _service                           |  2 +-
 drbd-9.0.7rc2+git.0677d8b1.tar.bz2 |  3 ---
 drbd-9.0.7rc2+git.36abd387.tar.bz2 |  3 +++
 drbd.changes                       |  6 ++++++
 drbd.spec                          |  4 +++-
 drbd_git_revision                  |  2 +-
 fix-initial-sync-stop.patch        | 12 ++++++++++++
 7 files changed, 26 insertions(+), 6 deletions(-)
 delete mode 100644 drbd-9.0.7rc2+git.0677d8b1.tar.bz2
 create mode 100644 drbd-9.0.7rc2+git.36abd387.tar.bz2
 create mode 100644 fix-initial-sync-stop.patch

diff --git a/_service b/_service
index 3b1658f..d6b688f 100644
--- a/_service
+++ b/_service
@@ -10,7 +10,7 @@
     <param name="version">9.0.7rc2</param>
 -->
     <param name="versionformat">9.0.7rc2+git.%h</param>
-    <param name="revision">0677d8b1ce8a81bc8913391cf8ebd09ad30d32c0</param>
+    <param name="revision">36abd387b6e4341a58117711b2e95777c1dad8ab</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/drbd-9.0.7rc2+git.0677d8b1.tar.bz2 b/drbd-9.0.7rc2+git.0677d8b1.tar.bz2
deleted file mode 100644
index bc2b572..0000000
--- a/drbd-9.0.7rc2+git.0677d8b1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67b4754aaf4b662e6e7d6e5d38f86b75c2d6f702efc3173a067c252db7b410d4
-size 304389
diff --git a/drbd-9.0.7rc2+git.36abd387.tar.bz2 b/drbd-9.0.7rc2+git.36abd387.tar.bz2
new file mode 100644
index 0000000..a1ebda2
--- /dev/null
+++ b/drbd-9.0.7rc2+git.36abd387.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f787bb1f975bcaa67568315c9ea53ea5c7439846cf1271ce6e398afc09f88591
+size 304456
diff --git a/drbd.changes b/drbd.changes
index 9d68ad0..5ddb654 100644
--- a/drbd.changes
+++ b/drbd.changes
@@ -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
 
diff --git a/drbd.spec b/drbd.spec
index bca39a5..0171ece 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -25,7 +25,7 @@
 %endif
 
 Name:           drbd
-Version:        9.0.7rc2+git.0677d8b1
+Version:        9.0.7rc2+git.36abd387
 Release:        0
 Summary:        DRBD driver for Linux
 License:        GPL-2.0
@@ -37,6 +37,7 @@ 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
@@ -69,6 +70,7 @@ installed kernel.
 %prep
 %setup -q -n drbd-%{version}
 %patch1 -p1
+%patch2 -p1
 
 mkdir source
 cp -a drbd/. source/. || :
diff --git a/drbd_git_revision b/drbd_git_revision
index 53eb3fa..f1caea3 100644
--- a/drbd_git_revision
+++ b/drbd_git_revision
@@ -1 +1 @@
-GIT-hash: 0677d8b1ce8a81bc8913391cf8ebd09ad30d32c0
+GIT-hash: 36abd387b6e4341a58117711b2e95777c1dad8ab
diff --git a/fix-initial-sync-stop.patch b/fix-initial-sync-stop.patch
new file mode 100644
index 0000000..0313a83
--- /dev/null
+++ b/fix-initial-sync-stop.patch
@@ -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;
+