ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

- ocfs2_controld: ocfs2_controld-pacemaker.diff

Browse Source 
* Replace use of send_ais_text() with send_cluster_text()
  * Replace use of ais_dispatch() with plugin_dispatch()

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=59
This commit is contained in:
Yan Gao 2013-07-22 10:57:08 +00:00 committed by Git OBS Bridge
parent d309aba9b2
commit 086555113f
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ocfs2-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 22 10:57:44 UTC 2013 - ygao@suse.com
- ocfs2_controld: ocfs2_controld-pacemaker.diff
* Replace use of send_ais_text() with send_cluster_text()
* Replace use of ais_dispatch() with plugin_dispatch()
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 3 07:40:31 CDT 2013 - rgoldwyn@suse.com Wed Jul 3 07:40:31 CDT 2013 - rgoldwyn@suse.com
- ocfs2console-libraries-include-aio.patch: Include aio - ocfs2console-libraries-include-aio.patch: Include aio

17
ocfs2_controld-pacemaker.diff
View File

@ -1,7 +1,7 @@
Index: ocfs2-tools/ocfs2_controld/pacemaker.c Index: ocfs2-tools/ocfs2_controld/pacemaker.c
=================================================================== ===================================================================
--- ocfs2-tools.orig/ocfs2_controld/pacemaker.c 2012-08-24 10:02:19.000000000 -0500 --- ocfs2-tools.orig/ocfs2_controld/pacemaker.c
+++ ocfs2-tools/ocfs2_controld/pacemaker.c 2012-11-26 16:16:38.000000000 -0600 +++ ocfs2-tools/ocfs2_controld/pacemaker.c
@@ -28,9 +28,8 @@ @@ -28,9 +28,8 @@
#define SUPPORT_HEARTBEAT 0 #define SUPPORT_HEARTBEAT 0
@ -22,7 +22,7 @@ Index: ocfs2-tools/ocfs2_controld/pacemaker.c
extern int ais_fd_async; extern int ais_fd_async;
char *local_node_uname = NULL; char *local_node_uname = NULL;
@@ -138,28 +138,29 @@ static void dead_pcmk(int ci) @@ -138,33 +138,34 @@ static void dead_pcmk(int ci)
connection_dead(ci); connection_dead(ci);
} }
@ -38,7 +38,7 @@ Index: ocfs2-tools/ocfs2_controld/pacemaker.c
static void process_pcmk(int ci) static void process_pcmk(int ci)
{ {
- ais_dispatch(ais_fd_async, NULL); - ais_dispatch(ais_fd_async, NULL);
+ ais_dispatch(NULL); + plugin_dispatch(&crm_cluster);
} }
int setup_stack(void) int setup_stack(void)
@ -56,5 +56,12 @@ Index: ocfs2-tools/ocfs2_controld/pacemaker.c
+ our_nodeid = crm_cluster.nodeid; + our_nodeid = crm_cluster.nodeid;
+ +
/* Sign up for membership updates */ /* Sign up for membership updates */
send_ais_text(crm_class_notify, "true", TRUE, NULL, crm_msg_ais); - send_ais_text(crm_class_notify, "true", TRUE, NULL, crm_msg_ais);
+ send_cluster_text(crm_class_notify, "true", TRUE, NULL, crm_msg_ais);
/* Requesting the current list of known nodes */
- send_ais_text(crm_class_members, __FUNCTION__, TRUE, NULL, crm_msg_ais);
+ send_cluster_text(crm_class_members, __FUNCTION__, TRUE, NULL, crm_msg_ais);
log_debug("Cluster connection established. Local node id: %d", our_nodeid);