Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at 2020-06-03 20:30:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdlm (Old) and /work/SRC/openSUSE:Factory/.libdlm.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdlm" Wed Jun 3 20:30:14 2020 rev:49 rq:807937 version:4.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/libdlm/libdlm.changes 2019-08-13 13:12:17.109557532 +0200 +++ /work/SRC/openSUSE:Factory/.libdlm.new.3606/libdlm.changes 2020-06-03 20:30:20.048774455 +0200 @@ -1,0 +2,6 @@ +Fri May 15 08:10:20 UTC 2020 - [email protected] + +- Support uint64_t corosync ringid (bsc#1168771) + * add cluster-ringid-seq.patch + +------------------------------------------------------------------- New: ---- cluster-ringid-seq.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ --- /var/tmp/diff_new_pack.5Y34l0/_old 2020-06-03 20:30:21.928780170 +0200 +++ /var/tmp/diff_new_pack.5Y34l0/_new 2020-06-03 20:30:21.932780182 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdlm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -42,6 +42,7 @@ Patch2: 0002-remove-sd-notify.patch Patch3: 0003-bnc#874705-nodes-without-quorum.patch Patch4: sysmacros.patch +Patch5: cluster-ringid-seq.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: glib2-devel @@ -85,6 +86,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 ########################################################### %build ++++++ cluster-ringid-seq.patch ++++++ diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index e4b27fac3cd5..5b5c52fc09bc 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -450,21 +450,24 @@ static int check_ringid_done(struct lockspace *ls) but that's probably not guaranteed.) */ if (ls->cpg_ringid_wait) { - log_group(ls, "check_ringid wait cluster %u cpg %u:%llu", - cluster_ringid_seq, ls->cpg_ringid.nodeid, + log_group(ls, "check_ringid wait cluster %u cpg %llu:%llu", + (unsigned long long)cluster_ringid_seq, + ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 0; } - if (cluster_ringid_seq != (uint32_t)ls->cpg_ringid.seq) { - log_group(ls, "check_ringid cluster %u cpg %u:%llu", - cluster_ringid_seq, ls->cpg_ringid.nodeid, + if (cluster_ringid_seq != ls->cpg_ringid.seq) { + log_group(ls, "check_ringid cluster %llu cpg %u:%llu", + (unsigned long long)cluster_ringid_seq, + ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 0; } - log_limit(ls, "check_ringid done cluster %u cpg %u:%llu", - cluster_ringid_seq, ls->cpg_ringid.nodeid, + log_limit(ls, "check_ringid done cluster %llu cpg %u:%llu", + (unsigned long long)cluster_ringid_seq, + ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); return 1; diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h index 3221e19cb7be..5b9a52dae750 100644 --- a/dlm_controld/dlm_daemon.h +++ b/dlm_controld/dlm_daemon.h @@ -179,7 +179,7 @@ EXTERN uint64_t fence_delay_begin; EXTERN uint64_t cluster_quorate_monotime; EXTERN uint64_t cluster_joined_monotime; EXTERN uint64_t cluster_joined_walltime; -EXTERN uint32_t cluster_ringid_seq; +EXTERN uint64_t cluster_ringid_seq; EXTERN char cluster_name[DLM_LOCKSPACE_LEN+1]; EXTERN int our_nodeid; EXTERN uint32_t control_minor; diff --git a/dlm_controld/member.c b/dlm_controld/member.c index 10351ec41d6d..da3a1f5b0e90 100644 --- a/dlm_controld/member.c +++ b/dlm_controld/member.c @@ -122,10 +122,10 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, cluster_quorate_monotime = now; cluster_quorate = quorate; - cluster_ringid_seq = (uint32_t)ring_seq; + cluster_ringid_seq = ring_seq; - log_debug("cluster quorum %u seq %u nodes %u", - cluster_quorate, cluster_ringid_seq, node_list_entries); + log_debug("cluster quorum %u seq %llu nodes %u", + cluster_quorate, (unsigned long long)cluster_ringid_seq, node_list_entries); old_node_count = quorum_node_count; memcpy(&old_nodes, &quorum_nodes, sizeof(old_nodes)); @@ -139,8 +139,8 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, for (i = 0; i < old_node_count; i++) { if (!is_cluster_member(old_nodes[i])) { - log_debug("cluster node %u removed seq %u", - old_nodes[i], cluster_ringid_seq); + log_debug("cluster node %u removed seq %llu", + old_nodes[i], (unsigned long long)cluster_ringid_seq); rem_cluster_node(old_nodes[i], now); del_configfs_node(old_nodes[i]); } @@ -148,8 +148,8 @@ static void quorum_callback(quorum_handle_t h, uint32_t quorate, for (i = 0; i < quorum_node_count; i++) { if (!is_old_member(quorum_nodes[i])) { - log_debug("cluster node %u added seq %u", - quorum_nodes[i], cluster_ringid_seq); + log_debug("cluster node %u added seq %llu", + quorum_nodes[i], (unsigned long long)cluster_ringid_seq); add_cluster_node(quorum_nodes[i], now); fence_delay_begin = now;
