Accepting request 505628 from network:ha-clustering:Unstable
bsc#1045473, update to 9.0.0 OBS-URL: https://build.opensuse.org/request/show/505628 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=40
This commit is contained in:
nick wang
Git OBS Bridge
parent
f895984d71
commit
5896bfb840
@ -1,26 +1,11 @@
|
||||
From f4a2325172bb011db033ee1d8d1fc747c22f254f Mon Sep 17 00:00:00 2001
|
||||
From: Kristoffer Gronlund <kgronlund@suse.com>
|
||||
Date: Tue, 4 Apr 2017 11:22:23 +0200
|
||||
Subject: [PATCH] Disable quorum in default configuration (bsc#1032142)
|
||||
diff -Naur drbd-utils-9.0.0+git.98b6340c.orig/scripts/global_common.conf drbd-utils-9.0.0+git.98b6340c/scripts/global_common.conf
|
||||
--- drbd-utils-9.0.0+git.98b6340c.orig/scripts/global_common.conf 2017-06-07 16:04:14.063680274 +0800
|
||||
+++ drbd-utils-9.0.0+git.98b6340c/scripts/global_common.conf 2017-06-07 16:04:45.519644428 +0800
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
---
|
||||
scripts/global_common.conf | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/global_common.conf b/scripts/global_common.conf
|
||||
index dd36e92..545b600 100644
|
||||
--- a/scripts/global_common.conf
|
||||
+++ b/scripts/global_common.conf
|
||||
@@ -32,7 +32,8 @@ common {
|
||||
|
||||
options {
|
||||
# cpu-mask on-no-data-accessible
|
||||
- quorum majority;
|
||||
+ # quorum majority;
|
||||
# RECOMMENDED for three or more storage nodes with DRBD 9:
|
||||
# quorum majority;
|
||||
+ quorum off;
|
||||
# on-no-quorum suspend-io | io-error;
|
||||
}
|
||||
|
||||
disk {
|
||||
--
|
||||
2.12.0
|
||||
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
detect_md() assumes that the metadata index format is
|
||||
DRBD_MD_INDEX_FLEX_INT, but in fact it can also be
|
||||
DRBD_MD_INDEX_FLEX_EXT.
|
||||
|
||||
[lge: Actually, it could even be old-style indexed fixed size meta data,
|
||||
but that can be fixed an other day, or worked around with dump/restore.
|
||||
|
||||
Thanks for noticing and fixing a regression when trying to detect and
|
||||
"convert" external meta data. We introduced said regression likely in
|
||||
late 2011, even before 8.4 came out.]
|
||||
|
||||
Signed-off-by: Kristoffer Grönlund <krig@koru.se>
|
||||
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
|
||||
---
|
||||
user/shared/drbdmeta.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/user/shared/drbdmeta.c b/user/shared/drbdmeta.c
|
||||
index 649076e1..2a79264c 100644
|
||||
--- a/user/shared/drbdmeta.c
|
||||
+++ b/user/shared/drbdmeta.c
|
||||
@@ -4348,25 +4348,25 @@ void check_for_existing_data(struct format *cfg)
|
||||
}
|
||||
|
||||
/* tries to guess what is in the on_disk_buffer */
|
||||
-enum md_format detect_md(struct md_cpu *md, const uint64_t ll_size)
|
||||
+enum md_format detect_md(struct md_cpu *md, const uint64_t ll_size, int index_format)
|
||||
{
|
||||
struct md_cpu md_test;
|
||||
enum md_format have = DRBD_UNKNOWN;
|
||||
|
||||
md_disk_07_to_cpu(&md_test, (struct md_on_disk_07*)on_disk_buffer);
|
||||
- if (is_valid_md(DRBD_V07, &md_test, DRBD_MD_INDEX_FLEX_INT, ll_size)) {
|
||||
+ if (is_valid_md(DRBD_V07, &md_test, index_format, ll_size)) {
|
||||
have = DRBD_V07;
|
||||
*md = md_test;
|
||||
}
|
||||
|
||||
md_disk_08_to_cpu(&md_test, (struct md_on_disk_08*)on_disk_buffer);
|
||||
- if (is_valid_md(DRBD_V08, &md_test, DRBD_MD_INDEX_FLEX_INT, ll_size)) {
|
||||
+ if (is_valid_md(DRBD_V08, &md_test, index_format, ll_size)) {
|
||||
have = DRBD_V08;
|
||||
*md = md_test;
|
||||
}
|
||||
|
||||
md_disk_09_to_cpu(&md_test, (struct meta_data_on_disk_9*)on_disk_buffer);
|
||||
- if (is_valid_md(DRBD_V09, &md_test, DRBD_MD_INDEX_FLEX_INT, ll_size)) {
|
||||
+ if (is_valid_md(DRBD_V09, &md_test, index_format, ll_size)) {
|
||||
have = DRBD_V09;
|
||||
*md = md_test;
|
||||
}
|
||||
@@ -4406,7 +4406,7 @@ void check_internal_md_flavours(struct format * cfg) {
|
||||
|
||||
if (have == DRBD_UNKNOWN) {
|
||||
PREAD(cfg, on_disk_buffer, 4096, flex_offset);
|
||||
- have = detect_md(&md_now, cfg->bd_size);
|
||||
+ have = detect_md(&md_now, cfg->bd_size, DRBD_MD_INDEX_FLEX_INT);
|
||||
}
|
||||
|
||||
if (have == DRBD_UNKNOWN)
|
||||
@@ -4515,7 +4515,7 @@ void check_external_md_flavours(struct format * cfg) {
|
||||
}
|
||||
|
||||
PREAD(cfg, on_disk_buffer, 4096, cfg->md_offset);
|
||||
- have = detect_md(&md_now, cfg->bd_size);
|
||||
+ have = detect_md(&md_now, cfg->bd_size, DRBD_MD_INDEX_FLEX_EXT);
|
||||
|
||||
if (have == DRBD_UNKNOWN)
|
||||
return;
|
||||
--
|
||||
2.12.0
|
||||
|
||||
22
_service
Normal file
22
_service
Normal file
@ -0,0 +1,22 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">git://git.linbit.com/drbd-utils.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">drbd-utils</param>
|
||||
<!--
|
||||
build service using release drbd-utils atm.
|
||||
<param name="version">9.0.0</param>
|
||||
-->
|
||||
<param name="versionformat">9.0.0+git.%h</param>
|
||||
<param name="revision">master</param>
|
||||
</service>
|
||||
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*drbd-utils*.tar</param>
|
||||
<param name="compression">gz</param>
|
||||
</service>
|
||||
|
||||
<service name="set_version" mode="disabled">
|
||||
<param name="basename">drbd-utils</param>
|
||||
</service>
|
||||
</services>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c61878635c40536e7d689c65cbbe92ca982fa864cec20717c0af562f2a6c9c48
|
||||
size 843348
|
||||
3
drbd-utils-9.0.0.tar.gz
Normal file
3
drbd-utils-9.0.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1694656aa1fb34d39e30a48f4a2d3325c49d0cf6d90aec7e8579e8fa6c669315
|
||||
size 851408
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 7 08:13:07 UTC 2017 - nwang@suse.com
|
||||
|
||||
- Update to v9.0.0
|
||||
* drbd udev: fix inconsistent inheritance of implicit volumes
|
||||
* Fix regressions of the out-of-the-box DRBD 8.4 experience
|
||||
* DrbdMon: can now focus on "problem" resources
|
||||
* v9: support new option on_no_quorum
|
||||
* drbdadm: fix segfaults, improve error reporting
|
||||
* adjust: fix deleting unrelated peer(s) on "adjust resource:specific-peer"
|
||||
* drbdmeta create-md/convert: fix check for existing external meta-data
|
||||
- Merged into upstream, remove Pass-md_index-information-to-detect_md.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 27 06:19:24 UTC 2017 - nwang@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package drbd-utils
|
||||
#
|
||||
# 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
|
||||
@ -16,16 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
%define real_version 8.9.11
|
||||
|
||||
Name: drbd-utils
|
||||
Version: 8.9.11rc2
|
||||
Version: 9.0.0
|
||||
Release: 0
|
||||
Summary: Distributed Replicated Block Device
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Clustering/HA
|
||||
Url: http://www.drbd.org/
|
||||
Source: http://www.drbd.org/download/drbd/utils/%{name}-%{real_version}.tar.gz
|
||||
Source: http://www.drbd.org/download/drbd/utils/%{name}-%{version}.tar.gz
|
||||
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch1: init-script-fixes.diff
|
||||
@ -34,8 +32,6 @@ Patch3: fence-after-pacemaker-down.patch
|
||||
Patch4: fix-segfault-up-stacked-resource.patch
|
||||
# PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
|
||||
Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
|
||||
# Patch will be merged to upstream in 8.9.12 (bsc#1032074)
|
||||
Patch6: Pass-md_index-information-to-detect_md.patch
|
||||
|
||||
Provides: drbd-bash-completion = %{version}
|
||||
Provides: drbd-pacemaker = %{version}
|
||||
@ -61,7 +57,7 @@ BuildRequires: gcc
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: make
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: systemd
|
||||
BuildRequires: udev
|
||||
Provides: drbd-control
|
||||
@ -74,13 +70,12 @@ device over the network to another machine. Think of it as networked
|
||||
raid 1. It is a building block for setting up clusters.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{real_version}
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
@ -92,16 +87,16 @@ PATH=/sbin:$PATH ./configure \
|
||||
--with-xen \
|
||||
--with-bashcompletion \
|
||||
--with-initscripttype=systemd \
|
||||
--with-systemdunitdir=/usr/lib/systemd/system \
|
||||
--with-systemdunitdir=%{_prefix}/lib/systemd/system \
|
||||
--prefix=/ \
|
||||
--sbindir=/sbin \
|
||||
--libdir=/usr/lib \
|
||||
--libdir=%{_prefix}/lib \
|
||||
--mandir=%{_mandir} \
|
||||
--sysconfdir=%{_sysconfdir} \
|
||||
--datarootdir=/usr/share \
|
||||
--datadir=/usr/share \
|
||||
--libdir=/usr/lib \
|
||||
--exec_prefix=/usr/lib \
|
||||
--datarootdir=%{_datadir} \
|
||||
--datadir=%{_datadir} \
|
||||
--libdir=%{_prefix}/lib \
|
||||
--exec_prefix=%{_prefix}/lib \
|
||||
--with-tmpfilesdir=%{_tmpfilesdir}
|
||||
|
||||
make OPTFLAGS="%{optflags}" %{?_smp_mflags}
|
||||
@ -152,10 +147,10 @@ rm -rf %{buildroot}%{_sysconfdir}/xen
|
||||
%{_prefix}/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh
|
||||
%{_udevrulesdir}/65-drbd.rules
|
||||
%{_unitdir}/drbd.service
|
||||
/usr/lib/systemd/system/drbd.service
|
||||
%{_prefix}/lib/systemd/system/drbd.service
|
||||
%defattr(-, root, root)
|
||||
%{_localstatedir}/lib/drbd
|
||||
/usr/lib/drbd
|
||||
%{_prefix}/lib/drbd
|
||||
/lib/drbd
|
||||
/lib/drbd/drbd*
|
||||
%dir %{_prefix}/lib/ocf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user