From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24711 invoked by alias); 21 May 2007 10:52:04 -0000 Received: (qmail 24694 invoked by uid 9452); 21 May 2007 10:52:02 -0000 Date: Mon, 21 May 2007 10:52:00 -0000 Message-ID: <20070521105202.24692.qmail@sourceware.org> From: pcaulfield@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/Makefile.in dae ... Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2007-05/txt/msg00005.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: pcaulfield@sourceware.org 2007-05-21 10:52:01 Modified files: . : WHATS_NEW daemons/clvmd : Makefile.in clvmd-comms.h clvmd.c Added files: daemons/clvmd : clvmd-openais.c Log message: Add *Experimental* OpenAIS support to clvmd. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.618&r2=1.619 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-openais.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=1.17&r2=1.18 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-comms.h.diff?cvsroot=lvm2&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=1.36&r2=1.37 --- LVM2/WHATS_NEW 2007/05/15 14:42:01 1.618 +++ LVM2/WHATS_NEW 2007/05/21 10:52:01 1.619 @@ -1,5 +1,6 @@ Version 2.02.26 - ================================= + Add (experimental) OpenAIS support to clvmd. Remove symlinks if parent volume is deactivated. Fix and clarify vgsplit error messages. Fix a segfault if a device has no target (no table) /cvs/lvm2/LVM2/daemons/clvmd/clvmd-openais.c,v --> standard output revision 1.1 --- LVM2/daemons/clvmd/clvmd-openais.c +++ - 2007-05-21 10:52:01.972639000 +0000 @@ -0,0 +1,756 @@ +/****************************************************************************** +******************************************************************************* +** +** Copyright (C) 2007 Red Hat, Inc. All rights reserved. +** +******************************************************************************* +******************************************************************************/ + +/* This provides the interface between clvmd and OpenAIS as the cluster + * and lock manager. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "list.h" +#include "locking.h" +#include "log.h" +#include "clvm.h" +#include "clvmd-comms.h" +#include "lvm-functions.h" +#include "clvmd.h" + +/* Timeout value for several openais calls */ +#define TIMEOUT 10 + +static void lck_lock_callback(SaInvocationT invocation, + SaLckLockStatusT lockStatus, + SaAisErrorT error); +static void lck_unlock_callback(SaInvocationT invocation, + SaAisErrorT error); +static void cpg_deliver_callback (cpg_handle_t handle, + struct cpg_name *groupName, + uint32_t nodeid, + uint32_t pid, + void *msg, + int msg_len); +static void cpg_confchg_callback(cpg_handle_t handle, + struct cpg_name *groupName, + struct cpg_address *member_list, int member_list_entries, + struct cpg_address *left_list, int left_list_entries, + struct cpg_address *joined_list, int joined_list_entries); +static void _cluster_closedown(void); + +/* Hash list of nodes in the cluster */ +static struct dm_hash_table *node_hash; + +/* For associating lock IDs & resource handles */ +static struct dm_hash_table *lock_hash; + +/* Number of active nodes */ +static int num_nodes; +static unsigned int our_nodeid; + +static struct local_client *cluster_client; + +/* OpenAIS handles */ +static cpg_handle_t cpg_handle; +static SaLckHandleT lck_handle; + +static struct cpg_name cpg_group_name; + +/* Openais callback structs */ +cpg_callbacks_t cpg_callbacks = { + .cpg_deliver_fn = cpg_deliver_callback, + .cpg_confchg_fn = cpg_confchg_callback, +}; + +SaLckCallbacksT lck_callbacks = { + .saLckLockGrantCallback = lck_lock_callback, + .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; + int nodeid; +}; + +struct lock_info +{ + SaLckResourceHandleT res_handle; + SaLckLockIdT lock_id; + SaNameT lock_name; +}; + +struct lock_wait +{ + pthread_cond_t cond; + pthread_mutex_t mutex; + int status; +}; + +/* Set errno to something approximating the right value and return 0 or -1 */ +static int ais_to_errno(SaAisErrorT err) +{ + switch(err) + { + case SA_AIS_OK: + return 0; + case SA_AIS_ERR_LIBRARY: + errno = EINVAL; + break; + case SA_AIS_ERR_VERSION: + errno = EINVAL; + break; + case SA_AIS_ERR_INIT: + errno = EINVAL; + break; + case SA_AIS_ERR_TIMEOUT: + errno = ETIME; + break; + case SA_AIS_ERR_TRY_AGAIN: + errno = EAGAIN; + break; + case SA_AIS_ERR_INVALID_PARAM: + errno = EINVAL; + break; + case SA_AIS_ERR_NO_MEMORY: + errno = ENOMEM; + break; + case SA_AIS_ERR_BAD_HANDLE: + errno = EINVAL; + break; + case SA_AIS_ERR_BUSY: + errno = EBUSY; + break; + case SA_AIS_ERR_ACCESS: + errno = EPERM; + break; + case SA_AIS_ERR_NOT_EXIST: + errno = ENOENT; + break; + case SA_AIS_ERR_NAME_TOO_LONG: + errno = ENAMETOOLONG; + break; + case SA_AIS_ERR_EXIST: + errno = EEXIST; + break; + case SA_AIS_ERR_NO_SPACE: + errno = ENOSPC; + break; + case SA_AIS_ERR_INTERRUPT: + errno = EINTR; + break; + case SA_AIS_ERR_NAME_NOT_FOUND: + errno = ENOENT; + break; + case SA_AIS_ERR_NO_RESOURCES: + errno = ENOMEM; + break; + case SA_AIS_ERR_NOT_SUPPORTED: + errno = EOPNOTSUPP; + break; + case SA_AIS_ERR_BAD_OPERATION: + errno = EINVAL; + break; + case SA_AIS_ERR_FAILED_OPERATION: + errno = EIO; + break; + case SA_AIS_ERR_MESSAGE_ERROR: + errno = EIO; + break; + case SA_AIS_ERR_QUEUE_FULL: + errno = EXFULL; + break; + case SA_AIS_ERR_QUEUE_NOT_AVAILABLE: + errno = EINVAL; + break; + case SA_AIS_ERR_BAD_FLAGS: + errno = EINVAL; + break; + case SA_AIS_ERR_TOO_BIG: + errno = E2BIG; + break; + case SA_AIS_ERR_NO_SECTIONS: + errno = ENOMEM; + break; + default: + errno = EINVAL; + break; + } + return -1; +} + +static char *print_csid(const char *csid) +{ + static char buf[128]; + int id; + + memcpy(&id, csid, sizeof(int)); + sprintf(buf, "%d", id); + return buf; +} + +static int add_internal_client(int fd, fd_callback_t callback) +{ + struct local_client *client; + + DEBUGLOG("Add_internal_client, fd = %d\n", fd); + + client = malloc(sizeof(struct local_client)); + if (!client) + { + DEBUGLOG("malloc failed\n"); + return -1; + } + + memset(client, 0, sizeof(struct local_client)); + client->fd = fd; + client->type = CLUSTER_INTERNAL; + client->callback = callback; + add_client(client); + + /* Set Close-on-exec */ + fcntl(fd, F_SETFD, 1); + + return 0; +} + +static void cpg_deliver_callback (cpg_handle_t handle, + struct cpg_name *groupName, + uint32_t nodeid, + uint32_t pid, + void *msg, + int msg_len) +{ + int target_nodeid; + + memcpy(&target_nodeid, msg, OPENAIS_CSID_LEN); + + DEBUGLOG("Got message from nodeid %d for %d. len %d\n", + nodeid, target_nodeid, msg_len-4); + + if (target_nodeid == our_nodeid) + process_message(cluster_client, (char *)msg+OPENAIS_CSID_LEN, + msg_len-OPENAIS_CSID_LEN, (char*)&nodeid); +} + +static void cpg_confchg_callback(cpg_handle_t handle, + struct cpg_name *groupName, + struct cpg_address *member_list, int member_list_entries, + struct cpg_address *left_list, int left_list_entries, + struct cpg_address *joined_list, int joined_list_entries) +{ + int i; + struct node_info *ninfo; + + DEBUGLOG("confchg callback. %d joined, %d left, %d members\n", + joined_list_entries, left_list_entries, member_list_entries); + + for (i=0; inodeid = joined_list[i].nodeid; + dm_hash_insert_binary(node_hash, + (char *)&ninfo->nodeid, + OPENAIS_CSID_LEN, ninfo); + } + } + ninfo->state = NODE_CLVMD; + } + + for (i=0; istate = NODE_DOWN; + } + + num_nodes = joined_list_entries; +} + +static void lck_lock_callback(SaInvocationT invocation, + SaLckLockStatusT lockStatus, + SaAisErrorT error) +{ + struct lock_wait *lwait = (struct lock_wait *)(long)invocation; + + DEBUGLOG("lck_lock_callback, error = %d\n", error); + + lwait->status = error; + pthread_mutex_lock(&lwait->mutex); + pthread_cond_signal(&lwait->cond); + pthread_mutex_unlock(&lwait->mutex); +} + +static void lck_unlock_callback(SaInvocationT invocation, + SaAisErrorT error) +{ + struct lock_wait *lwait = (struct lock_wait *)(long)invocation; + + DEBUGLOG("lck_unlock_callback\n"); + + lwait->status = SA_AIS_OK; + pthread_mutex_lock(&lwait->mutex); + pthread_cond_signal(&lwait->cond); + pthread_mutex_unlock(&lwait->mutex); +} + +static int lck_dispatch(struct local_client *client, char *buf, int len, + const char *csid, struct local_client **new_client) +{ + *new_client = NULL; + saLckDispatch(lck_handle, SA_DISPATCH_ONE); + return 1; +} + +static int _init_cluster(void) +{ + SaAisErrorT err; + SaVersionT ver = { 'B', 1, 1 }; + SaClmHandleT clm_handle; + int select_fd; + SaClmClusterNodeT cluster_node; + + node_hash = dm_hash_create(100); + lock_hash = dm_hash_create(10); + + err = cpg_initialize(&cpg_handle, + &cpg_callbacks); + if (err != SA_AIS_OK) { + syslog(LOG_ERR, "Cannot initialise OpenAIS CPG service: %d", + err); + DEBUGLOG("Cannot initialise OpenAIS CPG service: %d", err); + return ais_to_errno(err); + } + + err = saLckInitialize(&lck_handle, + &lck_callbacks, + &ver); + if (err != SA_AIS_OK) { + cpg_initialize(&cpg_handle, &cpg_callbacks); + syslog(LOG_ERR, "Cannot initialise OpenAIS lock service: %d", + err); + DEBUGLOG("Cannot initialise OpenAIS lock service: %d\n\n", err); + return ais_to_errno(err); + } + + /* Connect to the clvmd group */ + strcpy((char *)cpg_group_name.value, "clvmd"); + cpg_group_name.length = strlen((char *)cpg_group_name.value); + err = cpg_join(cpg_handle, &cpg_group_name); + if (err != SA_AIS_OK) { + cpg_finalize(cpg_handle); + saLckFinalize(lck_handle); + syslog(LOG_ERR, "Cannot join clvmd process group"); + DEBUGLOG("Cannot join clvmd process group\n"); + 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); + 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); + + saLckSelectionObjectGet(lck_handle, (SaSelectionObjectT *)&select_fd); + add_internal_client(select_fd, lck_dispatch); + + DEBUGLOG("Connected to OpenAIS\n"); + + return 0; +} + +static void _cluster_closedown(void) +{ + DEBUGLOG("cluster_closedown\n"); + unlock_all(); + + saLckFinalize(lck_handle); + cpg_inalize(cpg_handle); +} + +static void _get_our_csid(char *csid) +{ + memcpy(csid, &our_nodeid, sizeof(int)); +} + +/* OpenAIS doesn't really have nmode names so we + just use the node ID in hex instead */ +static int _csid_from_name(char *csid, const char *name) +{ + int nodeid; + struct node_info *ninfo; + + if (sscanf(name, "%x", &nodeid) == 1) { + ninfo = dm_hash_lookup_binary(node_hash, csid, OPENAIS_CSID_LEN); + if (ninfo) + return nodeid; + } + return -1; +} + +static int _name_from_csid(const char *csid, char *name) +{ + struct node_info *ninfo; + + ninfo = dm_hash_lookup_binary(node_hash, csid, OPENAIS_CSID_LEN); + if (!ninfo) + { + sprintf(name, "UNKNOWN %s", print_csid(csid)); + return -1; + } + + sprintf(name, "%x", ninfo->nodeid); + return 0; +} + +static int _get_num_nodes() +{ + DEBUGLOG("num_nodes = %d\n", num_nodes); + return num_nodes; +} + +/* Node is now known to be running a clvmd */ +static void _add_up_node(const char *csid) +{ + struct node_info *ninfo; + + ninfo = dm_hash_lookup_binary(node_hash, csid, OPENAIS_CSID_LEN); + if (!ninfo) { + DEBUGLOG("openais_add_up_node no node_hash entry for csid %s\n", + print_csid(csid)); + return; + } + + DEBUGLOG("openais_add_up_node %d\n", ninfo->nodeid); + + ninfo->state = NODE_CLVMD; + + return; +} + +/* Call a callback for each node, so the caller knows whether it's up or down */ +static int _cluster_do_node_callback(struct local_client *master_client, + void (*callback)(struct local_client *, + const char *csid, int node_up)) +{ + struct dm_hash_node *hn; + struct node_info *ninfo; + + dm_hash_iterate(hn, node_hash) + { + char csid[OPENAIS_CSID_LEN]; + + ninfo = dm_hash_get_data(node_hash, hn); + memcpy(csid, dm_hash_get_key(node_hash, hn), OPENAIS_CSID_LEN); + + DEBUGLOG("down_callback. node %d, state = %d\n", ninfo->nodeid, + ninfo->state); + + if (ninfo->state != NODE_DOWN) + callback(master_client, csid, ninfo->state == NODE_CLVMD); + } + return 0; +} + +/* Real locking */ +static int _lock_resource(char *resource, int mode, int flags, int *lockid) +{ + struct lock_wait lwait; + struct lock_info *linfo; + SaLckResourceHandleT res_handle; + SaAisErrorT err; + SaLckLockIdT lock_id; + + pthread_cond_init(&lwait.cond, NULL); + pthread_mutex_init(&lwait.mutex, NULL); + pthread_mutex_lock(&lwait.mutex); + + /* This needs to be converted from DLM/LVM2 value for OpenAIS LCK */ + if (flags & LCK_NONBLOCK) flags = SA_LCK_LOCK_NO_QUEUE; + + linfo = malloc(sizeof(struct lock_info)); + if (!linfo) + return -1; + + DEBUGLOG("lock_resource '%s', flags=%d, mode=%d\n", resource, flags, mode); + + linfo->lock_name.length = strlen(resource)+1; + strcpy((char *)linfo->lock_name.value, resource); + + err = saLckResourceOpen(lck_handle, &linfo->lock_name, + SA_LCK_RESOURCE_CREATE, TIMEOUT, &res_handle); + if (err != SA_AIS_OK) + { + DEBUGLOG("ResourceOpen returned %d\n", err); + free(linfo); + return ais_to_errno(err); + } + + err = saLckResourceLockAsync(res_handle, + (SaInvocationT)(long)&lwait, + &lock_id, + mode, + flags, + 0); + if (err != SA_AIS_OK) + { + free(linfo); + saLckResourceClose(res_handle); + return ais_to_errno(err); + } + + /* Wait for it to complete */ + pthread_cond_wait(&lwait.cond, &lwait.mutex); + pthread_mutex_unlock(&lwait.mutex); + + DEBUGLOG("lock_resource returning %d, lock_id=%llx\n", lwait.status, + lock_id); + + linfo->lock_id = lock_id; + linfo->res_handle = res_handle; + + dm_hash_insert(lock_hash, resource, linfo); + + return ais_to_errno(lwait.status); +} + + +static int _unlock_resource(char *resource, int lockid) +{ + struct lock_wait lwait; + SaAisErrorT err; + struct lock_info *linfo; + + pthread_cond_init(&lwait.cond, NULL); + pthread_mutex_init(&lwait.mutex, NULL); + pthread_mutex_lock(&lwait.mutex); + + DEBUGLOG("unlock_resource %s\n", resource); + linfo = dm_hash_lookup(lock_hash, resource); + if (!linfo) + return 0; + + DEBUGLOG("unlock_resource: lockid: %llx\n", linfo->lock_id); + err = saLckResourceUnlockAsync((SaInvocationT)(long)&lwait, linfo->lock_id); + if (err != SA_AIS_OK) + { + DEBUGLOG("Unlock returned %d\n", err); + return ais_to_errno(err); + } + + /* Wait for it to complete */ + pthread_cond_wait(&lwait.cond, &lwait.mutex); + pthread_mutex_unlock(&lwait.mutex); + + /* Release the resource */ + dm_hash_remove(lock_hash, resource); + saLckResourceClose(linfo->res_handle); + free(linfo); + + return ais_to_errno(lwait.status); +} + +static int _sync_lock(const char *resource, int mode, int flags, int *lockid) +{ + int status; + char lock1[strlen(resource)+3]; + char lock2[strlen(resource)+3]; + + snprintf(lock1, sizeof(lock1), "%s-1", resource); + snprintf(lock2, sizeof(lock2), "%s-2", resource); + + switch (mode) + { + case LCK_EXCL: + status = _lock_resource(lock1, SA_LCK_EX_LOCK_MODE, flags, lockid); + if (status) + goto out; + + /* If we can't get this lock too then bail out */ + status = _lock_resource(lock2, SA_LCK_EX_LOCK_MODE, LCK_NONBLOCK, + lockid); + if (status == SA_LCK_LOCK_NOT_QUEUED) + { + _unlock_resource(lock1, *lockid); + status = -1; + errno = EAGAIN; + } + break; + + case LCK_PREAD: + case LCK_READ: + status = _lock_resource(lock1, SA_LCK_PR_LOCK_MODE, flags, lockid); + if (status) + goto out; + _unlock_resource(lock2, *lockid); + break; + + case LCK_WRITE: + status = _lock_resource(lock2, SA_LCK_EX_LOCK_MODE, flags, lockid); + if (status) + goto out; + _unlock_resource(lock1, *lockid); + break; + + default: + status = -1; + errno = EINVAL; + break; + } +out: + *lockid = mode; + return status; +} + +static int _sync_unlock(const char *resource, int lockid) +{ + int status = 0; + char lock1[strlen(resource)+3]; + char lock2[strlen(resource)+3]; + + snprintf(lock1, sizeof(lock1), "%s-1", resource); + snprintf(lock2, sizeof(lock2), "%s-2", resource); + + _unlock_resource(lock1, lockid); + _unlock_resource(lock2, lockid); + + return status; +} + +/* We are always quorate ! */ +static int _is_quorate() +{ + return 1; +} + +static int _get_main_cluster_fd(void) +{ + int select_fd; + + cpg_fd_get(cpg_handle, &select_fd); + return select_fd; +} + +static int _cluster_fd_callback(struct local_client *fd, char *buf, int len, + const char *csid, + struct local_client **new_client) +{ + cluster_client = fd; + *new_client = NULL; + cpg_dispatch(cpg_handle, SA_DISPATCH_ONE); + return 1; +} + +static int _cluster_send_message(const void *buf, int msglen, const char *csid, + const char *errtext) +{ + struct iovec iov[2]; + SaAisErrorT err; + int target_node; + + if (csid) + memcpy(&target_node, csid, OPENAIS_CSID_LEN); + else + target_node = 0; + + iov[0].iov_base = &target_node; + iov[0].iov_len = sizeof(int); + iov[1].iov_base = (char *)buf; + iov[1].iov_len = msglen; + + err = cpg_mcast_joined(cpg_handle, CPG_TYPE_AGREED, iov, 2); + return ais_to_errno(err); +} + +/* We don't have a cluster name to report here */ +static int _get_cluster_name(char *buf, int buflen) +{ + strncpy(buf, "OpenAIS", buflen); + return 0; +} + +static struct cluster_ops _cluster_openais_ops = { + .cluster_init_completed = NULL, + .cluster_send_message = _cluster_send_message, + .name_from_csid = _name_from_csid, + .csid_from_name = _csid_from_name, + .get_num_nodes = _get_num_nodes, + .cluster_fd_callback = _cluster_fd_callback, + .get_main_cluster_fd = _get_main_cluster_fd, + .cluster_do_node_callback = _cluster_do_node_callback, + .is_quorate = _is_quorate, + .get_our_csid = _get_our_csid, + .add_up_node = _add_up_node, + .reread_config = NULL, + .cluster_closedown = _cluster_closedown, + .get_cluster_name = _get_cluster_name, + .sync_lock = _sync_lock, + .sync_unlock = _sync_unlock, +}; + +struct cluster_ops *init_openais_cluster(void) +{ + if (!_init_cluster()) + return &_cluster_openais_ops; + else + return NULL; +} --- LVM2/daemons/clvmd/Makefile.in 2007/01/11 17:12:27 1.17 +++ LVM2/daemons/clvmd/Makefile.in 2007/05/21 10:52:01 1.18 @@ -30,9 +30,16 @@ CMAN = yes endif +ifeq ("@CLVMD@", "openais") + OPENAIS = yes + GULM = no + CMAN = no +endif + ifeq ("@CLVMD@", "all") GULM = yes CMAN = yes + OPENAIS = no endif ifeq ("@DEBUG@", "yes") @@ -51,6 +58,12 @@ DEFS += -DUSE_CMAN endif +ifeq ("$(OPENAIS)", "yes") + SOURCES += clvmd-openais.c + LMLIBS += -lSaLck -lSaClm -lcpg + DEFS += -DUSE_OPENAIS +endif + TARGETS = \ clvmd --- LVM2/daemons/clvmd/clvmd-comms.h 2007/05/02 12:22:40 1.7 +++ LVM2/daemons/clvmd/clvmd-comms.h 2007/05/21 10:52:01 1.8 @@ -75,6 +75,23 @@ struct cluster_ops *init_cman_cluster(void); #endif +#ifdef USE_OPENAIS +# include +# include +# define OPENAIS_CSID_LEN (sizeof(int)) +# define OPENAIS_MAX_CLUSTER_MESSAGE MESSAGE_SIZE_MAX +# define OPENAIS_MAX_CLUSTER_MEMBER_NAME_LEN SA_MAX_NAME_LENGTH +# ifndef MAX_CLUSTER_MEMBER_NAME_LEN +# define MAX_CLUSTER_MEMBER_NAME_LEN SA_MAX_NAME_LENGTH +# endif +# ifndef CMAN_MAX_CLUSTER_MESSAGE +# define CMAN_MAX_CLUSTER_MESSAGE MESSAGE_SIZE_MAX +# endif +# ifndef MAX_CSID_LEN +# define MAX_CSID_LEN sizeof(int) +# endif +struct cluster_ops *init_openais_cluster(void); +#endif #endif --- LVM2/daemons/clvmd/clvmd.c 2007/05/02 12:22:40 1.36 +++ LVM2/daemons/clvmd/clvmd.c 2007/05/21 10:52:01 1.37 @@ -296,6 +296,15 @@ syslog(LOG_NOTICE, "Cluster LVM daemon started - connected to GULM"); } #endif +#ifdef USE_OPENAIS + if (!clops) + if ((clops = init_openais_cluster())) { + max_csid_len = OPENAIS_CSID_LEN; + max_cluster_message = OPENAIS_MAX_CLUSTER_MESSAGE; + max_cluster_member_name_len = OPENAIS_MAX_CLUSTER_MEMBER_NAME_LEN; + syslog(LOG_NOTICE, "Cluster LVM daemon started - connected to OpenAIS"); + } +#endif if (!clops) { DEBUGLOG("Can't initialise cluster interface\n");