Accepting request 483268 from network:ha-clustering:Factory
1 OBS-URL: https://build.opensuse.org/request/show/483268 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=56
This commit is contained in:
Yuchen Lin
Git OBS Bridge
commit
c59849f504
6
_service
6
_service
@ -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.5</param>
|
||||
<param name="version">9.0.7rc1</param>
|
||||
-->
|
||||
<param name="versionformat">9.0.5+git.%h</param>
|
||||
<param name="revision">8d53d3e73f85f8d98f100a0127ccb574a97c5f64</param>
|
||||
<param name="versionformat">9.0.7rc1+git.%h</param>
|
||||
<param name="revision">093821cd3aae36ee123744cc27a2ce548e3a13e9</param>
|
||||
</service>
|
||||
|
||||
<service name="recompress" mode="disabled">
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3fff0223e279ed5f09c785bda8a8eb2cbf314a22267bd5e57c648171059b2759
|
||||
size 297575
|
||||
3
drbd-9.0.7rc1+git.093821cd.tar.bz2
Normal file
3
drbd-9.0.7rc1+git.093821cd.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f156b4096ab7b8f0888dddac45cdeff8c858aa8d3247e3abb6461dc3aa018a03
|
||||
size 304453
|
||||
25
drbd.changes
25
drbd.changes
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 24 07:44:01 UTC 2017 - nwang@suse.com
|
||||
|
||||
- Update to 9.0.7rc1
|
||||
- various fixes to the 2-phase-commit online resize
|
||||
fix fencing and disk state trasition and from consistent, necessary
|
||||
for crm-fence-peer
|
||||
fix calculation of authoritative nodes
|
||||
Quorum to avoid data divergence, an alternative to fencing
|
||||
Compat with Linux 4.10
|
||||
- Remove patch drbd_wrapper-Blank-out-WRITE_SYNC-warning-for-new-ke.patch
|
||||
- Add fix-resync-finished-with-syncs-have-bits-set.patch for bsc#1025089
|
||||
- Including the compatible fix of bsc#1031299
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 6 16:14:45 CET 2017 - hare@suse.de
|
||||
|
||||
- Compability fixes for SLE12 SP3 (bsc#993388, FATE#321732)
|
||||
- Add patch drbd_wrapper-Blank-out-WRITE_SYNC-warning-for-new-ke.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 16 06:56:53 UTC 2017 - nwang@suse.com
|
||||
|
||||
- bsc#1025585, upgrade to 9.0.6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 25 10:28:35 UTC 2016 - lpechacek@suse.com
|
||||
|
||||
|
||||
12
drbd.spec
12
drbd.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package drbd
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -20,12 +20,12 @@
|
||||
|
||||
%if ! 0%{?is_opensuse}
|
||||
%ifarch x86_64
|
||||
%define buildrt 0
|
||||
%define buildrt 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Name: drbd
|
||||
Version: 9.0.5+git.8d53d3e
|
||||
Version: 9.0.7rc1+git.093821cd
|
||||
Release: 0
|
||||
Summary: DRBD driver for Linux
|
||||
License: GPL-2.0
|
||||
@ -36,11 +36,12 @@ Source1: preamble
|
||||
#In kernel is: kernel/drivers/block/drbd/drbd.ko
|
||||
Source2: Module.supported
|
||||
Source3: drbd_git_revision
|
||||
Patch1: fix-resync-finished-with-syncs-have-bits-set.patch
|
||||
BuildRequires: kernel-source
|
||||
BuildRequires: kernel-syms
|
||||
BuildRequires: module-init-tools
|
||||
Requires: drbd-utils >= 8.9.6
|
||||
Supplements: drbd-utils >= 8.9.6
|
||||
Requires: drbd-utils >= 8.9.9
|
||||
Supplements: drbd-utils >= 8.9.9
|
||||
Obsoletes: drbd-kmp < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExcludeArch: i586 s390
|
||||
@ -67,6 +68,7 @@ installed kernel.
|
||||
|
||||
%prep
|
||||
%setup -q -n drbd-%{version}
|
||||
%patch1 -p1
|
||||
|
||||
mkdir source
|
||||
cp -a drbd/. source/. || :
|
||||
|
||||
@ -1 +1 @@
|
||||
GIT-hash: c7888383cd94c74c84705d73b41fbfc41d4d6676
|
||||
GIT-hash: 08cda190c4f544a0c4e15ba792bbf47c69707b42
|
||||
|
||||
13
fix-resync-finished-with-syncs-have-bits-set.patch
Normal file
13
fix-resync-finished-with-syncs-have-bits-set.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -Naur drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c
|
||||
--- drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c 2017-03-24 16:55:42.169376092 +0800
|
||||
+++ drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c 2017-03-24 16:56:51.137239174 +0800
|
||||
@@ -6240,7 +6240,8 @@
|
||||
/* if peer_state changes to connected at the same time,
|
||||
* it explicitly notifies us that it finished resync.
|
||||
* Maybe we should finish it up, too? */
|
||||
- else if (peer_state.conn == L_ESTABLISHED) {
|
||||
+ else if (peer_state.conn == L_ESTABLISHED &&
|
||||
+ peer_disk_state > D_NEGOTIATING) {
|
||||
bool finish_now = false;
|
||||
|
||||
if (old_peer_state.conn == L_WF_BITMAP_S) {
|
||||
Loading…
Reference in New Issue
Block a user