forked from pool/ocfs2-tools
4633b6be45
update to be compatible with corosync 2.3.x OBS-URL: https://build.opensuse.org/request/show/185215 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=60
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From af06444bea1bcc8006c295a5a2663e0372814df5 Mon Sep 17 00:00:00 2001
|
|
From: Goldwyn Rodrigues <rgoldwyn@suse.de>
|
|
Date: Sun, 28 Jul 2013 17:49:21 -0500
|
|
Subject: [PATCH 5/5] Add cluster_name and stack name
|
|
|
|
---
|
|
ocfs2_controld/member.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_controld/member.c
|
|
===================================================================
|
|
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/ocfs2_controld/member.c 2013-07-31 08:20:04.239619381 -0500
|
|
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_controld/member.c 2013-07-31 08:23:47.608241901 -0500
|
|
@@ -11,6 +11,8 @@
|
|
|
|
char cluster_name[65];
|
|
int our_nodeid;
|
|
+/* Using pcmk for legacy reasons */
|
|
+const char *stackname = "pcmk";
|
|
|
|
static corosync_cfg_handle_t ch;
|
|
|
|
@@ -93,6 +95,8 @@ try_again:
|
|
|
|
our_nodeid = nodeid;
|
|
log_debug("our_nodeid %d", our_nodeid);
|
|
+ detect_cluster_name();
|
|
+ log_debug("our cluster name %s", cluster_name);
|
|
|
|
if (our_nodeid < 0) {
|
|
log_error("negative nodeid, set corosync totem.clear_node_high_bit");
|