shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Use cpg_local_get() rather then Clm to get the local nodeid.

Browse Source
This commit is contained in:
Patrick Caulfield 2007-06-25 09:02:37 +00:00
parent ef4ed892da
commit 8e2f036193
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -4,6 +4,7 @@ Version 2.02.27 -
Add vg_status function and clean up vg->status in tools directory.
Add --ignoremonitoring to disable all dmeventd interaction.
Remove get_ prefix from get_pv_* functions.
clvmd-openais now uses cpg_local_get() to get nodeid, rather than Clm.
Version 2.02.26 - 15th June 2007
================================

2
daemons/clvmd/Makefile.in
View File

@ -59,7 +59,7 @@ endif
ifeq ("$(OPENAIS)", "yes")
SOURCES += clvmd-openais.c
LMLIBS += -lSaLck -lSaClm -lcpg
LMLIBS += -lSaLck -lcpg
DEFS += -DUSE_OPENAIS
endif

22
daemons/clvmd/clvmd-openais.c
View File

@ -98,9 +98,6 @@ SaLckCallbacksT lck_callbacks = {
.saLckResourceUnlockCallback = lck_unlock_callback
};
/* We only call Clm to get our node id */
SaClmCallbacksT clm_callbacks;
struct node_info
{
enum {NODE_UNKNOWN, NODE_DOWN, NODE_UP, NODE_CLVMD} state;
@ -348,7 +345,6 @@ static int _init_cluster(void)
{
SaAisErrorT err;
SaVersionT ver = { 'B', 1, 1 };
SaClmHandleT clm_handle;
int select_fd;
SaClmClusterNodeT cluster_node;
@ -387,26 +383,14 @@ static int _init_cluster(void)
return ais_to_errno(err);
}
/* A brief foray into Clm to get our node id */
err = saClmInitialize(&clm_handle, &clm_callbacks, &ver);
if (err != SA_AIS_OK) {
syslog(LOG_ERR, "Could not initialize OpenAIS membership service %d\n", err);
DEBUGLOG("Could not initialize OpenAIS Membership service %d\n", err);
return ais_to_errno(err);
}
err = saClmClusterNodeGet(clm_handle,
SA_CLM_LOCAL_NODE_ID,
TIMEOUT,
&cluster_node);
err = cpg_local_get(cpg_handle,
&cluster_node);
if (err != SA_AIS_OK) {
cpg_finalize(cpg_handle);
saLckFinalize(lck_handle);
saClmFinalize(clm_handle);
syslog(LOG_ERR, "Cannot get local node id\n");
return ais_to_errno(err);
}
saClmFinalize(clm_handle);
our_nodeid = cluster_node.nodeId;
DEBUGLOG("Our local node id is %d\n", our_nodeid);
@ -424,7 +408,7 @@ static void _cluster_closedown(void)
unlock_all();
saLckFinalize(lck_handle);
cpg_inalize(cpg_handle);
cpg_finalize(cpg_handle);
}
static void _get_our_csid(char *csid)