cluster-commits October 2009

cluster-commits@lists.fedorahosted.org

9 participants
151 discussions

cluster: STABLE3 - dlm_controld: allow parallel build of pcmk variant
by Fabio M. Di Nitto 05 Oct '09

05 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ff… Commit: ff6ab5f989b19c84f026c2e4aaf8704c44387853 Parent: 1f6dfba4f8901d3f7c324281696b2ed58cb083ed Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Sep 15 15:43:28 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Sep 15 15:43:28 2009 +0200 dlm_controld: allow parallel build of pcmk variant Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- group/Makefile | 6 +- group/dlm_controld/Makefile | 50 +++--- group/dlm_controld/pacemaker.c | 356 +++++++++++++++++----------------------- make/cobj.mk | 4 + make/defines.mk.input | 1 - 5 files changed, 181 insertions(+), 236 deletions(-) diff --git a/group/Makefile b/group/Makefile index 2717fb7..dd87fd6 100644 --- a/group/Makefile +++ b/group/Makefile @@ -1,8 +1,4 @@ include ../make/defines.mk include $(OBJDIR)/make/passthrough.mk -SUBDIRS = lib dlm_controld - -ifndef enable_pacemaker -SUBDIRS += libgfscontrol gfs_control gfs_controld tool daemon man -endif +SUBDIRS = lib dlm_controld libgfscontrol gfs_control gfs_controld tool daemon man diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile index fb795ec..cd6c950 100644 --- a/group/dlm_controld/Makefile +++ b/group/dlm_controld/Makefile @@ -1,11 +1,10 @@ include ../../make/defines.mk -ifdef enable_pacemaker -TARGET = dlm_controld.pcmk -SBINDIRT = dlm_controld.pcmk -else TARGET = dlm_controld SBINDIRT = dlm_controld +ifdef enable_pacemaker +TARGET += dlm_controld.pcmk +SBINDIRT += dlm_controld.pcmk endif all: depends ${TARGET} @@ -15,22 +14,22 @@ include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk -OBJS= action.o \ - cpg.o \ - crc.o \ - deadlock.o \ - main.o \ - netlink.o \ - plock.o \ - group.o +SHAREDOBJS= action.o \ + cpg.o \ + crc.o \ + deadlock.o \ + main.o \ + netlink.o \ + plock.o \ + group.o -ifdef enable_pacemaker -OBJS += pacemaker.o -else -OBJS += config.o \ - member_cman.o \ - logging.o -endif +PCMK_OBJS= pacemaker-pcmk.o \ + $(SHAREDOBJS:.o=-pcmk.o) + +OBJS= $(SHAREDOBJS) \ + config.o \ + member_cman.o \ + logging.o CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir} CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir} @@ -38,13 +37,13 @@ CFLAGS += -I${corosyncincdir} -I${openaisincdir} CFLAGS += -I${fencedincdir} CFLAGS += -I${KERNEL_SRC}/include/ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/ -ifdef enable_pacemaker -CFLAGS += -I${incdir}/heartbeat -I${incdir}/pacemaker -CFLAGS += `pkg-config glib-2.0 --cflags` -CFLAGS += `xml2-config --cflags` -endif CFLAGS += -I${incdir} +PCMK_CFLAGS += -DENABLE_PACEMAKER=1 +PCMK_CFLAGS += -I${incdir}/heartbeat -I${incdir}/pacemaker +PCMK_CFLAGS += `pkg-config glib-2.0 --cflags` +PCMK_CFLAGS += `xml2-config --cflags` + LDFLAGS += -L${dlmlibdir} -ldlm LDFLAGS += -L${logtlibdir} -llogthread LDFLAGS += -L${openaislibdir} -lSaCkpt @@ -64,7 +63,7 @@ CMAN_LDFLAGS += -L${fencedlibdir} -lfenced dlm_controld: ${OBJS} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) -dlm_controld.pcmk: ${OBJS} ${LDDEPS} +dlm_controld.pcmk: ${PCMK_OBJS} ${LDDEPS} $(CC) -o $@ $^ $(LDFLAGS) $(PCMK_LDFLAGS) depends: @@ -73,3 +72,4 @@ depends: clean: generalclean -include $(OBJS:.o=.d) +-include $(PCMK_OBJS:.o=.d) diff --git a/group/dlm_controld/pacemaker.c b/group/dlm_controld/pacemaker.c index 6365123..c661343 100644 --- a/group/dlm_controld/pacemaker.c +++ b/group/dlm_controld/pacemaker.c @@ -11,10 +11,15 @@ #include <pacemaker/crm/crm.h> #include <pacemaker/crm/ais.h> +#include <pacemaker/crm/attrd.h> /* heartbeat support is irrelevant here */ #undef SUPPORT_HEARTBEAT #define SUPPORT_HEARTBEAT 0 #include <pacemaker/crm/common/cluster.h> +#include <pacemaker/crm/common/stack.h> +#include <pacemaker/crm/common/ipc.h> +#include <pacemaker/crm/msg_xml.h> +#include <pacemaker/crm/cib.h> #define COMMS_DIR "/sys/kernel/config/dlm/cluster/comms" @@ -24,7 +29,7 @@ int setup_ccs(void) * only allow configuration from the command-line until CoroSync is stable * enough to be used with Pacemaker */ - cfgd_groupd_compat = 0; /* always use libcpg and disable backward compatability */ + cfgd_groupd_compat = 0; /* always use libcpg and disable backward compat */ return 0; } @@ -46,57 +51,17 @@ void close_logging(void) { extern int ais_fd_async; -int local_node_id = 0; char *local_node_uname = NULL; void dlm_process_node(gpointer key, gpointer value, gpointer user_data); int setup_cluster(void) { - int retries = 0; - int rc = SA_AIS_OK; - struct utsname name; - - crm_peer_init(); - - if(local_node_uname == NULL) { - if(uname(&name) < 0) { - cl_perror("uname(2) call failed"); - exit(100); - } - local_node_uname = crm_strdup(name.nodename); - log_debug("Local node name: %s", local_node_uname); - } + ais_fd_async = -1; + crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL); - /* 16 := CRM_SERVICE */ - retry: - log_debug("Creating connection to our AIS plugin"); - rc = saServiceConnect (&ais_fd_sync, &ais_fd_async, CRM_SERVICE); - if (rc != SA_AIS_OK) { - log_error("Connection to our AIS plugin (%d) failed: %s (%d)", CRM_SERVICE, ais_error2text(rc), rc); - } - - switch(rc) { - case SA_AIS_OK: - break; - case SA_AIS_ERR_TRY_AGAIN: - if(retries < 30) { - sleep(1); - retries++; - goto retry; - } - log_error("Retry count exceeded"); - return 0; - default: - return 0; - } - - log_debug("AIS connection established"); - - { - int pid = getpid(); - char *pid_s = crm_itoa(pid); - send_ais_text(0, pid_s, TRUE, NULL, crm_msg_ais); - crm_free(pid_s); + if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { + log_error("Connection to our AIS plugin failed"); + return -1; } /* Sign up for membership updates */ @@ -105,166 +70,28 @@ int setup_cluster(void) /* Requesting the current list of known nodes */ send_ais_text(crm_class_members, __FUNCTION__, TRUE, NULL, crm_msg_ais); - our_nodeid = get_ais_nodeid(); - log_debug("Local node id: %d", our_nodeid); - return ais_fd_async; } -static void statechange(void) +void update_cluster(void) { static uint64_t last_membership = 0; cluster_quorate = crm_have_quorum; if(last_membership < crm_peer_seq) { log_debug("Processing membership %llu", crm_peer_seq); - g_hash_table_foreach(crm_peer_cache, dlm_process_node, &last_membership); + g_hash_table_foreach(crm_peer_id_cache, dlm_process_node, &last_membership); last_membership = crm_peer_seq; } } -void update_cluster(void) -{ - statechange(); -} - void process_cluster(int ci) { -/* ci ::= client number */ - char *data = NULL; - char *uncompressed = NULL; - - AIS_Message *msg = NULL; - SaAisErrorT rc = SA_AIS_OK; - mar_res_header_t *header = NULL; - mar_res_header_t *h_new; - static int header_len = sizeof(mar_res_header_t); - - if ((header = malloc(header_len)) == NULL) - goto bail; - memset(header, 0, header_len); - - errno = 0; - rc = saRecvRetry(ais_fd_async, header, header_len); - if (rc != SA_AIS_OK) { - cl_perror("Receiving message header failed: (%d) %s", rc, ais_error2text(rc)); - goto bail; - - } else if(header->size == header_len) { - log_error("Empty message: id=%d, size=%d, error=%d, header_len=%d", - header->id, header->size, header->error, header_len); - goto done; - - } else if(header->size == 0 || header->size < header_len) { - log_error("Mangled header: size=%d, header=%d, error=%d", - header->size, header_len, header->error); - goto done; - - } else if(header->error != 0) { - log_error("Header contined error: %d", header->error); - } - - h_new = realloc(header, header->size); - if (h_new == NULL) - goto bail; - header = h_new; - - /* Use a char* so we can store the remainder into an offset */ - data = (char*)header; - - errno = 0; - rc = saRecvRetry(ais_fd_async, data+header_len, header->size - header_len); - msg = (AIS_Message*)data; - - if (rc != SA_AIS_OK) { - cl_perror("Receiving message body failed: (%d) %s", rc, ais_error2text(rc)); - goto bail; - } - - data = msg->data; - if(msg->is_compressed && msg->size > 0) { - int rc = BZ_OK; - unsigned int new_size = msg->size; - - if(check_message_sanity(msg, NULL) == FALSE) { - goto badmsg; - } - - log_debug("Decompressing message data"); - uncompressed = malloc(new_size); - // FIXME: handle malloc failure - memset(uncompressed, 0, new_size); - - rc = BZ2_bzBuffToBuffDecompress( - uncompressed, &new_size, data, msg->compressed_size, 1, 0); - - if(rc != BZ_OK) { - log_error("Decompression failed: %d", rc); - goto badmsg; - } - - CRM_ASSERT(rc == BZ_OK); - CRM_ASSERT(new_size == msg->size); - - data = uncompressed; - - } else if(check_message_sanity(msg, data) == FALSE) { - goto badmsg; - - } else if(safe_str_eq("identify", data)) { - int pid = getpid(); - char *pid_s = crm_itoa(pid); - send_ais_text(0, pid_s, TRUE, NULL, crm_msg_ais); - crm_free(pid_s); - goto done; - } - - if(msg->header.id == crm_class_members) { - xmlNode *xml = string2xml(data); - - if(xml != NULL) { - const char *value = crm_element_value(xml, "id"); - if(value) { - crm_peer_seq = crm_int_helper(value, NULL); - } - - log_debug("Updating membership %llu", crm_peer_seq); - /* crm_log_xml_info(xml, __PRETTY_FUNCTION__); */ - xml_child_iter(xml, node, crm_update_ais_node(node, crm_peer_seq)); - crm_calculate_quorum(); - statechange(); - free_xml(xml); - - } else { - log_error("Invalid peer update: %s", data); - } - - } else { - log_error("Unexpected AIS message type: %d", msg->header.id); - } - - done: - free(uncompressed); - free(msg); - return; - - badmsg: - log_error("Invalid message (id=%d, dest=%s:%s, from=%s:%s.%d):" - " min=%d, total=%d, size=%d, bz2_size=%d", - msg->id, ais_dest(&(msg->host)), msg_type2text(msg->host.type), - ais_dest(&(msg->sender)), msg_type2text(msg->sender.type), - msg->sender.pid, (int)sizeof(AIS_Message), - msg->header.size, msg->size, msg->compressed_size); - goto done; - - bail: - free (header); - log_error("AIS connection failed"); - return; + ais_dispatch(ais_fd_async, NULL); + update_cluster(); } void close_cluster(void) { - /* TODO: Implement something for this */ - return; + terminate_ais_connection(); } #include <arpa/inet.h> @@ -316,16 +143,10 @@ void dlm_process_node(gpointer key, gpointer value, gpointer user_data) action = "Added"; } - if(local_node_id == 0) { - crm_node_t *local_node = g_hash_table_lookup( - crm_peer_cache, local_node_uname); - local_node_id = local_node->id; - } - do { char ipaddr[1024]; int addr_family = AF_INET; - int cna_len = 0, rc = 0; + int cna_len = 0; struct sockaddr_storage cna_addr; struct totem_ip_address totem_addr; @@ -372,17 +193,17 @@ void dlm_process_node(gpointer key, gpointer value, gpointer user_data) continue; } - log_debug("Adding address %s to configfs for node %u/%s ", addr, node->id, node->uname); - add_configfs_node(node->id, ((char*)&cna_addr), cna_len, (node->id == local_node_id)); + log_debug("Adding address %s to configfs for node %u", addr, node->id); + add_configfs_node(node->id, ((char*)&cna_addr), cna_len, (node->id == our_nodeid)); } while(addr != NULL); free(addr_top); } - log_debug("%s %sctive node %u '%s': born-on=%llu, last-seen=%llu, this-event=%llu, last-event=%llu", - action, crm_is_member_active(value)?"a":"ina", - node->id, node->uname, node->born, node->last_seen, - crm_peer_seq, (unsigned long long)*last); + log_debug("%s %sctive node %u: born-on=%llu, last-seen=%llu, this-event=%llu, last-event=%llu", + action, crm_is_member_active(value)?"a":"ina", + node->id, node->born, node->last_seen, + crm_peer_seq, (unsigned long long)*last); } int is_cluster_member(int nodeid) @@ -399,18 +220,143 @@ char *nodeid2name(int nodeid) { return strdup(node->uname); } +static int pcmk_cluster_fd = 0; + +static void attrd_deadfn(int ci) +{ + log_error("%s: Lost connection to the cluster", __FUNCTION__); + pcmk_cluster_fd = 0; + return; +} + void kick_node_from_cluster(int nodeid) { - log_error("%s not yet implemented", __FUNCTION__); + int fd = pcmk_cluster_fd; + int rc = crm_terminate_member_no_mainloop(nodeid, NULL, &fd); + + if(fd > 0 && fd != pcmk_cluster_fd) { + pcmk_cluster_fd = fd; + client_add(pcmk_cluster_fd, NULL, attrd_deadfn); + } + + switch(rc) { + case 1: + log_debug("Requested that node %d be kicked from the cluster", nodeid); + break; + case -1: + log_error("Don't know how to kick node %d from the cluster", nodeid); + break; + case 0: + log_error("Could not kick node %d from the cluster", nodeid); + break; + default: + log_error("Unknown result when kicking node %d from the cluster", nodeid); + break; + } return; } -int fence_node_time(int nodeid, uint64_t *last_fenced_time) +cib_t *cib = NULL; + +static void cib_deadfn(int ci) +{ + log_error("Lost connection to the cib"); + cib = NULL; /* TODO: memory leak in unlikely error path */ + return; +} + +static cib_t *cib_connect(void) +{ + int rc = 0; + int cib_fd = 0; + if(cib) { + return cib; + } + + cib = cib_new(); + rc = cib->cmds->signon_raw(cib, crm_system_name, cib_command, &cib_fd, NULL); + if(rc != cib_ok) { + log_error("Signon to cib failed: %s", cib_error2string(rc)); + cib = NULL; /* TODO: memory leak in unlikely error path */ + + } else { + client_add(cib_fd, NULL, cib_deadfn); + } + return cib; +} + + +int fence_in_progress(int *in_progress) { + int rc = 0; + xmlNode *xpath_data; + + cib_connect(); + if(cib == NULL) { + return -1; + } + + /* TODO: Not definitive - but a good approximation */ + rc = cib->cmds->query(cib, "//nvpar[@name='terminate']", &xpath_data, + cib_xpath|cib_scope_local|cib_sync_call); + + if(xpath_data == NULL) { + *in_progress = 0; return 0; + } + + log_debug("Fencing in progress: %s", xpath_data?"true":"false"); + free_xml(xpath_data); + *in_progress = 1; + return 1; } -int fence_in_progress(int *count) +#define XPATH_MAX 1024 + +int fence_node_time(int nodeid, uint64_t *last_fenced_time) { + int rc = 0; + static time_t last_log = 0; + + xmlNode *xpath_data; + char xpath_query[XPATH_MAX]; + crm_node_t *node = crm_get_peer(nodeid, NULL); + + if(last_fenced_time) { + *last_fenced_time = 0; + } + + if(node == NULL || node->uname == NULL) { + log_error("Nothing known about node %d", nodeid); return 0; + } + + cib_connect(); + if(cib == NULL) { + return -1; + } + + snprintf(xpath_query, XPATH_MAX, "//lrm[@id='%s']", node->uname); + rc = cib->cmds->query( + cib, xpath_query, &xpath_data, cib_xpath|cib_scope_local|cib_sync_call); + + if(xpath_data == NULL) { + /* the node has been shot - return 'now' */ + log_level(LOG_INFO, "Node %d/%s was last shot 'now'", nodeid, node->uname); + *last_fenced_time = time(NULL); + last_log = 0; + + } else { + time_t now = time(NULL); + if(last_log == 0) { + log_level(LOG_INFO, "Node %d/%s has not been shot yet", nodeid, node->uname); + + } else if(now - last_log > 30) { + log_level(LOG_DEBUG, "Node %d/%s has still not been shot yet", nodeid, node->uname); + } + last_log = now; + } + + free_xml(xpath_data); + return 0; } diff --git a/make/cobj.mk b/make/cobj.mk index 03f1826..4b12960 100644 --- a/make/cobj.mk +++ b/make/cobj.mk @@ -5,6 +5,10 @@ %_lt.o: $(S)/%.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< +# used by group/dlm_controld +%-pcmk.o: $(S)/%.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(PCMK_CFLAGS) -c -o $@ $< + # used by rgmanager/src/daemons %-noccs.o: $(S)/%.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(NOCCS_CFLAGS) -c -o $@ $< diff --git a/make/defines.mk.input b/make/defines.mk.input index b098e75..d36db8b 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -25,7 +25,6 @@ RANLIB = ranlib CFLAGS += @CFLAGS@ -I@SRCDIR@/make CFLAGS += -DDEFAULT_CONFIG_DIR=\"@CONFDIR@\" -DDEFAULT_CONFIG_FILE=\"@CONFFILE@\" -CFLAGS += -DENABLE_PACEMAKER=@ENABLE_PACEMAKER@ CFLAGS += -DLOGDIR=\"@LOGDIR@\" -DSYSLOGFACILITY=@SYSLOGFACILITY@ -DSYSLOGLEVEL=@SYSLOGLEVEL@ LDFLAGS += @LDFLAGS@

1 0

cluster: STABLE3 - config: in LDAP cluster entry is not a cn=
by Fabio M. Di Nitto 05 Oct '09

05 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1f… Commit: 1f6dfba4f8901d3f7c324281696b2ed58cb083ed Parent: 3f88e836e582c63938d2fd3862080a8e920a6f52 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Mon Sep 14 14:59:48 2009 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Mon Sep 14 14:59:48 2009 +0100 config: in LDAP cluster entry is not a cn= cn=cluster should be name=cluster. This gets rid of a schema anomoly. Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- config/plugins/ldap/configldap.c | 2 +- config/tools/ldap/confdb2ldif.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/plugins/ldap/configldap.c b/config/plugins/ldap/configldap.c index c4549ae..c3e8b4c 100644 --- a/config/plugins/ldap/configldap.c +++ b/config/plugins/ldap/configldap.c @@ -282,7 +282,7 @@ static int init_config(struct objdb_iface_ver0 *objdb) return -1; } - rc = read_config_for(ld, objdb, OBJECT_PARENT_HANDLE, "cluster", "cn=cluster", 1); + rc = read_config_for(ld, objdb, OBJECT_PARENT_HANDLE, "cluster", "name=cluster", 1); ldap_unbind(ld); return 0; diff --git a/config/tools/ldap/confdb2ldif.c b/config/tools/ldap/confdb2ldif.c index f75a5b3..35f8c31 100644 --- a/config/tools/ldap/confdb2ldif.c +++ b/config/tools/ldap/confdb2ldif.c @@ -162,7 +162,7 @@ int main(int argc, char *argv[]) exit (1); } - sprintf(basedn, "cn=%s,%s", clusterroot, argv[1]); + sprintf(basedn, "name=%s,%s", clusterroot, argv[1]); /* Print a header */ printf("# This file was generated by confdb2ldif, from an existing cluster configuration\n");

1 0

fence-agents: master - fence_scsi: man page contains invalid "-s" option
by Marek Grác 02 Oct '09

02 Oct '09

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: cc95f40eeb1e987ae7d6e3a348f2f3c0f5b98c0d Parent: 894b0332d8058742151e92f3c1f4c9086e214638 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Fri Oct 2 16:01:23 2009 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Fri Oct 2 16:01:23 2009 +0200 fence_scsi: man page contains invalid "-s" option Resolves: bz#515731 --- fence/man/fence_scsi.8 | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/fence/man/fence_scsi.8 b/fence/man/fence_scsi.8 index 39843cd..eaab222 100644 --- a/fence/man/fence_scsi.8 +++ b/fence/man/fence_scsi.8 @@ -76,9 +76,6 @@ Name of the node to be fenced. \fB-h\fP Print out a help message describing available options, then exit. .TP -\fB-s\fP \fIself\fR -Name of the node that will perform the fencing operation. -.TP \fB-v\fP Verbose output. .TP

1 0

cluster: STABLE3 - config: add cman upgrading and disallowed keys to the schema
by Christine Caulfield 02 Oct '09

02 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e7… Commit: e7f1d826947338a043d781b22b5b0cb67ac82f62 Parent: b65a7b4e86c4fb6b52752918090ea3230e27970a Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Fri Oct 2 14:50:25 2009 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Fri Oct 2 14:50:25 2009 +0100 config: add cman upgrading and disallowed keys to the schema Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- config/plugins/ldap/99cluster.ldif | 16 ++++++++++++++-- config/plugins/ldap/ldap-base.csv | 4 +++- config/tools/xml/cluster.rng.in | 12 ++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif index 0f6925c..6c4ee4b 100644 --- a/config/plugins/ldap/99cluster.ldif +++ b/config/plugins/ldap/99cluster.ldif @@ -1,4 +1,4 @@ -# Auto-generated @ 2009-09-16 12:13:26 +# Auto-generated @ 2009-10-02 14:49:14 dn: cn=schema attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.15 NAME 'rhcsAlias' @@ -25,6 +25,18 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.241 NAME 'rhcsUpgrading' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.242 NAME 'rhcsDisallowed' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE + ) +attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.16 NAME 'rhcsQuorum-dev-poll' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 @@ -1382,7 +1394,7 @@ objectClasses: ( objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.3 NAME 'rhcsCman' SUP top STRUCTURAL MUST ( cn ) - MAY ( rhcsDisable-openais $ rhcsKeyfile $ rhcsBroadcast $ rhcsNodename $ rhcsCluster-id $ rhcsPort $ rhcsDebug-mask $ rhcsCcsd-poll $ rhcsShutdown-timeout $ rhcsQuorum-dev-poll $ rhcsExpected-votes $ rhcsTwo-node ) + MAY ( rhcsDisable-openais $ rhcsKeyfile $ rhcsBroadcast $ rhcsNodename $ rhcsCluster-id $ rhcsPort $ rhcsDebug-mask $ rhcsCcsd-poll $ rhcsShutdown-timeout $ rhcsQuorum-dev-poll $ rhcsDisallowed $ rhcsUpgrading $ rhcsExpected-votes $ rhcsTwo-node ) ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.8 NAME 'rhcsMulticast' SUP top STRUCTURAL diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv index 33941b7..f8a3681 100644 --- a/config/plugins/ldap/ldap-base.csv +++ b/config/plugins/ldap/ldap-base.csv @@ -1,4 +1,4 @@ -# Max attribute value: 240 +# Max attribute value: 242 # Max object class value: 58 obj,rhcsCluster,cluster,1 obj,rhcsCman,cman,3 @@ -297,3 +297,5 @@ attr,rhcsSkip-undefined,skip_undefined,239 obj,rhcsLogging-daemon,logging_daemon,57 obj,rhcsDrbd,drbd,58 attr,rhcsResource,resource,240 +attr,rhcsUpgrading,upgrading,241 +attr,rhcsDisallowed,disallowed,242 diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in index 871d44e..887c477 100644 --- a/config/tools/xml/cluster.rng.in +++ b/config/tools/xml/cluster.rng.in @@ -73,6 +73,18 @@ To validate your cluster.conf against this schema, run: </attribute> </optional> <optional> + <attribute name="upgrading" rha:description="Set this if you are + performing a rolling upgrade of the cluster between major + releases." rha:sample="no"/> + </optional> + <optional> + <attribute name="disallowed" rha:description="Set this to 1 enable + cman's Disallowed mode. This is usually only needed for + backwards compatibility." rha:sample="1"> + <data type="nonNegativeInteger"/> + </attribute> + </optional> + <optional> <attribute name="quorum_dev_poll" rha:description="The amount of time after a qdisk poll, in milliseconds, before a quorum disk is considered dead. The quorum disk daemon, qdisk, periodically

1 0

cluster: STABLE3 - cman_tool: use quiet options for config validation
by Fabio M. Di Nitto 02 Oct '09

02 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b6… Commit: b65a7b4e86c4fb6b52752918090ea3230e27970a Parent: 1ad72774e4139fbc7163ae35bbde3fbf41615dc7 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Fri Oct 2 13:40:14 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Fri Oct 2 13:40:14 2009 +0200 cman_tool: use quiet options for config validation and stop passing the config loader info that's already in the environment Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/cman_tool/main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c index 9ba2c6c..3eedfea 100644 --- a/cman/cman_tool/main.c +++ b/cman/cman_tool/main.c @@ -649,7 +649,7 @@ static void set_votes(commandline_t *comline) cman_finish(h); } -static int validate_config(commandline_t *comline, char *config_value) +static int validate_config(commandline_t *comline) { struct stat st; char command[PATH_MAX]; @@ -663,7 +663,7 @@ static int validate_config(commandline_t *comline, char *config_value) return 0; } - snprintf(command, sizeof(command), "%s -C %s", validator, config_value); + snprintf(command, sizeof(command), "%s -q", validator); if (comline->verbose > 1) printf("calling '%s'\n", command); @@ -759,7 +759,7 @@ static void version(commandline_t *comline) if (comline->verbose) printf("Validating configuration\n"); - if (validate_config(comline, config_modules) && + if (validate_config(comline) && comline->config_validate_opt == VALIDATE_FAIL) die("Not reloading, configuration is not valid\n"); } @@ -1149,7 +1149,7 @@ static void do_join(commandline_t *comline, char *envp[]) if (comline->verbose) printf("Validating configuration\n"); - if (validate_config(comline, comline->config_lcrso) && + if (validate_config(comline) && comline->config_validate_opt == VALIDATE_FAIL) die("Not joining, configuration is not valid\n"); }

1 0

cluster: STABLE3 - cman init: add options to drive config validation in cman_tool
by Fabio M. Di Nitto 02 Oct '09

02 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1a… Commit: 1ad72774e4139fbc7163ae35bbde3fbf41615dc7 Parent: 137c94155c81106ad1460ae55a22b1a898524167 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Fri Oct 2 13:11:27 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Fri Oct 2 13:11:27 2009 +0200 cman init: add options to drive config validation in cman_tool Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index aa8a585..055abda 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -154,6 +154,16 @@ fi # openaisparser - use internal openais config file parser. [ -n "$CONFIG_LOADER" ] && cman_join_opts+=" -C $CONFIG_LOADER" +# CONFIG_VALIDATION -- select default config validation behaviour +# This can be: +# FAIL - Use a very strict checking. The config will not be loaded if there +# for any kind of warnings/errors. +# WARN - Same as FAIL, but will allow the config to load (this is temporary +# the default behaviour) +# NONE - Disable config validation. Highly discouraged. +[ -z "$CONFIG_VALIDATION" ] && CONFIG_VALIDATION=WARN +cman_join_opts+=" -D$CONFIG_VALIDATION" + # CMAN_LEAVE_OPTS -- allows extra options to be passed to cman_tool when leave # operation is performed. [ -n "$CMAN_LEAVE_OPTS" ] && cman_leave_opts="$CMAN_LEAVE_OPTS" @@ -522,6 +532,9 @@ start_cman() ret=1 else ret=0 + if [ "$CONFIG_VALIDATION" = "WARN" ] && [ -s $tmpfile ]; then + cat $tmpfile >&2 + fi fi rm -f $tmpfile

1 0

cluster: STABLE3 - config validation: add quiet option and allow env override
by Fabio M. Di Nitto 02 Oct '09

02 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=13… Commit: 137c94155c81106ad1460ae55a22b1a898524167 Parent: e5ac2f365c6c02709b19408fe2fae0f9507e1fa0 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Fri Oct 2 11:20:45 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Fri Oct 2 11:20:45 2009 +0200 config validation: add quiet option and allow env override Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- config/tools/xml/ccs_config_validate.in | 50 ++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/config/tools/xml/ccs_config_validate.in b/config/tools/xml/ccs_config_validate.in index af2d186..e241cd3 100644 --- a/config/tools/xml/ccs_config_validate.in +++ b/config/tools/xml/ccs_config_validate.in @@ -1,19 +1,21 @@ #!/bin/bash -# rpm based distros -if [ -d /etc/sysconfig ]; then - [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster - [ -f /etc/sysconfig/cman ] && . /etc/sysconfig/cman -fi +if [ -z "$COROSYNC_DEFAULT_CONFIG_IFACE" ]; then + # rpm based distros + if [ -d /etc/sysconfig ]; then + [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster + [ -f /etc/sysconfig/cman ] && . /etc/sysconfig/cman + fi -# deb based distros -if [ -d /etc/default ]; then - [ -f /etc/default/cluster ] && . /etc/default/cluster - [ -f /etc/default/cman ] && . /etc/default/cman -fi + # deb based distros + if [ -d /etc/default ]; then + [ -f /etc/default/cluster ] && . /etc/default/cluster + [ -f /etc/default/cman ] && . /etc/default/cman + fi -[ -z "$CONFIG_LOADER" ] && CONFIG_LOADER=xmlconfig -export COROSYNC_DEFAULT_CONFIG_IFACE=$CONFIG_LOADER:cmanpreconfig + [ -z "$CONFIG_LOADER" ] && CONFIG_LOADER=xmlconfig + export COROSYNC_DEFAULT_CONFIG_IFACE=$CONFIG_LOADER:cmanpreconfig +fi print_usage() { echo "Usage:" @@ -24,6 +26,7 @@ print_usage() { echo " -h Print this help, then exit" echo " -V Print program version information, then exit" echo " -v Produce verbose output" + echo " -q Be very quiet" echo "" echo "Validating XML configuraton files:" echo " -f configfile Validate an alternate config file" @@ -105,6 +108,17 @@ check_opts() { ;; -v) verbose=1 + if [ -n "$quiet" ]; then + echo "Error: invalid options. -v can not be set together with -q" >&2 + exit 255 + fi + ;; + -q) + quiet=1 + if [ -n "$verbose" ]; then + echo "Error: invalid options. -q can not be set together with -v" >&2 + exit 255 + fi ;; esac shift @@ -117,7 +131,7 @@ lecho() return 0 } -opts=$(getopt t:hVnC:f:l:rov $@) +opts=$(getopt t:hVnC:f:l:rovq $@) if [ "$?" != 0 ]; then print_usage >&2 exit 255 @@ -158,10 +172,12 @@ xmlout=$(xmllint --noout \ $tempfile 2>&1) res=$? -echo "$xmlout" | sed \ - -e 's#.*validates$#Configuration validates#g' \ - -e 's#.*validate$#Configuration fails to validate#g' \ - -e 's#'$tempfile'#tempfile#g' +if [ -z "$quiet" ] || [ "$res" != "0" ]; then + echo "$xmlout" | sed \ + -e 's#.*validates$#Configuration validates#g' \ + -e 's#.*validate$#Configuration fails to validate#g' \ + -e 's#'$tempfile'#tempfile#g' +fi lecho "Validation completed"

1 0

cluster: STABLE3 - cman_tool: fix Makefile
by Fabio M. Di Nitto 02 Oct '09

02 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e5… Commit: e5ac2f365c6c02709b19408fe2fae0f9507e1fa0 Parent: 8e6dd47ad56b7a89c388ec50597f604369f289bc Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Fri Oct 2 10:50:09 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Fri Oct 2 10:50:09 2009 +0200 cman_tool: fix Makefile add corosyncinc/libdir and respect search order Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/cman_tool/Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile index 149b758..139ac52 100644 --- a/cman/cman_tool/Makefile +++ b/cman/cman_tool/Makefile @@ -14,13 +14,13 @@ OBJS= main.o \ join.o CFLAGS += -DCOROSYNCBIN=\"${corosyncbin}\" -DSBINDIR=\"${sbindir}\" -CFLAGS += -I${cmanincdir} +CFLAGS += -I${cmanincdir} -I${ccsincdir} +CFLAGS += -I${corosyncincdir} CFLAGS += -I${incdir} -CFLAGS += -I${ccsincdir} -LDFLAGS += -L${cmanlibdir} -lcman +LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs +LDFLAGS += -L${corosynclibdir} -lconfdb LDFLAGS += -L${libdir} -LDFLAGS += -L${ccslibdir} -lconfdb -lccs ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS)

1 0

cluster: STABLE3 - cman: Fix join fail message
by Christine Caulfield 02 Oct '09

02 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8e… Commit: 8e6dd47ad56b7a89c388ec50597f604369f289bc Parent: df5dc41a7eb1440f1f947785ebd86b1b464ee586 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Fri Oct 2 09:41:47 2009 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Fri Oct 2 09:41:47 2009 +0100 cman: Fix join fail message cman now says it can't JOIN if the configuration is invalid, not reload, sigh Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- cman/cman_tool/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c index 8a416eb..9ba2c6c 100644 --- a/cman/cman_tool/main.c +++ b/cman/cman_tool/main.c @@ -1151,7 +1151,7 @@ static void do_join(commandline_t *comline, char *envp[]) if (validate_config(comline, comline->config_lcrso) && comline->config_validate_opt == VALIDATE_FAIL) - die("Not reloading, configuration is not valid\n"); + die("Not joining, configuration is not valid\n"); } join(comline, envp);

1 0

cluster: STABLE3 - cman: Allow <cman upgrading="yes"/>
by Christine Caulfield 01 Oct '09

01 Oct '09

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=df… Commit: df5dc41a7eb1440f1f947785ebd86b1b464ee586 Parent: f1c1fa3445fe4646904a41d0f370697d25f8dc70 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Thu Oct 1 10:57:22 2009 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Thu Oct 1 10:57:22 2009 +0100 cman: Allow <cman upgrading="yes"/> I think "yes" is more prevalent than "on" to enable things like debug logging so I've allowed "yes" as well as "on" in the upgrading key. We should only document one of these of course. But this, at least, saves me time. Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- cman/daemon/cman-preconfig.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c index aece9a5..b39ca4c 100644 --- a/cman/daemon/cman-preconfig.c +++ b/cman/daemon/cman-preconfig.c @@ -1272,7 +1272,7 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error /* Set up STABLE2/RHEL5 compatibility modes */ objdb_get_string(objdb, object_handle, "upgrading", &str); - if (str && strcasecmp(str, "on")==0) { + if (str && (strcasecmp(str, "on")==0 || strcasecmp(str, "yes")==0)) { setup_old_compat(objdb, cluster_parent_handle); }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits October 2009