From e6436acd95ac171a40291bd1fb7dbda01dcfd908 Mon Sep 17 00:00:00 2001 From: Grace Chin Date: Wed, 10 Apr 2024 12:10:30 -0400 Subject: [PATCH] debug 1 --- cts/cli/regression.crm_mon.exp | 375 +++++++++++++++-------- cts/cli/regression.feature_set.exp | 22 +- cts/cli/regression.tools.exp | 465 ++++++++++++++++------------- cts/cli/regression.validity.exp | 188 ++---------- lib/pacemaker/pcmk_output.c | 45 ++- lib/pengine/pe_output.c | 3 +- 6 files changed, 574 insertions(+), 524 deletions(-) diff --git a/cts/cli/regression.crm_mon.exp b/cts/cli/regression.crm_mon.exp index 7f2f0248223..1fe46faba37 100644 --- a/cts/cli/regression.crm_mon.exp +++ b/cts/cli/regression.crm_mon.exp @@ -4,12 +4,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Clone Set: ping-clone [ping]: @@ -46,7 +47,7 @@ Active Resources: - + @@ -242,9 +243,12 @@ Active Resources: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output - OK (0) =#=#=#= * Passed: crm_mon - XML output @@ -254,6 +258,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -481,33 +486,34 @@ Active Resources: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output without the node section - OK (0) =#=#=#= * Passed: crm_mon - XML output without the node section =#=#=#= Begin test: Text output with only the node section =#=#=#= -Cluster Summary: - -Node List: - * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] -=#=#=#= End test: Text output with only the node section - OK (0) =#=#=#= -* Passed: crm_mon - Text output with only the node section +(log_assertion_as@utils.c:275) error: text_increment_list: Triggered fatal assertion at output_text.c:250 : tail != NULL +cts/cts-cli: line 152: 1430218 Aborted (core dumped) crm_mon -1 --exclude=all --include=nodes +CIB syntax has errors (for details, run crm_verify -LV) +=#=#=#= End test: Text output with only the node section - Interrupted by signal (134) =#=#=#= +* Failed (rc=134): crm_mon - Text output with only the node section =#=#=#= Begin test: Complete text output =#=#=#= Cluster Summary: * Stack: corosync * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Clone Set: ping-clone [ping]: @@ -596,7 +602,6 @@ Operations: Negative Location Constraints: * not-on-cluster1 prevents dummy from running on cluster01 - * not-on-cluster1 prevents dummy from running on cluster01 =#=#=#= End test: Complete text output - OK (0) =#=#=#= * Passed: crm_mon - Complete text output =#=#=#= Begin test: Complete text output with detail =#=#=#= @@ -605,7 +610,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -614,7 +619,7 @@ Node List: * Node cluster02 (2): online, feature set <3.15.1 * GuestNode httpd-bundle-0@cluster01: online * GuestNode httpd-bundle-1@cluster02: online - * GuestNode httpd-bundle-2@: online + * GuestNode httpd-bundle-2@: OFFLINE Active Resources: * Clone Set: ping-clone [ping]: @@ -722,7 +727,6 @@ Operations: Negative Location Constraints: * not-on-cluster1 prevents dummy from running on cluster01 (1) - * not-on-cluster1 prevents dummy from running on cluster01 (1) =#=#=#= End test: Complete text output with detail - OK (0) =#=#=#= * Passed: crm_mon - Complete text output with detail =#=#=#= Begin test: Complete brief text output =#=#=#= @@ -731,13 +735,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * 1 (ocf:pacemaker:Dummy): Active cluster02 @@ -826,7 +830,6 @@ Operations: Negative Location Constraints: * not-on-cluster1 prevents dummy from running on cluster01 - * not-on-cluster1 prevents dummy from running on cluster01 =#=#=#= End test: Complete brief text output - OK (0) =#=#=#= * Passed: crm_mon - Complete brief text output =#=#=#= Begin test: Complete text output grouped by node =#=#=#= @@ -835,7 +838,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -864,7 +867,7 @@ Node List: * GuestNode httpd-bundle-1: online: * Resources: * httpd (ocf:heartbeat:apache): Started - * GuestNode httpd-bundle-2: online: + * GuestNode httpd-bundle-2: OFFLINE: * Resources: Node Attributes: @@ -936,7 +939,6 @@ Operations: Negative Location Constraints: * not-on-cluster1 prevents dummy from running on cluster01 - * not-on-cluster1 prevents dummy from running on cluster01 =#=#=#= End test: Complete text output grouped by node - OK (0) =#=#=#= * Passed: crm_mon - Complete text output grouped by node =#=#=#= Begin test: Complete brief text output grouped by node =#=#=#= @@ -945,7 +947,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -1046,7 +1048,6 @@ Operations: Negative Location Constraints: * not-on-cluster1 prevents dummy from running on cluster01 - * not-on-cluster1 prevents dummy from running on cluster01 =#=#=#= End test: Complete brief text output grouped by node - OK (0) =#=#=#= * Passed: crm_mon - Complete brief text output grouped by node =#=#=#= Begin test: XML output grouped by node =#=#=#= @@ -1123,7 +1124,7 @@ Negative Location Constraints: - + @@ -1297,9 +1298,12 @@ Negative Location Constraints: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output grouped by node - OK (0) =#=#=#= * Passed: crm_mon - XML output grouped by node @@ -1309,7 +1313,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -1361,7 +1365,6 @@ Operations: Negative Location Constraints: * not-on-cluster1 prevents dummy from running on cluster01 - * not-on-cluster1 prevents dummy from running on cluster01 =#=#=#= End test: Complete text output filtered by node - OK (0) =#=#=#= * Passed: crm_mon - Complete text output filtered by node =#=#=#= Begin test: XML output filtered by node =#=#=#= @@ -1485,9 +1488,12 @@ Negative Location Constraints: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by node - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by node @@ -1497,7 +1503,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -1555,7 +1561,6 @@ Operations: Negative Location Constraints: * not-on-cluster1 prevents dummy from running on cluster01 - * not-on-cluster1 prevents dummy from running on cluster01 =#=#=#= End test: Complete text output filtered by tag - OK (0) =#=#=#= * Passed: crm_mon - Complete text output filtered by tag =#=#=#= Begin test: XML output filtered by tag =#=#=#= @@ -1691,9 +1696,12 @@ Negative Location Constraints: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by tag - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by tag @@ -1703,13 +1711,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Fencing (stonith:fence_xvm): Started cluster01 @@ -1744,7 +1752,7 @@ Operations: - + @@ -1768,7 +1776,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by resource tag - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by resource tag @@ -1778,6 +1790,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -1809,9 +1822,12 @@ Active Resources: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by node that doesn't exist - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by node that doesn't exist @@ -1821,12 +1837,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Full List of Resources: * Clone Set: ping-clone [ping]: @@ -1858,6 +1875,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -1891,13 +1909,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Fencing (stonith:fence_xvm): Started cluster01 @@ -1932,7 +1950,7 @@ Operations: - + @@ -1956,7 +1974,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by primitive resource - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by primitive resource @@ -1966,13 +1988,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Resource Group: exim-group: @@ -2010,7 +2032,7 @@ Operations: - + @@ -2041,7 +2063,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by group resource - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by group resource @@ -2051,13 +2077,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Resource Group: exim-group: @@ -2092,7 +2118,7 @@ Operations: - + @@ -2117,7 +2143,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by group resource member - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by group resource member @@ -2127,13 +2157,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Clone Set: ping-clone [ping]: @@ -2173,7 +2203,7 @@ Operations: - + @@ -2208,7 +2238,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by clone resource - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by clone resource @@ -2218,13 +2252,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Clone Set: ping-clone [ping]: @@ -2264,7 +2298,7 @@ Operations: - + @@ -2299,7 +2333,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by clone resource instance - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by clone resource instance @@ -2309,7 +2347,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -2318,7 +2356,7 @@ Node List: * Node cluster02 (2): online, feature set <3.15.1 * GuestNode httpd-bundle-0@cluster01: online * GuestNode httpd-bundle-1@cluster02: online - * GuestNode httpd-bundle-2@: online + * GuestNode httpd-bundle-2@: OFFLINE Active Resources: * Clone Set: ping-clone [ping]: @@ -2358,7 +2396,7 @@ Operations: - + @@ -2390,7 +2428,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by exact clone resource instance - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by exact clone resource instance @@ -2400,12 +2442,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * No active resources @@ -2427,7 +2470,7 @@ Active Resources: - + @@ -2440,7 +2483,11 @@ Active Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by resource that doesn't exist - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by resource that doesn't exist @@ -2450,12 +2497,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Full List of Resources: * Clone Set: inactive-clone [inactive-dhcpd] (disabled): @@ -2471,12 +2519,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Full List of Resources: * Container bundle set: httpd-bundle [pcmk:http]: @@ -2501,7 +2550,7 @@ Full List of Resources: - + @@ -2590,7 +2639,11 @@ Full List of Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by inactive bundle resource - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by inactive bundle resource @@ -2600,12 +2653,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Full List of Resources: * Container bundle set: httpd-bundle [pcmk:http]: @@ -2629,7 +2683,7 @@ Full List of Resources: - + @@ -2689,7 +2743,11 @@ Full List of Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by bundled IP address resource - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by bundled IP address resource @@ -2699,12 +2757,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Full List of Resources: * Container bundle set: httpd-bundle [pcmk:http]: @@ -2728,7 +2787,7 @@ Full List of Resources: - + @@ -2786,7 +2845,11 @@ Full List of Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by bundled container - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by bundled container @@ -2796,12 +2859,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Full List of Resources: * Container bundle set: httpd-bundle [pcmk:http]: @@ -2825,7 +2889,7 @@ Full List of Resources: - + @@ -2885,7 +2949,11 @@ Full List of Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by bundle connection - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by bundle connection @@ -2895,12 +2963,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Full List of Resources: * Container bundle set: httpd-bundle [pcmk:http]: @@ -2928,7 +2997,7 @@ Full List of Resources: - + @@ -2996,7 +3065,11 @@ Full List of Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output filtered by bundled primitive resource - OK (0) =#=#=#= * Passed: crm_mon - XML output filtered by bundled primitive resource @@ -3006,7 +3079,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -3015,7 +3088,7 @@ Node List: * Node cluster02 (2): online, feature set <3.15.1 * GuestNode httpd-bundle-0@cluster01: online * GuestNode httpd-bundle-1@cluster02: online - * GuestNode httpd-bundle-2@: online + * GuestNode httpd-bundle-2@: OFFLINE Active Resources: * Clone Set: mysql-clone-group [mysql-group]: @@ -3058,7 +3131,7 @@ Operations: - + @@ -3106,7 +3179,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output, filtered by clone name in cloned group - OK (0) =#=#=#= * Passed: crm_mon - XML output, filtered by clone name in cloned group @@ -3116,7 +3193,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -3125,7 +3202,7 @@ Node List: * Node cluster02 (2): online, feature set <3.15.1 * GuestNode httpd-bundle-0@cluster01: online * GuestNode httpd-bundle-1@cluster02: online - * GuestNode httpd-bundle-2@: online + * GuestNode httpd-bundle-2@: OFFLINE Active Resources: * Clone Set: mysql-clone-group [mysql-group]: @@ -3168,7 +3245,7 @@ Operations: - + @@ -3216,7 +3293,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output, filtered by group name in cloned group - OK (0) =#=#=#= * Passed: crm_mon - XML output, filtered by group name in cloned group @@ -3226,7 +3307,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -3235,7 +3316,7 @@ Node List: * Node cluster02 (2): online, feature set <3.15.1 * GuestNode httpd-bundle-0@cluster01: online * GuestNode httpd-bundle-1@cluster02: online - * GuestNode httpd-bundle-2@: online + * GuestNode httpd-bundle-2@: OFFLINE Active Resources: * Clone Set: mysql-clone-group [mysql-group]: @@ -3276,7 +3357,7 @@ Operations: - + @@ -3310,7 +3391,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output, filtered by exact group instance name in cloned group - OK (0) =#=#=#= * Passed: crm_mon - XML output, filtered by exact group instance name in cloned group @@ -3320,7 +3405,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -3329,7 +3414,7 @@ Node List: * Node cluster02 (2): online, feature set <3.15.1 * GuestNode httpd-bundle-0@cluster01: online * GuestNode httpd-bundle-1@cluster02: online - * GuestNode httpd-bundle-2@: online + * GuestNode httpd-bundle-2@: OFFLINE Active Resources: * Clone Set: mysql-clone-group [mysql-group]: @@ -3372,7 +3457,7 @@ Operations: - + @@ -3420,7 +3505,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output, filtered by primitive name in cloned group - OK (0) =#=#=#= * Passed: crm_mon - XML output, filtered by primitive name in cloned group @@ -3430,7 +3519,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -3439,7 +3528,7 @@ Node List: * Node cluster02 (2): online, feature set <3.15.1 * GuestNode httpd-bundle-0@cluster01: online * GuestNode httpd-bundle-1@cluster02: online - * GuestNode httpd-bundle-2@: online + * GuestNode httpd-bundle-2@: OFFLINE Active Resources: * Clone Set: mysql-clone-group [mysql-group]: @@ -3480,7 +3569,7 @@ Operations: - + @@ -3514,7 +3603,11 @@ Operations: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output, filtered by exact primitive instance name in cloned group - OK (0) =#=#=#= * Passed: crm_mon - XML output, filtered by exact primitive instance name in cloned group @@ -3526,6 +3619,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -3704,7 +3798,11 @@ unpack_rsc_op error: Preventing httpd-bundle-clone from restarting on httpd-bun - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output of partially active resources - OK (0) =#=#=#= * Passed: crm_mon - XML output of partially active resources @@ -3716,6 +3814,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -3760,7 +3859,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -3852,6 +3951,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -3873,6 +3973,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -3896,6 +3997,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -3916,6 +4018,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -3941,7 +4044,7 @@ Cluster Summary: * Current DC: cluster02 (2) (version) - partition with quorum * Last updated: * Last change: - * CIB syntax is valid + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -4036,6 +4139,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 16 resource instances configured (1 DISABLED) @@ -4124,7 +4228,11 @@ unpack_rsc_op error: Preventing httpd-bundle-clone from restarting on httpd-bun - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: Text output of partially active resources, filtered by node - OK (0) =#=#=#= * Passed: crm_mon - Text output of partially active resources, filtered by node @@ -4134,6 +4242,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 2 nodes configured * 3 resource instances configured @@ -4188,7 +4297,11 @@ Active Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output of active unmanaged resource on offline node - OK (0) =#=#=#= * Passed: crm_mon - XML output of active unmanaged resource on offline node @@ -4198,6 +4311,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 2 nodes configured * 3 resource instances configured @@ -4220,6 +4334,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 2 nodes configured * 3 resource instances configured @@ -4242,6 +4357,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -4297,7 +4413,7 @@ Full List of Resources: - + @@ -4493,9 +4609,12 @@ Full List of Resources: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output of all resources with maintenance-mode enabled - OK (0) =#=#=#= * Passed: crm_mon - XML output of all resources with maintenance-mode enabled @@ -4505,6 +4624,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -4512,7 +4632,7 @@ Node List: * Node cluster02: maintenance * GuestNode httpd-bundle-1: maintenance * Online: [ cluster01 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 ] Full List of Resources: * Clone Set: ping-clone [ping]: @@ -4557,7 +4677,7 @@ Full List of Resources: - + @@ -4754,9 +4874,12 @@ Full List of Resources: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output of all resources with maintenance enabled for a node - OK (0) =#=#=#= * Passed: crm_mon - XML output of all resources with maintenance enabled for a node @@ -4766,6 +4889,7 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) @@ -4818,7 +4942,7 @@ Full List of Resources: - + @@ -5014,9 +5138,12 @@ Full List of Resources: - - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output of all resources with maintenance meta attribute true - OK (0) =#=#=#= * Passed: crm_mon - XML output of all resources with maintenance meta attribute true @@ -5026,6 +5153,7 @@ Cluster Summary: * Current DC: cent7-host2 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 10 resource instances configured @@ -5050,6 +5178,7 @@ Cluster Summary: * Current DC: cent7-host2 (3232262829) (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 4 nodes configured * 10 resource instances configured diff --git a/cts/cli/regression.feature_set.exp b/cts/cli/regression.feature_set.exp index a0428736392..092a9f91eb1 100644 --- a/cts/cli/regression.feature_set.exp +++ b/cts/cli/regression.feature_set.exp @@ -53,6 +53,7 @@ Cluster Summary: * Current DC: cluster01 (1) (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 4 resource instances configured @@ -60,7 +61,7 @@ Node List: * Node cluster01 (1): online, feature set 3.15.1 * Node cluster02 (2): online, feature set 3.15.1 * Node cluster03 (3): OFFLINE - * GuestNode guest01-0@: online + * GuestNode guest01-0@: OFFLINE * RemoteNode remote01 (4): OFFLINE Active Resources: @@ -82,7 +83,7 @@ Active Resources: - + @@ -96,7 +97,11 @@ Active Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output, no mixed status - OK (0) =#=#=#= * Passed: crm_mon - XML output, no mixed status @@ -152,6 +157,7 @@ Cluster Summary: * Current DC: cluster01 (1) (version) - MIXED-VERSION partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 4 resource instances configured @@ -159,7 +165,7 @@ Node List: * Node cluster01 (1): online, feature set 3.15.1 * Node cluster02 (2): online, feature set 3.15.0 * Node cluster03 (3): OFFLINE - * GuestNode guest01-0@: online + * GuestNode guest01-0@: OFFLINE * RemoteNode remote01 (4): OFFLINE Active Resources: @@ -181,7 +187,7 @@ Active Resources: - + @@ -195,7 +201,11 @@ Active Resources: - + + + This tool can only check complete configurations (i.e. those starting with <cib>). + + =#=#=#= End test: XML output, mixed status - OK (0) =#=#=#= * Passed: crm_mon - XML output, mixed status diff --git a/cts/cli/regression.tools.exp b/cts/cli/regression.tools.exp index 15c43ad4166..e8b5a636235 100644 --- a/cts/cli/regression.tools.exp +++ b/cts/cli/regression.tools.exp @@ -337,9 +337,7 @@ unpack_resources error: Either configure some or disable STONITH with the stoni unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity pcmk__verify error: CIB did not pass schema validation Current cluster status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Full List of Resources: * No resources @@ -351,9 +349,7 @@ Transition Summary: Executing Cluster Transition: Revised Cluster Status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 ] @@ -606,9 +602,7 @@ unpack_resources error: Either configure some or disable STONITH with the stoni unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity pcmk__verify error: CIB did not pass schema validation Current cluster status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 ] @@ -1958,8 +1952,7 @@ Error performing operation: No such object * Passed: cibadmin - Create a fencing resource =#=#=#= Begin test: Bring resources online =#=#=#= Current cluster status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 ] @@ -1972,18 +1965,21 @@ Transition Summary: * Start Fence ( node1 ) Executing Cluster Transition: + * Resource action: dummy monitor on node1 + * Resource action: Fence monitor on node1 + * Resource action: dummy start on node1 + * Resource action: Fence start on node1 Revised Cluster Status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 ] * Full List of Resources: - * dummy (ocf:pacemaker:Dummy): Stopped - * Fence (stonith:fence_true): Stopped + * dummy (ocf:pacemaker:Dummy): Started node1 + * Fence (stonith:fence_true): Started node1 =#=#=#= Current cib after: Bring resources online =#=#=#= - + @@ -2019,14 +2015,25 @@ Revised Cluster Status: + + + + + + + + + + =#=#=#= End test: Bring resources online - OK (0) =#=#=#= * Passed: crm_simulate - Bring resources online =#=#=#= Begin test: Try to move a resource to its existing location =#=#=#= +crm_resource: Error performing operation: Requested item already exists =#=#=#= Current cib after: Try to move a resource to its existing location =#=#=#= - + @@ -2055,28 +2062,37 @@ Revised Cluster Status: - - - + + + + + + + + + + + -=#=#=#= End test: Try to move a resource to its existing location - OK (0) =#=#=#= -* Failed (rc=000): crm_resource - Try to move a resource to its existing location +=#=#=#= End test: Try to move a resource to its existing location - Requested item already exists (108) =#=#=#= +* Passed: crm_resource - Try to move a resource to its existing location =#=#=#= Begin test: Try to move a resource that doesn't exist =#=#=#= crm_resource: Resource 'xyz' not found Error performing operation: No such object =#=#=#= End test: Try to move a resource that doesn't exist - No such object (105) =#=#=#= * Passed: crm_resource - Try to move a resource that doesn't exist =#=#=#= Begin test: Move a resource from its existing location =#=#=#= -crm_resource: Resource 'dummy' not moved: active in 0 locations. -To prevent 'dummy' from running on a specific location, specify a node. +WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score of -INFINITY for resource dummy on node1. + This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool. + This will be the case even if node1 is the last node in the cluster =#=#=#= Current cib after: Move a resource from its existing location =#=#=#= @@ -2108,7 +2124,7 @@ To prevent 'dummy' from running on a specific location, specify a node. - + @@ -2116,13 +2132,23 @@ To prevent 'dummy' from running on a specific location, specify a node. + + + + + + + + + + -=#=#=#= End test: Move a resource from its existing location - Incorrect usage (64) =#=#=#= -* Failed (rc=064): crm_resource - Move a resource from its existing location +=#=#=#= End test: Move a resource from its existing location - OK (0) =#=#=#= +* Passed: crm_resource - Move a resource from its existing location =#=#=#= Begin test: Clear out constraints generated by --move =#=#=#= -Removing constraint: cli-prefer-dummy +Removing constraint: cli-ban-dummy-on-node1 =#=#=#= Current cib after: Clear out constraints generated by --move =#=#=#= @@ -2160,6 +2186,16 @@ Removing constraint: cli-prefer-dummy + + + + + + + + + + @@ -2204,6 +2240,16 @@ false + + + + + + + + + + @@ -2247,6 +2293,16 @@ false + + + + + + + + + + @@ -2294,6 +2350,16 @@ false + + + + + + + + + + @@ -2340,6 +2406,16 @@ false + + + + + + + + + + @@ -2386,6 +2462,16 @@ false + + + + + + + + + + @@ -2433,6 +2519,16 @@ true + + + + + + + + + + @@ -2479,6 +2575,16 @@ true + + + + + + + + + + @@ -2525,6 +2631,16 @@ true + + + + + + + + + + @@ -2573,6 +2689,16 @@ Error performing operation: No such object + + + + + + + + + + @@ -2583,36 +2709,31 @@ Error performing operation: No such object * Passed: crm_resource - Ban a resource on unknown node =#=#=#= Begin test: Create two more nodes and bring them online =#=#=#= Current cluster status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 ] * Full List of Resources: - * dummy (ocf:pacemaker:Dummy): Stopped - * Fence (stonith:fence_true): Stopped + * dummy (ocf:pacemaker:Dummy): Started node1 + * Fence (stonith:fence_true): Started node1 Performing Requested Modifications: * Bringing node node2 online * Bringing node node3 online Transition Summary: - * Start dummy ( node1 ) - * Start Fence ( node2 ) + * Move Fence ( node1 -> node2 ) Executing Cluster Transition: * Resource action: dummy monitor on node3 * Resource action: dummy monitor on node2 - * Resource action: dummy monitor on node1 + * Resource action: Fence stop on node1 * Resource action: Fence monitor on node3 * Resource action: Fence monitor on node2 - * Resource action: Fence monitor on node1 - * Resource action: dummy start on node1 * Resource action: Fence start on node2 Revised Cluster Status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 node2 node3 ] @@ -2620,7 +2741,7 @@ Revised Cluster Status: * dummy (ocf:pacemaker:Dummy): Started node1 * Fence (stonith:fence_true): Started node2 =#=#=#= Current cib after: Create two more nodes and bring them online =#=#=#= - + @@ -2664,7 +2785,7 @@ Revised Cluster Status: - + @@ -2751,7 +2872,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score - + @@ -2848,7 +2969,7 @@ Locations: - + @@ -2886,8 +3007,7 @@ Locations: * Passed: crm_resource - Ban dummy from node2 =#=#=#= Begin test: Relocate resources due to ban =#=#=#= Current cluster status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 node2 node3 ] @@ -2899,18 +3019,19 @@ Transition Summary: * Move dummy ( node1 -> node3 ) Executing Cluster Transition: + * Resource action: dummy stop on node1 + * Resource action: dummy start on node3 Revised Cluster Status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ node1 node2 node3 ] * Full List of Resources: - * dummy (ocf:pacemaker:Dummy): Started node1 + * dummy (ocf:pacemaker:Dummy): Started node3 * Fence (stonith:fence_true): Started node2 =#=#=#= Current cib after: Relocate resources due to ban =#=#=#= - + @@ -2954,10 +3075,10 @@ Revised Cluster Status: - + - + @@ -2981,7 +3102,7 @@ Revised Cluster Status: - + @@ -2995,14 +3116,10 @@ Revised Cluster Status: * Passed: crm_simulate - Relocate resources due to ban =#=#=#= Begin test: Move dummy to node1 =#=#=#= - - - crm_resource: Error performing operation: Requested item already exists - - + =#=#=#= Current cib after: Move dummy to node1 =#=#=#= - + @@ -3034,8 +3151,8 @@ Revised Cluster Status: - + @@ -3046,10 +3163,10 @@ Revised Cluster Status: - + - + @@ -3073,7 +3190,7 @@ Revised Cluster Status: - + @@ -3083,12 +3200,12 @@ Revised Cluster Status: -=#=#=#= End test: Move dummy to node1 - Requested item already exists (108) =#=#=#= -* Failed (rc=108): crm_resource - Move dummy to node1 +=#=#=#= End test: Move dummy to node1 - OK (0) =#=#=#= +* Passed: crm_resource - Move dummy to node1 =#=#=#= Begin test: Clear implicit constraints for dummy on node2 =#=#=#= Removing constraint: cli-ban-dummy-on-node2 =#=#=#= Current cib after: Clear implicit constraints for dummy on node2 =#=#=#= - + @@ -3120,7 +3237,7 @@ Removing constraint: cli-ban-dummy-on-node2 - + @@ -3131,10 +3248,10 @@ Removing constraint: cli-ban-dummy-on-node2 - + - + @@ -3158,7 +3275,7 @@ Removing constraint: cli-ban-dummy-on-node2 - + @@ -3180,7 +3297,7 @@ Removing constraint: cli-ban-dummy-on-node2 Performing update of 'is-managed' on 'test-clone', the parent of 'test-primitive' Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone-meta_attributes name=is-managed value=false =#=#=#= Current cib after: Create a resource meta attribute =#=#=#= - + @@ -3218,7 +3335,7 @@ Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone - + @@ -3228,7 +3345,7 @@ Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone =#=#=#= Begin test: Create a resource meta attribute in the primitive =#=#=#= Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=test-primitive-meta_attributes name=is-managed value=false =#=#=#= Current cib after: Create a resource meta attribute in the primitive =#=#=#= - + @@ -3270,7 +3387,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=te - + @@ -3285,7 +3402,7 @@ Multiple attributes match name=is-managed A value for 'is-managed' already exists in child 'test-primitive', performing update on that instead of 'test-clone' Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed value=true =#=#=#= Current cib after: Update resource meta attribute with duplicates =#=#=#= - + @@ -3327,7 +3444,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=i - + @@ -3337,7 +3454,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=i =#=#=#= Begin test: Update resource meta attribute with duplicates (force clone) =#=#=#= Set 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-managed value=true =#=#=#= Current cib after: Update resource meta attribute with duplicates (force clone) =#=#=#= - + @@ -3379,7 +3496,7 @@ Set 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-manage - + @@ -3393,7 +3510,7 @@ Multiple attributes match name=is-managed Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed value=false =#=#=#= Current cib after: Update child resource meta attribute with duplicates =#=#=#= - + @@ -3435,7 +3552,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=i - + @@ -3450,7 +3567,7 @@ Multiple attributes match name=is-managed A value for 'is-managed' already exists in child 'test-primitive', performing delete on that instead of 'test-clone' Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed =#=#=#= Current cib after: Delete resource meta attribute with duplicates =#=#=#= - + @@ -3490,7 +3607,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na - + @@ -3501,7 +3618,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na Performing delete of 'is-managed' on 'test-clone', the parent of 'test-primitive' Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-managed =#=#=#= Current cib after: Delete resource meta attribute in parent =#=#=#= - + @@ -3539,7 +3656,7 @@ Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-ma - + @@ -3549,7 +3666,7 @@ Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-ma =#=#=#= Begin test: Create a resource meta attribute in the primitive =#=#=#= Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=test-primitive-meta_attributes name=is-managed value=false =#=#=#= Current cib after: Create a resource meta attribute in the primitive =#=#=#= - + @@ -3589,7 +3706,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=te - + @@ -3600,7 +3717,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed set=te A value for 'is-managed' already exists in child 'test-primitive', performing update on that instead of 'test-clone' Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed value=true =#=#=#= Current cib after: Update existing resource meta attribute =#=#=#= - + @@ -3640,7 +3757,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=i - + @@ -3650,7 +3767,7 @@ Set 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=i =#=#=#= Begin test: Create a resource meta attribute in the parent =#=#=#= Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone-meta_attributes name=is-managed value=true =#=#=#= Current cib after: Create a resource meta attribute in the parent =#=#=#= - + @@ -3692,7 +3809,7 @@ Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone - + @@ -3705,7 +3822,7 @@ Set 'test-clone' option: id=test-clone-meta_attributes-is-managed set=test-clone =#=#=#= Begin test: Delete resource parent meta attribute (force) =#=#=#= Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-managed =#=#=#= Current cib after: Delete resource parent meta attribute (force) =#=#=#= - + @@ -3745,7 +3862,7 @@ Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-ma - + @@ -3754,7 +3871,7 @@ Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-ma * Passed: crm_resource - Delete resource parent meta attribute (force) =#=#=#= Begin test: Restore duplicates =#=#=#= =#=#=#= Current cib after: Restore duplicates =#=#=#= - + @@ -3796,7 +3913,7 @@ Deleted 'test-clone' option: id=test-clone-meta_attributes-is-managed name=is-ma - + @@ -3810,7 +3927,7 @@ Multiple attributes match name=is-managed Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed name=is-managed =#=#=#= Current cib after: Delete resource child meta attribute =#=#=#= - + @@ -3850,7 +3967,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na - + @@ -3859,7 +3976,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na * Passed: crm_resource - Delete resource child meta attribute =#=#=#= Begin test: Create the dummy-group resource group =#=#=#= =#=#=#= Current cib after: Create the dummy-group resource group =#=#=#= - + @@ -3903,7 +4020,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na - + @@ -3913,7 +4030,7 @@ Deleted 'test-primitive' option: id=test-primitive-meta_attributes-is-managed na =#=#=#= Begin test: Create a resource meta attribute in dummy1 =#=#=#= Set 'dummy1' option: id=dummy1-meta_attributes-is-managed set=dummy1-meta_attributes name=is-managed value=true =#=#=#= Current cib after: Create a resource meta attribute in dummy1 =#=#=#= - + @@ -3961,7 +4078,7 @@ Set 'dummy1' option: id=dummy1-meta_attributes-is-managed set=dummy1-meta_attrib - + @@ -3972,7 +4089,7 @@ Set 'dummy1' option: id=dummy1-meta_attributes-is-managed set=dummy1-meta_attrib Set 'dummy1' option: id=dummy1-meta_attributes-is-managed name=is-managed value=false Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-group-meta_attributes name=is-managed value=false =#=#=#= Current cib after: Create a resource meta attribute in dummy-group =#=#=#= - + @@ -4023,7 +4140,7 @@ Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-gr - + @@ -4032,7 +4149,7 @@ Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-gr * Passed: crm_resource - Create a resource meta attribute in dummy-group =#=#=#= Begin test: Delete the dummy-group resource group =#=#=#= =#=#=#= Current cib after: Delete the dummy-group resource group =#=#=#= - + @@ -4072,7 +4189,7 @@ Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-gr - + @@ -4082,7 +4199,7 @@ Set 'dummy-group' option: id=dummy-group-meta_attributes-is-managed set=dummy-gr =#=#=#= Begin test: Specify a lifetime when moving a resource =#=#=#= Migration will take effect until: =#=#=#= Current cib after: Specify a lifetime when moving a resource =#=#=#= - + @@ -4122,7 +4239,6 @@ Migration will take effect until: - @@ -4137,7 +4253,7 @@ Migration will take effect until: * Passed: crm_resource - Specify a lifetime when moving a resource =#=#=#= Begin test: Try to move a resource previously moved with a lifetime =#=#=#= =#=#=#= Current cib after: Try to move a resource previously moved with a lifetime =#=#=#= - + @@ -4190,7 +4306,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score This will prevent dummy from running on node1 until the constraint is removed using the clear option or by editing the CIB with an appropriate tool. This will be the case even if node1 is the last node in the cluster =#=#=#= Current cib after: Ban dummy from node1 for a short time =#=#=#= - + @@ -4246,7 +4362,7 @@ WARNING: Creating rsc_location constraint 'cli-ban-dummy-on-node1' with a score =#=#=#= Begin test: Remove expired constraints =#=#=#= Removing constraint: cli-ban-dummy-on-node1 =#=#=#= Current cib after: Remove expired constraints =#=#=#= - + @@ -4296,7 +4412,7 @@ Removing constraint: cli-ban-dummy-on-node1 =#=#=#= Begin test: Clear all implicit constraints for dummy =#=#=#= Removing constraint: cli-prefer-dummy =#=#=#= Current cib after: Clear all implicit constraints for dummy =#=#=#= - + @@ -4343,7 +4459,7 @@ Removing constraint: cli-prefer-dummy * Passed: crm_resource - Clear all implicit constraints for dummy =#=#=#= Begin test: Set a node health strategy =#=#=#= =#=#=#= Current cib after: Set a node health strategy =#=#=#= - + @@ -4391,7 +4507,7 @@ Removing constraint: cli-prefer-dummy * Passed: crm_attribute - Set a node health strategy =#=#=#= Begin test: Set a node health attribute =#=#=#= =#=#=#= Current cib after: Set a node health attribute =#=#=#= - + @@ -4452,7 +4568,7 @@ Removing constraint: cli-prefer-dummy * Passed: crm_resource - Show why a resource is not running on an unhealthy node =#=#=#= Begin test: Delete a resource =#=#=#= =#=#=#= Current cib after: Delete a resource =#=#=#= - + @@ -5270,7 +5386,6 @@ export overcloud-rabbit-2=overcloud-rabbit-2 =#=#=#= Begin test: Show allocation scores with crm_simulate =#=#=#= - @@ -5378,6 +5493,8 @@ export overcloud-rabbit-2=overcloud-rabbit-2 + + @@ -5570,36 +5687,6 @@ export overcloud-rabbit-2=overcloud-rabbit-2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5607,14 +5694,30 @@ export overcloud-rabbit-2=overcloud-rabbit-2 -/tmp/cts-cli.ta_outfile.qPkR4CJfAb:1: element pacemaker-result: Relax-NG validity error : Expecting element status, got cluster_status -/tmp/cts-cli.ta_outfile.qPkR4CJfAb:1: element pacemaker-result: Relax-NG validity error : Element pacemaker-result failed to validate content -/tmp/cts-cli.ta_outfile.qPkR4CJfAb fails to validate -=#=#=#= End test: Show allocation scores with crm_simulate - Failed to validate (3) =#=#=#= -* Failed (rc=003): crm_simulate - Show allocation scores with crm_simulate +=#=#=#= End test: Show allocation scores with crm_simulate - OK (0) =#=#=#= +* Passed: crm_simulate - Show allocation scores with crm_simulate =#=#=#= Begin test: Show utilization with crm_simulate =#=#=#= 4 of 32 resource instances DISABLED and 0 BLOCKED from further action due to failure +CIB syntax has errors (for details, run crm_verify -LV) +[ cluster01 cluster02 ] +[ httpd-bundle-0 httpd-bundle-1 ] + +Started: [ cluster01 cluster02 ] +Fencing (stonith:fence_xvm): Started cluster01 +dummy (ocf:pacemaker:Dummy): Started cluster02 +Stopped (disabled): [ cluster01 cluster02 ] +inactive-dummy-1 (ocf:pacemaker:Dummy): Stopped (disabled) +inactive-dummy-2 (ocf:pacemaker:Dummy): Stopped (disabled) +httpd-bundle-0 (192.168.122.131) (ocf:heartbeat:apache): Started cluster01 +httpd-bundle-1 (192.168.122.132) (ocf:heartbeat:apache): Started cluster02 +httpd-bundle-2 (192.168.122.133) (ocf:heartbeat:apache): Stopped +Public-IP (ocf:heartbeat:IPaddr): Started cluster02 +Email (lsb:exim): Started cluster02 +Started: [ cluster01 cluster02 ] +Promoted: [ cluster02 ] +Unpromoted: [ cluster01 ] + Only 'private' parameters to 60s-interval monitor for dummy on cluster02 changed: 0:0;16:2:0:4a9e64d6-e1dd-4395-917c-1596312eafe4 Original: cluster01 capacity: Original: cluster02 capacity: @@ -5647,36 +5750,6 @@ Remaining: httpd-bundle-0 capacity: Remaining: httpd-bundle-1 capacity: Remaining: httpd-bundle-2 capacity: -[ cluster01 cluster02 ] -[ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] - -Started: [ cluster01 cluster02 ] -Fencing (stonith:fence_xvm): Started cluster01 -dummy (ocf:pacemaker:Dummy): Started cluster02 -Stopped (disabled): [ cluster01 cluster02 ] -inactive-dummy-1 (ocf:pacemaker:Dummy): Stopped (disabled) -inactive-dummy-2 (ocf:pacemaker:Dummy): Stopped (disabled) -httpd-bundle-0 (192.168.122.131) (ocf:heartbeat:apache): Started cluster01 -httpd-bundle-1 (192.168.122.132) (ocf:heartbeat:apache): Started cluster02 -httpd-bundle-2 (192.168.122.133) (ocf:heartbeat:apache): Stopped -Public-IP (ocf:heartbeat:IPaddr): Started cluster02 -Email (lsb:exim): Started cluster02 -Started: [ cluster01 cluster02 ] -Promoted: [ cluster02 ] -Unpromoted: [ cluster01 ] - -Only 'private' parameters to 60s-interval monitor for dummy on cluster02 changed: 0:0;16:2:0:4a9e64d6-e1dd-4395-917c-1596312eafe4 -Original: cluster01 capacity: -Original: cluster02 capacity: -Original: httpd-bundle-0 capacity: -Original: httpd-bundle-1 capacity: -Original: httpd-bundle-2 capacity: -Remaining: cluster01 capacity: -Remaining: cluster02 capacity: -Remaining: httpd-bundle-0 capacity: -Remaining: httpd-bundle-1 capacity: -Remaining: httpd-bundle-2 capacity: - Start httpd-bundle-2 ( cluster01 ) due to unrunnable httpd-bundle-docker-2 start (blocked) Start httpd:2 ( httpd-bundle-2 ) due to unrunnable httpd-bundle-docker-2 start (blocked) =#=#=#= End test: Show utilization with crm_simulate - OK (0) =#=#=#= @@ -5685,12 +5758,10 @@ Start httpd:2 ( httpd-bundle-2 ) due to unrunnable httpd-bundle 4 of 32 resource instances DISABLED and 0 BLOCKED from further action due to failure Current cluster status: - * Cluster Summary: -Only 'private' parameters to 60s-interval monitor for dummy on cluster02 changed: 0:0;16:2:0:4a9e64d6-e1dd-4395-917c-1596312eafe4 - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] * Full List of Resources: * Clone Set: ping-clone [ping]: @@ -5740,11 +5811,10 @@ Executing Cluster Transition: * Pseudo action: httpd-bundle_running_0 Revised Cluster Status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] * Full List of Resources: * Clone Set: ping-clone [ping]: @@ -5774,12 +5844,10 @@ Revised Cluster Status: 4 of 32 resource instances DISABLED and 0 BLOCKED from further action due to failure Current cluster status: - * Cluster Summary: -Only 'private' parameters to 60s-interval monitor for dummy on cluster02 changed: 0:0;16:2:0:4a9e64d6-e1dd-4395-917c-1596312eafe4 - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] * Full List of Resources: * Clone Set: ping-clone [ping]: @@ -5830,12 +5898,11 @@ Executing Cluster Transition: * Pseudo action: httpd-bundle_running_0 Revised Cluster Status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ cluster02 ] * OFFLINE: [ cluster01 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-1 ] * Full List of Resources: * Clone Set: ping-clone [ping]: @@ -5867,12 +5934,10 @@ Revised Cluster Status: 4 of 32 resource instances DISABLED and 0 BLOCKED from further action due to failure Current cluster status: - * Cluster Summary: -Only 'private' parameters to 60s-interval monitor for dummy on cluster02 changed: 0:0;16:2:0:4a9e64d6-e1dd-4395-917c-1596312eafe4 - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] * Full List of Resources: * Clone Set: ping-clone [ping]: @@ -5956,12 +6021,11 @@ Executing Cluster Transition: * Pseudo action: httpd-bundle_running_0 Revised Cluster Status: - * Cluster Summary: - + * CIB syntax has errors (for details, run crm_verify -LV) * Node List: * Online: [ cluster01 ] * OFFLINE: [ cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 ] * Full List of Resources: * Clone Set: ping-clone [ping]: @@ -6185,12 +6249,13 @@ Cluster Summary: * Current DC: cluster02 (version) - partition with quorum * Last updated: * Last change: + * CIB syntax has errors (for details, run crm_verify -LV) * 5 nodes configured * 32 resource instances configured (4 DISABLED) Node List: * Online: [ cluster01 cluster02 ] - * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 httpd-bundle-2 ] + * GuestOnline: [ httpd-bundle-0 httpd-bundle-1 ] Active Resources: * Clone Set: ping-clone [ping]: diff --git a/cts/cli/regression.validity.exp b/cts/cli/regression.validity.exp index 939e32b8b13..c6bac9956cb 100644 --- a/cts/cli/regression.validity.exp +++ b/cts/cli/regression.validity.exp @@ -350,166 +350,26 @@ update_validation info: Transformed the configuration from pacemaker-1.2 to pac unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity -update_validation debug: Testing 'pacemaker-1.2' validation (1 of X) -update_validation debug: pacemaker-1.2-style configuration is also valid for pacemaker-1.3 -update_validation debug: Testing 'pacemaker-1.3' validation (2 of X) -update_validation debug: Configuration valid for schema: pacemaker-1.3 -update_validation debug: pacemaker-1.3-style configuration is also valid for pacemaker-2.0 -update_validation debug: Testing 'pacemaker-2.0' validation (3 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.0 -update_validation debug: pacemaker-2.0-style configuration is also valid for pacemaker-2.1 -update_validation debug: Testing 'pacemaker-2.1' validation (4 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.1 -update_validation debug: pacemaker-2.1-style configuration is also valid for pacemaker-2.2 -update_validation debug: Testing 'pacemaker-2.2' validation (5 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.2 -update_validation debug: pacemaker-2.2-style configuration is also valid for pacemaker-2.3 -update_validation debug: Testing 'pacemaker-2.3' validation (6 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.3 -update_validation debug: pacemaker-2.3-style configuration is also valid for pacemaker-2.4 -update_validation debug: Testing 'pacemaker-2.4' validation (7 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.4 -update_validation debug: pacemaker-2.4-style configuration is also valid for pacemaker-2.5 -update_validation debug: Testing 'pacemaker-2.5' validation (8 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.5 -update_validation debug: pacemaker-2.5-style configuration is also valid for pacemaker-2.6 -update_validation debug: Testing 'pacemaker-2.6' validation (9 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.6 -update_validation debug: pacemaker-2.6-style configuration is also valid for pacemaker-2.7 -update_validation debug: Testing 'pacemaker-2.7' validation (10 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.7 -update_validation debug: pacemaker-2.7-style configuration is also valid for pacemaker-2.8 -update_validation debug: Testing 'pacemaker-2.8' validation (11 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.8 -update_validation debug: pacemaker-2.8-style configuration is also valid for pacemaker-2.9 -update_validation debug: Testing 'pacemaker-2.9' validation (12 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.9 -update_validation debug: pacemaker-2.9-style configuration is also valid for pacemaker-2.10 -update_validation debug: Testing 'pacemaker-2.10' validation (13 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.10 -update_validation debug: pacemaker-2.10-style configuration is also valid for pacemaker-3.0 -update_validation debug: Testing 'pacemaker-3.0' validation (14 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.0 -update_validation debug: pacemaker-3.0-style configuration is also valid for pacemaker-3.1 -update_validation debug: Testing 'pacemaker-3.1' validation (15 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.1 -update_validation debug: pacemaker-3.1-style configuration is also valid for pacemaker-3.2 -update_validation debug: Testing 'pacemaker-3.2' validation (16 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.2 -update_validation debug: pacemaker-3.2-style configuration is also valid for pacemaker-3.3 -update_validation debug: Testing 'pacemaker-3.3' validation (17 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.3 -update_validation debug: pacemaker-3.3-style configuration is also valid for pacemaker-3.4 -update_validation debug: Testing 'pacemaker-3.4' validation (18 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.4 -update_validation debug: pacemaker-3.4-style configuration is also valid for pacemaker-3.5 -update_validation debug: Testing 'pacemaker-3.5' validation (19 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.5 -update_validation debug: pacemaker-3.5-style configuration is also valid for pacemaker-3.6 -update_validation debug: Testing 'pacemaker-3.6' validation (20 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.6 -update_validation debug: pacemaker-3.6-style configuration is also valid for pacemaker-3.7 -update_validation debug: Testing 'pacemaker-3.7' validation (21 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.7 -update_validation debug: pacemaker-3.7-style configuration is also valid for pacemaker-3.8 -update_validation debug: Testing 'pacemaker-3.8' validation (22 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.8 -update_validation debug: pacemaker-3.8-style configuration is also valid for pacemaker-3.9 -update_validation debug: Testing 'pacemaker-3.9' validation (23 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.9 -update_validation trace: Stopping at pacemaker-3.9 -update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.9 pcmk__verify error: CIB did not pass schema validation unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity -update_validation debug: Testing 'pacemaker-1.2' validation (1 of X) -update_validation debug: pacemaker-1.2-style configuration is also valid for pacemaker-1.3 -update_validation debug: Testing 'pacemaker-1.3' validation (2 of X) -update_validation debug: Configuration valid for schema: pacemaker-1.3 -update_validation debug: pacemaker-1.3-style configuration is also valid for pacemaker-2.0 -update_validation debug: Testing 'pacemaker-2.0' validation (3 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.0 -update_validation debug: pacemaker-2.0-style configuration is also valid for pacemaker-2.1 -update_validation debug: Testing 'pacemaker-2.1' validation (4 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.1 -update_validation debug: pacemaker-2.1-style configuration is also valid for pacemaker-2.2 -update_validation debug: Testing 'pacemaker-2.2' validation (5 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.2 -update_validation debug: pacemaker-2.2-style configuration is also valid for pacemaker-2.3 -update_validation debug: Testing 'pacemaker-2.3' validation (6 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.3 -update_validation debug: pacemaker-2.3-style configuration is also valid for pacemaker-2.4 -update_validation debug: Testing 'pacemaker-2.4' validation (7 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.4 -update_validation debug: pacemaker-2.4-style configuration is also valid for pacemaker-2.5 -update_validation debug: Testing 'pacemaker-2.5' validation (8 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.5 -update_validation debug: pacemaker-2.5-style configuration is also valid for pacemaker-2.6 -update_validation debug: Testing 'pacemaker-2.6' validation (9 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.6 -update_validation debug: pacemaker-2.6-style configuration is also valid for pacemaker-2.7 -update_validation debug: Testing 'pacemaker-2.7' validation (10 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.7 -update_validation debug: pacemaker-2.7-style configuration is also valid for pacemaker-2.8 -update_validation debug: Testing 'pacemaker-2.8' validation (11 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.8 -update_validation debug: pacemaker-2.8-style configuration is also valid for pacemaker-2.9 -update_validation debug: Testing 'pacemaker-2.9' validation (12 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.9 -update_validation debug: pacemaker-2.9-style configuration is also valid for pacemaker-2.10 -update_validation debug: Testing 'pacemaker-2.10' validation (13 of X) -update_validation debug: Configuration valid for schema: pacemaker-2.10 -update_validation debug: pacemaker-2.10-style configuration is also valid for pacemaker-3.0 -update_validation debug: Testing 'pacemaker-3.0' validation (14 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.0 -update_validation debug: pacemaker-3.0-style configuration is also valid for pacemaker-3.1 -update_validation debug: Testing 'pacemaker-3.1' validation (15 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.1 -update_validation debug: pacemaker-3.1-style configuration is also valid for pacemaker-3.2 -update_validation debug: Testing 'pacemaker-3.2' validation (16 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.2 -update_validation debug: pacemaker-3.2-style configuration is also valid for pacemaker-3.3 -update_validation debug: Testing 'pacemaker-3.3' validation (17 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.3 -update_validation debug: pacemaker-3.3-style configuration is also valid for pacemaker-3.4 -update_validation debug: Testing 'pacemaker-3.4' validation (18 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.4 -update_validation debug: pacemaker-3.4-style configuration is also valid for pacemaker-3.5 -update_validation debug: Testing 'pacemaker-3.5' validation (19 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.5 -update_validation debug: pacemaker-3.5-style configuration is also valid for pacemaker-3.6 -update_validation debug: Testing 'pacemaker-3.6' validation (20 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.6 -update_validation debug: pacemaker-3.6-style configuration is also valid for pacemaker-3.7 -update_validation debug: Testing 'pacemaker-3.7' validation (21 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.7 -update_validation debug: pacemaker-3.7-style configuration is also valid for pacemaker-3.8 -update_validation debug: Testing 'pacemaker-3.8' validation (22 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.8 -update_validation debug: pacemaker-3.8-style configuration is also valid for pacemaker-3.9 -update_validation debug: Testing 'pacemaker-3.9' validation (23 of X) -update_validation debug: Configuration valid for schema: pacemaker-3.9 -update_validation trace: Stopping at pacemaker-3.9 -update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.9 pcmk__verify error: CIB did not pass schema validation Current cluster status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Full List of Resources: - * No resources + * dummy1 (ocf:pacemaker:Dummy): Stopped + * dummy2 (ocf:pacemaker:Dummy): Stopped Transition Summary: Executing Cluster Transition: Revised Cluster Status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Full List of Resources: - * No resources + * dummy1 (ocf:pacemaker:Dummy): Stopped + * dummy2 (ocf:pacemaker:Dummy): Stopped =#=#=#= End test: Run crm_simulate with invalid, but possibly recoverable CIB (valid with X.Y+1) - OK (0) =#=#=#= * Passed: crm_simulate - Run crm_simulate with invalid, but possibly recoverable CIB (valid with X.Y+1) =#=#=#= Begin test: Make resulting CIB valid, although without validate-with attribute =#=#=#= @@ -535,32 +395,26 @@ Schema validation of configuration is disabled (enabling is encouraged and preve unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity -Schema validation of configuration is disabled (enabling is encouraged and prevents common misconfigurations) pcmk__verify error: CIB did not pass schema validation unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity -Schema validation of configuration is disabled (enabling is encouraged and prevents common misconfigurations) pcmk__verify error: CIB did not pass schema validation Current cluster status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Full List of Resources: - * dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged) - * dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged) + * dummy1 (ocf:pacemaker:Dummy): Stopped + * dummy2 (ocf:pacemaker:Dummy): Stopped Transition Summary: Executing Cluster Transition: Revised Cluster Status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Full List of Resources: - * dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged) - * dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged) + * dummy1 (ocf:pacemaker:Dummy): Stopped + * dummy2 (ocf:pacemaker:Dummy): Stopped =#=#=#= End test: Run crm_simulate with valid CIB, but without validate-with attribute - OK (0) =#=#=#= * Passed: crm_simulate - Run crm_simulate with valid CIB, but without validate-with attribute =#=#=#= Begin test: Make resulting CIB invalid, and without validate-with attribute =#=#=#= @@ -686,31 +540,25 @@ validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constr unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity -Schema validation of configuration is disabled (enabling is encouraged and prevents common misconfigurations) pcmk__verify error: CIB did not pass schema validation unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity -Schema validation of configuration is disabled (enabling is encouraged and prevents common misconfigurations) pcmk__verify error: CIB did not pass schema validation Current cluster status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Full List of Resources: - * dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged) - * dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged) + * dummy1 (ocf:pacemaker:Dummy): Stopped + * dummy2 (ocf:pacemaker:Dummy): Stopped Transition Summary: Executing Cluster Transition: Revised Cluster Status: - * Cluster Summary: - * CIB syntax has errors (for details, run crm_verify -LV) - + * CIB syntax has errors (for details, run crm_verify -LV) * Full List of Resources: - * dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged) - * dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged) + * dummy1 (ocf:pacemaker:Dummy): Stopped + * dummy2 (ocf:pacemaker:Dummy): Stopped =#=#=#= End test: Run crm_simulate with invalid CIB, also without validate-with attribute - OK (0) =#=#=#= * Passed: crm_simulate - Run crm_simulate with invalid CIB, also without validate-with attribute diff --git a/lib/pacemaker/pcmk_output.c b/lib/pacemaker/pcmk_output.c index 3a79dc70c87..78b0b517572 100644 --- a/lib/pacemaker/pcmk_output.c +++ b/lib/pacemaker/pcmk_output.c @@ -1939,9 +1939,6 @@ cluster_status_xml(pcmk__output_t *out, va_list args) GList *unames = va_arg(args, GList *); GList *resources = va_arg(args, GList *); - pcmk__output_t *verify_out; - int verify_rc; - out->message(out, "cluster-summary", scheduler, pcmkd_state, section_opts, show_opts); @@ -2002,21 +1999,6 @@ cluster_status_xml(pcmk__output_t *out, va_list args) false); } - - /* If there are verification errors, always print a statement about that, even if not requested */ - - pcmk__output_new(&verify_out, "none", NULL, NULL); - verify_rc = pcmk__verify(scheduler, verify_out, scheduler->input); - pcmk__output_free(verify_out); - - if (verify_rc == pcmk_rc_ok) { - if (pcmk_is_set(section_opts, pcmk_section_verify)) { - out->info(out, "CIB syntax is valid"); - } - } else { - out->info(out, "CIB syntax has errors (for details, run crm_verify -LV)."); - } - return pcmk_rc_ok; } @@ -2358,28 +2340,38 @@ result_code_xml(pcmk__output_t *out, va_list args) PCMK__OUTPUT_ARGS("cluster-verify", "pcmk_scheduler_t *", "int") static int cluster_verify_text(pcmk__output_t *out, va_list args) { - - /* If there are verification errors, always print a statement about that, even if not requested */ - pcmk_scheduler_t *scheduler = va_arg(args, pcmk_scheduler_t *); int section_opts = va_arg(args, int); pcmk__output_t *verify_out; int verify_rc; + int rc = pcmk_rc_ok; + + (void)(verify_rc); + (void)(section_opts); pcmk__output_new(&verify_out, "none", NULL, NULL); + + scheduler = pe_new_working_set(); + scheduler->priv = verify_out; + verify_rc = pcmk__verify(scheduler, verify_out, scheduler->input); + + pe_free_working_set(scheduler); pcmk__output_free(verify_out); if (verify_rc == pcmk_rc_ok) { if (pcmk_is_set(section_opts, pcmk_section_verify)) { + PCMK__OUTPUT_LIST_HEADER(out, false, rc, "Cluster Summary"); out->list_item(out, NULL, "CIB syntax is valid"); } } else { + /* If there are verification errors, always print a statement about that, even if not requested */ + PCMK__OUTPUT_LIST_HEADER(out, false, rc, "Cluster Summary"); out->list_item(out, NULL, "CIB syntax has errors (for details, run crm_verify -LV)"); } - return pcmk_rc_ok; + return rc; } PCMK__OUTPUT_ARGS("cluster-verify", "pcmk_scheduler_t *", "int") @@ -2387,12 +2379,19 @@ static int cluster_verify_xml(pcmk__output_t *out, va_list args) { pcmk_scheduler_t *scheduler = va_arg(args, pcmk_scheduler_t *); int section_opts = va_arg(args, int); + int rc = pcmk_rc_ok; if (pcmk_is_set(section_opts, pcmk_section_verify)) { + PCMK__OUTPUT_LIST_HEADER(out, false, rc, "Cluster Summary"); + scheduler = pe_new_working_set(); + scheduler->priv = out; + pcmk__verify(scheduler, out, scheduler->input); + + pe_free_working_set(scheduler); } - return pcmk_rc_ok; + return rc; } static pcmk__message_entry_t fmt_functions[] = { diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c index d2ebf5131b6..8ae69203c53 100644 --- a/lib/pengine/pe_output.c +++ b/lib/pengine/pe_output.c @@ -448,7 +448,6 @@ cluster_summary(pcmk__output_t *out, va_list args) { scheduler->localhost, last_written, user, client, origin); } - PCMK__OUTPUT_LIST_HEADER(out, false, rc, "Cluster Summary"); out->message(out, "cluster-verify", scheduler, section_opts); if (pcmk_is_set(section_opts, pcmk_section_counts)) { @@ -526,8 +525,8 @@ cluster_summary_html(pcmk__output_t *out, va_list args) { scheduler->localhost, last_written, user, client, origin); } - PCMK__OUTPUT_LIST_HEADER(out, false, rc, "Cluster Summary"); out->message(out, "cluster-verify", scheduler, section_opts); + if (pcmk_is_set(section_opts, pcmk_section_counts)) { PCMK__OUTPUT_LIST_HEADER(out, false, rc, "Cluster Summary");