mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Tidy bits of clvmd-openais and improve an error report.
This commit is contained in:
parent
3c21da1797
commit
b3ae66ae58
@ -1,5 +1,6 @@
|
||||
Version 2.02.27 -
|
||||
================================
|
||||
Tidy clvmd-openais of redundant bits, and improve an error report.
|
||||
Cope with find_seg_by_le() failure in check_lv_segments().
|
||||
Call dev_iter_destroy() if _process_all_devs() is interrupted by sigint.
|
||||
Add vg_mda_count and pv_mda_count columns to reports.
|
||||
|
@ -37,7 +37,6 @@
|
||||
|
||||
#include <openais/saAis.h>
|
||||
#include <openais/saLck.h>
|
||||
#include <openais/saClm.h>
|
||||
#include <openais/cpg.h>
|
||||
|
||||
#include "list.h"
|
||||
@ -346,7 +345,6 @@ static int _init_cluster(void)
|
||||
SaAisErrorT err;
|
||||
SaVersionT ver = { 'B', 1, 1 };
|
||||
int select_fd;
|
||||
SaClmClusterNodeT cluster_node;
|
||||
|
||||
node_hash = dm_hash_create(100);
|
||||
lock_hash = dm_hash_create(10);
|
||||
@ -379,19 +377,18 @@ static int _init_cluster(void)
|
||||
cpg_finalize(cpg_handle);
|
||||
saLckFinalize(lck_handle);
|
||||
syslog(LOG_ERR, "Cannot join clvmd process group");
|
||||
DEBUGLOG("Cannot join clvmd process group\n");
|
||||
DEBUGLOG("Cannot join clvmd process group: %d\n", err);
|
||||
return ais_to_errno(err);
|
||||
}
|
||||
|
||||
err = cpg_local_get(cpg_handle,
|
||||
&cluster_node);
|
||||
&our_nodeid);
|
||||
if (err != SA_AIS_OK) {
|
||||
cpg_finalize(cpg_handle);
|
||||
saLckFinalize(lck_handle);
|
||||
syslog(LOG_ERR, "Cannot get local node id\n");
|
||||
return ais_to_errno(err);
|
||||
}
|
||||
our_nodeid = cluster_node.nodeId;
|
||||
DEBUGLOG("Our local node id is %d\n", our_nodeid);
|
||||
|
||||
saLckSelectionObjectGet(lck_handle, (SaSelectionObjectT *)&select_fd);
|
||||
|
Loading…
Reference in New Issue
Block a user