On 8 Jul 2014, at 2:39 am, Ron Kerry <rke...@sgi.com> wrote: > On 7/3/14, 10:23 PM, Andrew Beekhof <and...@beekhof.net> wrote: >> >> Seems to be fixed in the latest 1.1.12 beta: >> >> # tools/crm_verify -x ~/Downloads/cibadmin-Ql.txt -VVV >> notice: update_validation: pacemaker-1.2-style configuration is >> also valid for pacemaker-1.3 >> notice: update_validation: Upgrading pacemaker-1.3-style >> configuration to pacemaker-2.0 with upgrade-1.3.xsl >> notice: update_validation: Transformed the configuration from >> pacemaker-1.2 to pacemaker-2.0 >> notice: unpack_config: On loss of CCM Quorum: Ignore > > I do not think that is a valid test as the problem seems to be only present > in a LIVE crm_verify.
Good point, we need:
diff --git a/tools/crm_verify.c b/tools/crm_verify.c
index b0afb6a..a3f93be 100644
--- a/tools/crm_verify.c
+++ b/tools/crm_verify.c
@@ -240,8 +240,9 @@ main(int argc, char **argv)
set_working_set_defaults(&data_set);
if (cib_object == NULL) {
- } else if (USE_LIVE_CIB) {
+ } else if (status != NULL || USE_LIVE_CIB) {
/* we will always have a status section and can do a full simulation */
+ printf("full calc\n");
do_calculations(&data_set, cib_object, NULL);
cleanup_alloc_calculations(&data_set);
Plus the fix:
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index 5c285b5..7423af1 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -710,7 +709,7 @@ unpack_operation(action_t * action, xmlNode * xml_obj,
resource_t * container,
} else if (is_set(data_set->flags, pe_flag_stonith_enabled)
&& safe_str_eq(value, "fencing")) {
action->needs = rsc_req_stonith;
- if (is_set(data_set->flags, pe_flag_stonith_enabled)) {
+ if (is_not_set(data_set->flags, pe_flag_stonith_enabled)) {
crm_notice("%s requires fencing but fencing is disabled",
action->rsc->id);
}
/* End compatability code */
It doesn't produce those messages.
>
> piranha:~ # crm_verify -L -VVV
> notice: unpack_config: On loss of CCM Quorum: Ignore
> notice: unpack_operation: DMF requires fencing but fencing is disabled
> notice: unpack_operation: CXFS requires fencing but fencing is disabled
> notice: unpack_operation: IP requires fencing but fencing is disabled
> notice: unpack_operation: IP2 requires fencing but fencing is disabled
> notice: unpack_operation: NFS requires fencing but fencing is disabled
> notice: unpack_operation: DMFMAN requires fencing but fencing is disabled
> notice: unpack_operation: OV requires fencing but fencing is disabled
> notice: unpack_operation: CXFS requires fencing but fencing is disabled
> notice: unpack_operation: IP requires fencing but fencing is disabled
> notice: unpack_operation: IP2 requires fencing but fencing is disabled
> notice: unpack_operation: OV requires fencing but fencing is disabled
> notice: unpack_operation: DMF requires fencing but fencing is disabled
> notice: unpack_operation: NFS requires fencing but fencing is disabled
> notice: unpack_operation: DMFMAN requires fencing but fencing is disabled
> notice: unpack_operation: DMFSOAP requires fencing but fencing is disabled
> piranha:~ # cibadmin -Ql > cibadmin.txt
> piranha:~ # crm_verify -x cibadmin.txt -VVV
> notice: unpack_config: On loss of CCM Quorum: Ignore
>
> So, even on this system that exhibits the issue with "-L", it does not
> exhibit the issue from a saved CIB.
>
> --
>
> Ron Kerry rke...@sgi.com
>
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ Pacemaker mailing list: Pacemaker@oss.clusterlabs.org http://oss.clusterlabs.org/mailman/listinfo/pacemaker Project Home: http://www.clusterlabs.org Getting started: http://www.clusterlabs.org/doc/Cluster_from_Scratch.pdf Bugs: http://bugs.clusterlabs.org
