Accepting request 907423 from home:wanghaisu:branches:network:ha-clustering:Factory

Update to 9.0.30~1

OBS-URL: https://build.opensuse.org/request/show/907423
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=133
This commit is contained in:
nick wang 2021-07-21 07:09:53 +00:00 committed by Git OBS Bridge
parent c4415b9ea2
commit b04b5ff4a3
8 changed files with 24 additions and 38 deletions

View File

@ -3,9 +3,8 @@
<param name="url">git@github.com:LINBIT/drbd-9.0.git</param>
<param name="scm">git</param>
<param name="filename">drbd</param>
<param name="versionformat">9.0.29~1+git.%h</param>
<param name="versionformat">9.0.30~1+git.%h</param>
<param name="revision">drbd-9.0</param>
<param name="changesgenerate">disable</param>
</service>
<service name="recompress" mode="disabled">

View File

@ -1,4 +0,0 @@
<servicedata>
<service name="tar_scm">
<param name="url">git@github.com:LINBIT/drbd-9.0.git</param>
<param name="changesrevision">cc6228800d630a19f2bf37af41bab566011286c0</param></service></servicedata>

View File

@ -1,24 +0,0 @@
1. "policy" of "genl_ops" removed in 3b0f31f2b8c9fb348e4530b88f6b64f9621f83d6. Then add back in 48526a0f4ca2b484cab4318dc0b2c2be1d8685b7
diff -Naur drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/gen_patch_names.c drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/gen_patch_names.c
--- drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/gen_patch_names.c 2021-05-07 13:31:20.629024504 +0800
+++ drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/gen_patch_names.c 2021-05-07 13:33:05.932908956 +0800
@@ -247,8 +247,10 @@
patch(1, "bio_free", false, true,
COMPAT_HAVE_BIO_FREE, "present");
+#if !defined(COMPAT_GENL_MAXATTR_IN_OPS)
patch(1, "genl_policy", false, true,
COMPAT_GENL_POLICY_IN_OPS, "in_ops");
+#endif
patch(1, "blk_queue_merge_bvec", false, true,
COMPAT_HAVE_BLK_QUEUE_MERGE_BVEC, "present");
diff -Naur drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c
--- drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c 1970-01-01 08:00:00.000000000 +0800
+++ drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c 2021-05-07 13:32:16.452960387 +0800
@@ -0,0 +1,4 @@
+#include <net/genetlink.h>
+
+struct genl_ops ops = { .maxattr = 1, };
+

View File

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

View File

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

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 21 06:23:09 UTC 2021 - nick wang <nwang@suse.com>
- Update to 9.0.30~1
* fix a crash when drbd-9 node gets connected to a drbd-8.4 node, the
regression was introduced between 9.0.25 and 9.0.26
* A improved approach to serialize rsyncs from multiple sources; the previous
one could cause wrong accounting for online verify
* fix a race condition that could cause resync operations to stall when the
completion of one resync allows another one to proceed
* fix a race condition that could cause an online verify operation to not
terminate under specific conditions (corking enabled no other IO)
* fix locking of drbd_devices idr that caused (very rarely) create/remove
minor to fail
- Remove patch compat_genl_maxattr_in_ops.patch
- Delete _servicedata file since not used
-------------------------------------------------------------------
Fri Jun 11 15:28:19 UTC 2021 - nick wang <nwang@suse.com>
@ -22,7 +39,7 @@ Fri Jun 04 13:27:15 UTC 2021 - varkoly@suse.com
-------------------------------------------------------------------
Fri May 7 05:53:20 UTC 2021 - nick wang <nwang@suse.com>
- Update to 9.0.29
- Update to 9.0.29
* fix data corruption when DRBD's backing disk is a degraded Linux software
raid (MD)
* add correct thawing of IO requests after IO was frozen due to loss of quorum

View File

@ -24,7 +24,7 @@
%endif
%endif
Name: drbd
Version: 9.0.29~1+git.cc622880
Version: 9.0.30~1+git.10bee2d5
Release: 0
Summary: Linux driver for the "Distributed Replicated Block Device"
License: GPL-2.0-or-later
@ -35,7 +35,6 @@ Source1: preamble
Source2: Module.supported
Source3: drbd_git_revision
Patch1: fix-resync-finished-with-syncs-have-bits-set.patch
Patch2: compat_genl_maxattr_in_ops.patch
Patch99: suse-coccinelle.patch
#https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py
BuildRequires: coccinelle >= 1.0.8
@ -70,7 +69,6 @@ installed kernel.
%prep
%setup -q -n drbd-%{version}
%patch1 -p1
%patch2 -p1
%patch99 -p1
mkdir source

View File

@ -1 +1 @@
GIT-hash: cc6228800d630a19f2bf37af41bab566011286c0
GIT-hash: 10bee2d57dcbc48836ac61bad434590b7b82917e