Hello community, here is the log from the commit of package pacemaker checked in at Mon Sep 1 15:26:48 CEST 2008. -------- --- pacemaker/pacemaker.changes 2008-08-30 12:42:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/pacemaker/pacemaker.changes 2008-09-01 10:30:26.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 1 10:25:58 CEST 2008 - abeekhof@suse.de + +- Update source tarball to revision: 1df197982079 +- Try again to fix compilation in STABLE (this time also tested with mbuild) +- STONITH is now enabled by default and the cluster will warn if no STONITH resource is found + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.f12749/_old 2008-09-01 15:26:33.000000000 +0200 +++ /var/tmp/diff_new_pack.f12749/_new 2008-09-01 15:26:33.000000000 +0200 @@ -34,7 +34,7 @@ Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager Version: 0.7.1 -Release: 2 +Release: 4 License: GPL v2 or later; LGPL v2.1 or later Url: http://www.clusterlabs.org Group: Productivity/Clustering/HA @@ -277,6 +277,10 @@ %{_libdir}/*.so %changelog +* Mon Sep 01 2008 abeekhof@suse.de +- Update source tarball to revision: 1df197982079 +- Try again to fix compilation in STABLE (this time also tested with mbuild) +- STONITH is now enabled by default and the cluster will warn if no STONITH resource is found * Sat Aug 30 2008 abeekhof@suse.de - Update source tarball to revision: 902885c90d96 - Fixes build ordering ssue that prevented compilation of lib/common ++++++ pacemaker.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/.hg_archival.txt new/pacemaker/.hg_archival.txt --- old/pacemaker/.hg_archival.txt 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/.hg_archival.txt 2008-09-01 10:19:10.000000000 +0200 @@ -1,2 +1,2 @@ repo: 8448b17e67437947c48c639c6faa4371c4a14b3b -node: 902885c90d96c01eecbcfaab94d9421db5be8510 +node: 1df1979820791d7612893cdd037c26b8f4d96a87 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/include/crm/pengine/status.h new/pacemaker/include/crm/pengine/status.h --- old/pacemaker/include/crm/pengine/status.h 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/include/crm/pengine/status.h 2008-09-01 10:19:10.000000000 +0200 @@ -43,6 +43,21 @@ pe_restart_ignore }; +#define pe_flag_have_quorum 0x00000001ULL +#define pe_flag_symmetric_cluster 0x00000002ULL +#define pe_flag_is_managed_default 0x00000004ULL + +#define pe_flag_stonith_enabled 0x00000010ULL +#define pe_flag_have_stonith_resource 0x00000020ULL + +#define pe_flag_stop_rsc_orphans 0x00000100ULL +#define pe_flag_stop_action_orphans 0x00000200ULL +#define pe_flag_stop_everything 0x00000400ULL + +#define pe_flag_start_failure_fatal 0x00001000ULL +#define pe_flag_remove_after_stop 0x00002000ULL + + typedef struct pe_working_set_s { xmlNode *input; @@ -52,18 +67,9 @@ char *transition_idle_timeout; char *dc_uuid; node_t *dc_node; - gboolean have_quorum; - gboolean stonith_enabled; const char *stonith_action; - gboolean symmetric_cluster; - gboolean is_managed_default; - gboolean start_failure_fatal; - - gboolean remove_after_stop; - gboolean stop_rsc_orphans; - gboolean stop_action_orphans; - gboolean stop_everything; + unsigned long long flags; int default_failure_timeout; int default_migration_threshold; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/lib/common/Makefile.am new/pacemaker/lib/common/Makefile.am --- old/pacemaker/lib/common/Makefile.am 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/lib/common/Makefile.am 2008-09-01 10:19:10.000000000 +0200 @@ -36,8 +36,8 @@ endif libcrmcluster_la_LDFLAGS = -version-info 1:0:0 -libcrmcluster_la_LIBADD = $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -libcrmcluster_la_DEPENDENCIES = $(top_builddir)/lib/common/libcrmcommon.la +libcrmcluster_la_LIBADD = $(CLUSTERLIBS) libcrmcommon.la +libcrmcluster_la_DEPENDENCIES = libcrmcommon.la # Must use non-fatal CFLAGS because glib insists on pretending things are const # when they're not and thus we need the crm_element_value_const() hack @@ -49,7 +49,7 @@ CFLAGS = $(NON_FATAL_CFLAGS) -fPIC -libcrmcommon_la_SOURCES = ipc.c utils.c xml.c ctrl.c iso8601.c iso8601_fields.c remote.c +libcrmcommon_la_SOURCES = ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c libcrmcommon_la_LDFLAGS = -version-info 2:0:0 $(GNUTLSLIBS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/lib/pengine/common.c new/pacemaker/lib/pengine/common.c --- old/pacemaker/lib/pengine/common.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/lib/pengine/common.c 2008-09-01 10:19:10.000000000 +0200 @@ -65,7 +65,7 @@ "What to do when the cluster does not have quorum", NULL }, { "symmetric-cluster", "symmetric_cluster", "boolean", NULL, "true", &check_boolean, "All resources can run anywhere by default", NULL }, - { "stonith-enabled", "stonith_enabled", "boolean", NULL, "false", &check_boolean, + { "stonith-enabled", "stonith_enabled", "boolean", NULL, "true", &check_boolean, "Failed nodes are STONITH'd", NULL }, { "stonith-action", "stonith_action", "enum", "reboot, poweroff", "reboot", &check_stonith_action, "Action to send to STONITH device", NULL }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/lib/pengine/complex.c new/pacemaker/lib/pengine/complex.c --- old/pacemaker/lib/pengine/complex.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/lib/pengine/complex.c 2008-09-01 10:19:10.000000000 +0200 @@ -136,6 +136,7 @@ xmlNode *ops = NULL; const char *value = NULL; const char *id = crm_element_value(xml_obj, XML_ATTR_ID); + const char *class = crm_element_value(xml_obj, XML_AGENT_ATTR_CLASS); crm_log_xml_debug_3(xml_obj, "Processing resource input..."); @@ -197,7 +198,7 @@ set_bit((*rsc)->flags, pe_rsc_runnable); set_bit((*rsc)->flags, pe_rsc_provisional); - if(data_set->is_managed_default) { + if(is_set(data_set->flags, pe_flag_is_managed_default)) { set_bit((*rsc)->flags, pe_rsc_managed); } @@ -278,7 +279,7 @@ } value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_TARGET_ROLE); - if(data_set->stop_everything) { + if(is_set(data_set->flags, pe_flag_stop_everything)) { (*rsc)->next_role = RSC_ROLE_STOPPED; } else if(value != NULL && safe_str_neq("default", value)) { @@ -301,12 +302,16 @@ if(is_not_set((*rsc)->flags, pe_rsc_managed)) { crm_warn("Resource %s is currently not managed", (*rsc)->id); - } else if(data_set->symmetric_cluster) { + } else if(is_set(data_set->flags, pe_flag_symmetric_cluster)) { resource_location(*rsc, NULL, 0, "symmetric_default", data_set); } crm_debug_2("\tAction notification: %s", is_set((*rsc)->flags, pe_rsc_notify)?"required":"not required"); + + if(safe_str_eq(class, "stonith")) { + set_bit_inplace(data_set->flags, pe_flag_have_stonith_resource); + } /* data_set->resources = g_list_append(data_set->resources, (*rsc)); */ return TRUE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/lib/pengine/status.c new/pacemaker/lib/pengine/status.c --- old/pacemaker/lib/pengine/status.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/lib/pengine/status.c 2008-09-01 10:19:10.000000000 +0200 @@ -92,13 +92,14 @@ data_set->input, XML_ATTR_DC_UUID); } - if(value != NULL) { - cl_str_to_boolean(value, &data_set->have_quorum); + clear_bit_inplace(data_set->flags, pe_flag_have_quorum); + if(crm_is_true(value)) { + set_bit_inplace(data_set->flags, pe_flag_have_quorum); } unpack_config(config, data_set); - if(data_set->have_quorum == FALSE + if(is_set(data_set->flags, pe_flag_have_quorum) == FALSE && data_set->no_quorum_policy != no_quorum_ignore) { crm_warn("We do not have quorum" " - fencing and resource management disabled"); @@ -214,17 +215,10 @@ data_set->transition_idle_timeout = NULL; data_set->dc_uuid = NULL; data_set->dc_node = NULL; - data_set->have_quorum = FALSE; - data_set->stonith_enabled = FALSE; + data_set->stonith_action = NULL; - data_set->symmetric_cluster = TRUE; - data_set->is_managed_default = TRUE; data_set->no_quorum_policy = no_quorum_freeze; - data_set->remove_after_stop = FALSE; - data_set->stop_action_orphans = TRUE; - data_set->stop_rsc_orphans = TRUE; - data_set->config_hash = NULL; data_set->nodes = NULL; data_set->resources = NULL; @@ -242,6 +236,12 @@ data_set->default_failure_timeout = 0; data_set->default_migration_threshold = 0; data_set->default_resource_stickiness = 0; + + data_set->flags = 0x0ULL; + set_bit_inplace(data_set->flags, pe_flag_symmetric_cluster); + set_bit_inplace(data_set->flags, pe_flag_is_managed_default); + set_bit_inplace(data_set->flags, pe_flag_stop_rsc_orphans); + set_bit_inplace(data_set->flags, pe_flag_stop_action_orphans); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/lib/pengine/unpack.c new/pacemaker/lib/pengine/unpack.c --- old/pacemaker/lib/pengine/unpack.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/lib/pengine/unpack.c 2008-09-01 10:19:10.000000000 +0200 @@ -33,6 +33,17 @@ #include <crm/pengine/rules.h> #include <unpack.h> +#define set_config_flag(data_set, option, flag) do { \ + const char *tmp = pe_pref(data_set->config_hash, option); \ + if(tmp) { \ + if(crm_is_true(tmp)) { \ + set_bit_inplace(data_set->flags, flag); \ + } else { \ + clear_bit_inplace(data_set->flags, flag); \ + } \ + } \ + } while(0) + gboolean unpack_config(xmlNode *config, pe_working_set_t *data_set) { @@ -57,10 +68,9 @@ crm_debug("Default stickiness: %d", data_set->default_resource_stickiness); - value = pe_pref(data_set->config_hash, "stop-all-resources"); - data_set->stop_everything = crm_is_true(value); + set_config_flag(data_set, "stop-all-resources", pe_flag_stop_everything); crm_debug("Stop all active resources: %s", - data_set->stop_everything?"true":"false"); + is_set(data_set->flags, pe_flag_stop_everything)?"true":"false"); value = pe_pref(data_set->config_hash, "default-failure-timeout"); data_set->default_failure_timeout = (crm_get_msec(value) / 1000); @@ -71,17 +81,15 @@ crm_debug("Default migration threshold: %d", data_set->default_migration_threshold); - value = pe_pref(data_set->config_hash, "stonith-enabled"); - cl_str_to_boolean(value, &data_set->stonith_enabled); + set_config_flag(data_set, "stonith-enabled", pe_flag_stonith_enabled); crm_debug("STONITH of failed nodes is %s", - data_set->stonith_enabled?"enabled":"disabled"); + is_set(data_set->flags, pe_flag_stonith_enabled)?"enabled":"disabled"); data_set->stonith_action = pe_pref(data_set->config_hash, "stonith-action"); crm_debug_2("STONITH will %s nodes", data_set->stonith_action); - value = pe_pref(data_set->config_hash, "symmetric-cluster"); - cl_str_to_boolean(value, &data_set->symmetric_cluster); - if(data_set->symmetric_cluster) { + set_config_flag(data_set, "symmetric-cluster", pe_flag_symmetric_cluster); + if(is_set(data_set->flags, pe_flag_symmetric_cluster)) { crm_debug("Cluster is symmetric" " - resources can run anywhere by default"); } @@ -98,14 +106,14 @@ gboolean do_panic = FALSE; crm_element_value_int(data_set->input, XML_ATTR_QUORUM_PANIC, &do_panic); - if(data_set->stonith_enabled == FALSE){ + if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE){ crm_config_err("Setting no-quorum-policy=suicide makes no sense if stonith-enabled=false"); } - if(do_panic && data_set->stonith_enabled) { + if(do_panic && is_set(data_set->flags, pe_flag_stonith_enabled)) { data_set->no_quorum_policy = no_quorum_suicide; - } else if(data_set->have_quorum == FALSE && do_panic == FALSE) { + } else if(is_set(data_set->flags, pe_flag_have_quorum) == FALSE && do_panic == FALSE) { crm_notice("Resetting no-quorum-policy to 'stop': The cluster has never had quorum"); data_set->no_quorum_policy = no_quorum_stop; } @@ -129,30 +137,25 @@ break; } - value = pe_pref(data_set->config_hash, "stop-orphan-resources"); - cl_str_to_boolean(value, &data_set->stop_rsc_orphans); + set_config_flag(data_set, "stop-orphan-resources", pe_flag_stop_rsc_orphans); crm_debug_2("Orphan resources are %s", - data_set->stop_rsc_orphans?"stopped":"ignored"); + is_set(data_set->flags, pe_flag_stop_rsc_orphans)?"stopped":"ignored"); - value = pe_pref(data_set->config_hash, "stop-orphan-actions"); - cl_str_to_boolean(value, &data_set->stop_action_orphans); + set_config_flag(data_set, "stop-orphan-actions", pe_flag_stop_action_orphans); crm_debug_2("Orphan resource actions are %s", - data_set->stop_action_orphans?"stopped":"ignored"); + is_set(data_set->flags, pe_flag_stop_action_orphans)?"stopped":"ignored"); - value = pe_pref(data_set->config_hash, "remove-after-stop"); - cl_str_to_boolean(value, &data_set->remove_after_stop); + set_config_flag(data_set, "remove-after-stop", pe_flag_remove_after_stop); crm_debug_2("Stopped resources are removed from the status section: %s", - data_set->remove_after_stop?"true":"false"); + is_set(data_set->flags, pe_flag_remove_after_stop)?"true":"false"); - value = pe_pref(data_set->config_hash, "is-managed-default"); - cl_str_to_boolean(value, &data_set->is_managed_default); + set_config_flag(data_set, "is-managed-default", pe_flag_is_managed_default); crm_debug_2("By default resources are %smanaged", - data_set->is_managed_default?"":"not "); + is_set(data_set->flags, pe_flag_is_managed_default)?"":"not "); - value = pe_pref(data_set->config_hash, "start-failure-is-fatal"); - cl_str_to_boolean(value, &data_set->start_failure_fatal); + set_config_flag(data_set, "start-failure-is-fatal", pe_flag_start_failure_fatal); crm_debug_2("Start failures are %s", - data_set->start_failure_fatal?"always fatal":"handled by failcount"); + is_set(data_set->flags, pe_flag_start_failure_fatal)?"always fatal":"handled by failcount"); return TRUE; } @@ -228,7 +231,7 @@ /* new_node->weight = -INFINITY; */ /* } */ - if(data_set->stonith_enabled == FALSE || unseen_are_unclean == FALSE) { + if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE || unseen_are_unclean == FALSE) { /* blind faith... */ new_node->details->unclean = FALSE; @@ -282,6 +285,10 @@ data_set->resources = g_list_sort( data_set->resources, sort_rsc_priority); + if(is_set(data_set->flags, pe_flag_stonith_enabled) && is_set(data_set->flags, pe_flag_have_stonith_resource) == FALSE) { + crm_config_warn("No STONITH resources have been defined"); + } + return TRUE; } @@ -350,7 +357,7 @@ this_node->details->unclean = TRUE; } - if(this_node->details->online || data_set->stonith_enabled) { + if(this_node->details->online || is_set(data_set->flags, pe_flag_stonith_enabled)) { /* offline nodes run no resources... * unless stonith is enabled in which case we need to * make sure rsc start events happen after the stonith @@ -519,7 +526,7 @@ this_node->details->expected_up = FALSE; } - if(data_set->stonith_enabled == FALSE) { + if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE) { online = determine_online_status_no_fencing( node_state, this_node); @@ -731,7 +738,7 @@ rsc_id, node->details->uname); rsc = create_fake_resource(rsc_id, rsc_entry, data_set); - if(data_set->stop_rsc_orphans == FALSE) { + if(is_set(data_set->flags, pe_flag_stop_rsc_orphans) == FALSE) { clear_bit(rsc->flags, pe_rsc_managed); } else { @@ -1348,7 +1355,7 @@ rsc->next_role = RSC_ROLE_STOPPED; rsc->role = RSC_ROLE_SLAVE; - } else if((data_set->start_failure_fatal + } else if((is_set(data_set->flags, pe_flag_start_failure_fatal) || compare_version("2.0", op_version) > 0) && safe_str_eq(task, CRMD_ACTION_START)) { crm_warn("Compatability handling for failed op %s on %s", @@ -1507,7 +1514,7 @@ determine_online_status(node_state, this_node, data_set); - if(this_node->details->online || data_set->stonith_enabled) { + if(this_node->details->online || is_set(data_set->flags, pe_flag_stonith_enabled)) { /* offline nodes run no resources... * unless stonith is enabled in which case we need to * make sure rsc start events happen after the stonith diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/lib/pengine/utils.c new/pacemaker/lib/pengine/utils.c --- old/pacemaker/lib/pengine/utils.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/lib/pengine/utils.c 2008-09-01 10:19:10.000000000 +0200 @@ -577,14 +577,14 @@ crm_debug_3("Action %s requires only stonith", action->uuid); action->runnable = TRUE; #endif - } else if(data_set->have_quorum == FALSE + } else if(is_set(data_set->flags, pe_flag_have_quorum) == FALSE && data_set->no_quorum_policy == no_quorum_stop) { action->runnable = FALSE; crm_debug("%s\t%s (cancelled : quorum)", action->node->details->uname, action->uuid); - } else if(data_set->have_quorum == FALSE + } else if(is_set(data_set->flags, pe_flag_have_quorum) == FALSE && data_set->no_quorum_policy == no_quorum_freeze) { crm_debug_3("Check resource is already active"); if(rsc->fns->active(rsc, TRUE) == FALSE) { @@ -673,7 +673,7 @@ value = "nothing (default)"; } else if(data_set->no_quorum_policy == no_quorum_freeze - && data_set->stonith_enabled) { + && is_set(data_set->flags, pe_flag_stonith_enabled)) { action->needs = rsc_req_stonith; value = "fencing (default)"; @@ -702,7 +702,7 @@ action->on_fail = action_fail_fence; value = "node fencing"; - if(data_set->stonith_enabled == FALSE) { + if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE) { crm_config_err("Specifying on_fail=fence and" " stonith-enabled=false makes no sense"); action->on_fail = action_fail_stop; @@ -736,7 +736,7 @@ /* defaults */ if(value == NULL && safe_str_eq(action->task, CRMD_ACTION_STOP)) { - if(data_set->stonith_enabled) { + if(is_set(data_set->flags, pe_flag_stonith_enabled)) { action->on_fail = action_fail_fence; value = "resource fence (default)"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/allocate.c new/pacemaker/pengine/allocate.c --- old/pacemaker/pengine/allocate.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/allocate.c 2008-09-01 10:19:10.000000000 +0200 @@ -182,7 +182,7 @@ crm_debug_2("Checking parameters for %s", key); op_match = find_rsc_op_entry(rsc, key); - if(op_match == NULL && data_set->stop_action_orphans) { + if(op_match == NULL && is_set(data_set->flags, pe_flag_stop_action_orphans)) { /* create a cancel action */ action_t *cancel = NULL; char *cancel_key = crm_strdup(key); @@ -401,7 +401,7 @@ continue; } crm_debug_2("Processing node %s", node->details->uname); - if(node->details->online || data_set->stonith_enabled) { + if(node->details->online || is_set(data_set->flags, pe_flag_stonith_enabled)) { xml_child_iter_filter( lrm_rscs, rsc_entry, XML_LRM_TAG_RESOURCE, if(xml_has_children(rsc_entry)) { @@ -448,7 +448,7 @@ if(current == NULL) { - } else if(match != NULL || data_set->symmetric_cluster) { + } else if(match != NULL || is_set(data_set->flags, pe_flag_symmetric_cluster)) { resource_t *sticky_rsc = rsc; if(rsc->parent && rsc->parent->variant == pe_group) { sticky_rsc = rsc->parent; @@ -708,8 +708,8 @@ crm_debug_3("Processing fencing and shutdown cases"); - if(data_set->stonith_enabled - && (data_set->have_quorum + if(is_set(data_set->flags, pe_flag_stonith_enabled) + && (is_set(data_set->flags, pe_flag_have_quorum) || data_set->no_quorum_policy == no_quorum_ignore)) { need_stonith = TRUE; } @@ -780,14 +780,14 @@ ); if(integrity_lost) { - if(data_set->have_quorum == FALSE) { + if(is_set(data_set->flags, pe_flag_have_quorum) == FALSE) { crm_notice("Cannot fence unclean nodes until quorum is" " attained (or no_quorum_policy is set to ignore)"); - } else if(data_set->stonith_enabled == FALSE) { + } else if(is_set(data_set->flags, pe_flag_stonith_enabled) == FALSE) { pe_warn("YOUR RESOURCES ARE NOW LIKELY COMPROMISED"); pe_err("ENABLE STONITH TO KEEP YOUR RESOURCES SAFE"); - } + } } if(dc_down != NULL) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/native.c new/pacemaker/pengine/native.c --- old/pacemaker/pengine/native.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/native.c 2008-09-01 10:19:10.000000000 +0200 @@ -1411,7 +1411,7 @@ crm_notice(" %s\tStop %s",current->details->uname,rsc->id); } - if(data_set->remove_after_stop) { + if(is_set(data_set->flags, pe_flag_remove_after_stop)) { DeleteRsc(rsc, current, optional, data_set); } ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/bug-1718.xml new/pacemaker/pengine/testcases/bug-1718.xml --- old/pacemaker/pengine/testcases/bug-1718.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/bug-1718.xml 2008-09-01 10:19:10.000000000 +0200 @@ -3,6 +3,7 @@ <crm_config> <cluster_property_set id="cib-bootstrap-options"> <attributes> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1192999094"/> </attributes> </cluster_property_set> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/date-2.xml new/pacemaker/pengine/testcases/date-2.xml --- old/pacemaker/pengine/testcases/date-2.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/date-2.xml 2008-09-01 10:19:10.000000000 +0200 @@ -13,6 +13,7 @@ </cluster_property_set> <cluster_property_set id="boo" score="1"> <attributes> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> <nvpair name="cluster-delay" id="cib-bootstrap-options-network-delay" value="50s"/> <nvpair name="cluster_recheck_interval" id="cib-bootstrap-options-cluster_recheck_interval" value="60"/> </attributes> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/date-3.xml new/pacemaker/pengine/testcases/date-3.xml --- old/pacemaker/pengine/testcases/date-3.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/date-3.xml 2008-09-01 10:19:10.000000000 +0200 @@ -13,6 +13,7 @@ </cluster_property_set> <cluster_property_set id="boo" score="1"> <attributes> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> <nvpair name="cluster-delay" id="cib-bootstrap-options-network-delay" value="50s"/> <nvpair name="cluster_recheck_interval" id="cib-bootstrap-options-cluster_recheck_interval" value="60"/> </attributes> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/group8.xml new/pacemaker/pengine/testcases/group8.xml --- old/pacemaker/pengine/testcases/group8.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/group8.xml 2008-09-01 10:19:10.000000000 +0200 @@ -4,6 +4,7 @@ <configuration> <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes> <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> </attributes></cluster_property_set></crm_config> <nodes> <node id="uuid1" uname="node1" type="member"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/master-depend.xml new/pacemaker/pengine/testcases/master-depend.xml --- old/pacemaker/pengine/testcases/master-depend.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/master-depend.xml 2008-09-01 10:19:10.000000000 +0200 @@ -3,6 +3,7 @@ <crm_config> <cluster_property_set id="cib-bootstrap-options"> <attributes> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="0.6.4-node: 226d8e35692415c56dbd05258a85905414938ce9"/> <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1214292810"/> </attributes> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/notify-0.xml new/pacemaker/pengine/testcases/notify-0.xml --- old/pacemaker/pengine/testcases/notify-0.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/notify-0.xml 2008-09-01 10:19:10.000000000 +0200 @@ -5,6 +5,7 @@ <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes> <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/> <nvpair id="symmetric_cluster" name="symmetric-cluster" value="false"/> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> </attributes></cluster_property_set></crm_config> <nodes> <node id="uuid1" uname="node1" type="member"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/notify-1.xml new/pacemaker/pengine/testcases/notify-1.xml --- old/pacemaker/pengine/testcases/notify-1.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/notify-1.xml 2008-09-01 10:19:10.000000000 +0200 @@ -5,6 +5,7 @@ <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes> <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/> <nvpair id="symmetric_cluster" name="symmetric_cluster" value="false"/> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> </attributes></cluster_property_set></crm_config> <nodes> <node id="uuid1" uname="node1" type="member"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/notify-2.xml new/pacemaker/pengine/testcases/notify-2.xml --- old/pacemaker/pengine/testcases/notify-2.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/notify-2.xml 2008-09-01 10:19:10.000000000 +0200 @@ -5,6 +5,7 @@ <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes> <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/> <nvpair id="symmetric_cluster" name="symmetric_cluster" value="false"/> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> </attributes></cluster_property_set></crm_config> <nodes> <node id="uuid1" uname="node1" type="member"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/pengine/testcases/order7.xml new/pacemaker/pengine/testcases/order7.xml --- old/pacemaker/pengine/testcases/order7.xml 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/pengine/testcases/order7.xml 2008-09-01 10:19:10.000000000 +0200 @@ -4,6 +4,7 @@ <configuration> <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes> <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/> + <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/> </attributes></cluster_property_set></crm_config> <nodes> <node id="uuid1" uname="node1" type="member"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/tools/crm_mon.c new/pacemaker/tools/crm_mon.c --- old/pacemaker/tools/crm_mon.c 2008-08-30 12:33:29.000000000 +0200 +++ new/pacemaker/tools/crm_mon.c 2008-09-01 10:19:10.000000000 +0200 @@ -932,11 +932,11 @@ fprintf(stream, "<tr><td>Default resource stickiness</td><td>:</td><td>%d</td></tr>\n", data_set.default_resource_stickiness); - fprintf(stream, "<tr><td>STONITH of failed nodes</td><td>:</td><td>%s</td></tr>\n", - data_set.stonith_enabled?"enabled":"disabled"); + fprintf(stream, "<tr><td>STONITH of failed nodes</td><td>:</td><td>%s</td></t, pe_flag_\n", + is_set(data_set.flags, pe_flag_stonith_enabled)?"enabled":"disabled"); fprintf(stream, "<tr><td>Cluster is</td><td>:</td><td>%ssymmetric</td></tr>\n", - data_set.symmetric_cluster?"":"a-"); + is_set(data_set.flags, pe_flag_symmetric_cluster)?"":"a-"); fprintf(stream, "<tr><td>No Quorum Policy</td><td>:</td><td>"); switch (data_set.no_quorum_policy) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org