Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

t176 #3329

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
+7,549 −15,621
Draft

t176 #3329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4efbf7f
Add verification information to crm_mon output
waltdisgrace Dec 19, 2023
8bb5347
Low: xml: clone crm_mon schema in preparation for changes
waltdisgrace Mar 13, 2024
bf9f506
Low: xml: Update crm_mon schema to add verification status to cluster…
waltdisgrace Mar 13, 2024
1e3e264
regression tests
waltdisgrace Mar 13, 2024
d276584
changes to regression test ouput
waltdisgrace Mar 13, 2024
e93a0ad
debug 1
waltdisgrace Apr 10, 2024
a18c0b1
call pcmk__verify in cluster-summary
waltdisgrace May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
262 changes: 205 additions & 57 deletions cts/cli/regression.crm_mon.exp
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 12 additions & 4 deletions cts/cli/regression.feature_set.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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@: OFFLINE
* GuestNode guest01-0@: online
* RemoteNode remote01 (4): OFFLINE

Active Resources:
Expand Down Expand Up @@ -96,7 +96,11 @@ Active Resources:
</bundle>
</resources>
<node_history/>
<status code="0" message="OK"/>
<status code="0" message="OK">
<errors>
<error>This tool can only check complete configurations (i.e. those starting with &lt;cib&gt;).</error>
</errors>
</status>
</pacemaker-result>
=#=#=#= End test: XML output, no mixed status - OK (0) =#=#=#=
* Passed: crm_mon - XML output, no mixed status
Expand Down Expand Up @@ -159,7 +163,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@: OFFLINE
* GuestNode guest01-0@: online
* RemoteNode remote01 (4): OFFLINE

Active Resources:
Expand Down Expand Up @@ -195,7 +199,11 @@ Active Resources:
</bundle>
</resources>
<node_history/>
<status code="0" message="OK"/>
<status code="0" message="OK">
<errors>
<error>This tool can only check complete configurations (i.e. those starting with &lt;cib&gt;).</error>
</errors>
</status>
</pacemaker-result>
=#=#=#= End test: XML output, mixed status - OK (0) =#=#=#=
* Passed: crm_mon - XML output, mixed status
402 changes: 105 additions & 297 deletions cts/cli/regression.tools.exp
View file
Open in desktop

Large diffs are not rendered by default.

88 changes: 76 additions & 12 deletions cts/cli/regression.validity.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,22 +218,74 @@ pcmk__update_schema info: Transformed the configuration schema to pacemaker-3.1
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
pcmk__update_schema debug: Schema pacemaker-1.2 validates
pcmk__update_schema debug: Schema pacemaker-1.3 validates
pcmk__update_schema debug: Schema pacemaker-2.0 validates
pcmk__update_schema debug: Schema pacemaker-2.1 validates
pcmk__update_schema debug: Schema pacemaker-2.2 validates
pcmk__update_schema debug: Schema pacemaker-2.3 validates
pcmk__update_schema debug: Schema pacemaker-2.4 validates
pcmk__update_schema debug: Schema pacemaker-2.5 validates
pcmk__update_schema debug: Schema pacemaker-2.6 validates
pcmk__update_schema debug: Schema pacemaker-2.7 validates
pcmk__update_schema debug: Schema pacemaker-2.8 validates
pcmk__update_schema debug: Schema pacemaker-2.9 validates
pcmk__update_schema debug: Schema pacemaker-2.10 validates
pcmk__update_schema debug: Schema pacemaker-3.0 validates
pcmk__update_schema debug: Schema pacemaker-3.1 validates
pcmk__update_schema debug: Schema pacemaker-3.2 validates
pcmk__update_schema debug: Schema pacemaker-3.3 validates
pcmk__update_schema debug: Schema pacemaker-3.4 validates
pcmk__update_schema debug: Schema pacemaker-3.5 validates
pcmk__update_schema debug: Schema pacemaker-3.6 validates
pcmk__update_schema debug: Schema pacemaker-3.7 validates
pcmk__update_schema debug: Schema pacemaker-3.8 validates
pcmk__update_schema debug: Schema pacemaker-3.9 validates
pcmk__update_schema debug: Schema pacemaker-3.10 validates
pcmk__update_schema info: Transformed the configuration schema to pacemaker-3.10
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
pcmk__update_schema debug: Schema pacemaker-1.2 validates
pcmk__update_schema debug: Schema pacemaker-1.3 validates
pcmk__update_schema debug: Schema pacemaker-2.0 validates
pcmk__update_schema debug: Schema pacemaker-2.1 validates
pcmk__update_schema debug: Schema pacemaker-2.2 validates
pcmk__update_schema debug: Schema pacemaker-2.3 validates
pcmk__update_schema debug: Schema pacemaker-2.4 validates
pcmk__update_schema debug: Schema pacemaker-2.5 validates
pcmk__update_schema debug: Schema pacemaker-2.6 validates
pcmk__update_schema debug: Schema pacemaker-2.7 validates
pcmk__update_schema debug: Schema pacemaker-2.8 validates
pcmk__update_schema debug: Schema pacemaker-2.9 validates
pcmk__update_schema debug: Schema pacemaker-2.10 validates
pcmk__update_schema debug: Schema pacemaker-3.0 validates
pcmk__update_schema debug: Schema pacemaker-3.1 validates
pcmk__update_schema debug: Schema pacemaker-3.2 validates
pcmk__update_schema debug: Schema pacemaker-3.3 validates
pcmk__update_schema debug: Schema pacemaker-3.4 validates
pcmk__update_schema debug: Schema pacemaker-3.5 validates
pcmk__update_schema debug: Schema pacemaker-3.6 validates
pcmk__update_schema debug: Schema pacemaker-3.7 validates
pcmk__update_schema debug: Schema pacemaker-3.8 validates
pcmk__update_schema debug: Schema pacemaker-3.9 validates
pcmk__update_schema debug: Schema pacemaker-3.10 validates
pcmk__update_schema info: Transformed the configuration schema to pacemaker-3.10
pcmk__verify error: CIB did not pass schema validation
Current cluster status:
* CIB syntax has errors (for details, run crm_verify -LV)
* Full List of Resources:
* dummy1 (ocf:pacemaker:Dummy): Stopped
* dummy2 (ocf:pacemaker:Dummy): Stopped
* No resources

Transition Summary:

Executing Cluster Transition:

Revised Cluster Status:
* CIB syntax has errors (for details, run crm_verify -LV)
* Full List of Resources:
* dummy1 (ocf:pacemaker:Dummy): Stopped
* dummy2 (ocf:pacemaker:Dummy): Stopped
* No resources
=#=#=#= 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 =#=#=#=
Expand All @@ -259,22 +311,28 @@ Schema validation of configuration is disabled (support for validate-with set to
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 (support for validate-with set to "none" is deprecated and will be removed in a future release)
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 (support for validate-with set to "none" is deprecated and will be removed in a future release)
pcmk__verify error: CIB did not pass schema validation
Current cluster status:
* CIB syntax has errors (for details, run crm_verify -LV)
* Full List of Resources:
* dummy1 (ocf:pacemaker:Dummy): Stopped
* dummy2 (ocf:pacemaker:Dummy): Stopped
* dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged)
* dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged)

Transition Summary:

Executing Cluster Transition:

Revised Cluster Status:
* CIB syntax has errors (for details, run crm_verify -LV)
* Full List of Resources:
* dummy1 (ocf:pacemaker:Dummy): Stopped
* dummy2 (ocf:pacemaker:Dummy): Stopped
* dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged)
* dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged)
=#=#=#= 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 =#=#=#=
Expand Down Expand Up @@ -404,21 +462,27 @@ 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 (support for validate-with set to "none" is deprecated and will be removed in a future release)
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 (support for validate-with set to "none" is deprecated and will be removed in a future release)
pcmk__verify error: CIB did not pass schema validation
Current cluster status:
* CIB syntax has errors (for details, run crm_verify -LV)
* Full List of Resources:
* dummy1 (ocf:pacemaker:Dummy): Stopped
* dummy2 (ocf:pacemaker:Dummy): Stopped
* dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged)
* dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged)

Transition Summary:

Executing Cluster Transition:

Revised Cluster Status:
* CIB syntax has errors (for details, run crm_verify -LV)
* Full List of Resources:
* dummy1 (ocf:pacemaker:Dummy): Stopped
* dummy2 (ocf:pacemaker:Dummy): Stopped
* dummy1 (ocf:pacemaker:Dummy): Stopped (unmanaged)
* dummy2 (ocf:pacemaker:Dummy): Stopped (unmanaged)
=#=#=#= 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
11 changes: 5 additions & 6 deletions cts/scheduler/summary/1-a-then-bm-move-b.summary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Current cluster status:
* Cluster Summary:

* Node List:
* Online: [ 18node1 18node2 18node3 ]

Expand All @@ -10,16 +12,13 @@ Transition Summary:
* Migrate B ( 18node2 -> 18node1 )

Executing Cluster Transition:
* Resource action: B migrate_to on 18node2
* Resource action: B migrate_from on 18node1
* Resource action: B stop on 18node2
* Pseudo action: B_start_0
* Resource action: B monitor=60000 on 18node1

Revised Cluster Status:
* Cluster Summary:

* Node List:
* Online: [ 18node1 18node2 18node3 ]

* Full List of Resources:
* A (ocf:heartbeat:Dummy): Started 18node1
* B (ocf:heartbeat:Dummy): Started 18node1
* B (ocf:heartbeat:Dummy): Started 18node2
20 changes: 9 additions & 11 deletions cts/scheduler/summary/10-a-then-bm-b-move-a-clone.summary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Current cluster status:
* Cluster Summary:

* Node List:
* Node f20node1: standby (with active resources)
* Online: [ f20node2 ]
Expand All @@ -11,23 +13,19 @@ Current cluster status:
Transition Summary:
* Stop myclone:1 ( f20node1 ) due to node availability
* Migrate vm ( f20node1 -> f20node2 )
Transition failed: terminated
An invalid transition was produced

Executing Cluster Transition:
* Resource action: vm migrate_to on f20node1
* Resource action: vm migrate_from on f20node2
* Resource action: vm stop on f20node1
* Pseudo action: myclone-clone_stop_0
* Pseudo action: vm_start_0
* Resource action: myclone stop on f20node1
* Pseudo action: myclone-clone_stopped_0

Revised Cluster Status:
* Cluster Summary:

* Node List:
* Node f20node1: standby
* Node f20node1: standby (with active resources)
* Online: [ f20node2 ]

* Full List of Resources:
* Clone Set: myclone-clone [myclone]:
* Started: [ f20node2 ]
* Stopped: [ f20node1 ]
* vm (ocf:heartbeat:Dummy): Started f20node2
* Started: [ f20node1 f20node2 ]
* vm (ocf:heartbeat:Dummy): Started f20node1
21 changes: 8 additions & 13 deletions cts/scheduler/summary/11-a-then-bm-b-move-a-clone-starting.summary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Current cluster status:
* Cluster Summary:

* Node List:
* Node f20node1: standby (with active resources)
* Online: [ f20node2 ]
Expand All @@ -14,23 +16,16 @@ Transition Summary:
* Move vm ( f20node1 -> f20node2 ) due to unmigrateable myclone-clone stop

Executing Cluster Transition:
* Resource action: myclone monitor on f20node2
* Resource action: vm stop on f20node1
* Pseudo action: myclone-clone_stop_0
* Resource action: myclone stop on f20node1
* Pseudo action: myclone-clone_stopped_0
* Pseudo action: myclone-clone_start_0
* Resource action: myclone start on f20node2
* Pseudo action: myclone-clone_running_0
* Resource action: vm start on f20node2

Revised Cluster Status:
* Cluster Summary:

* Node List:
* Node f20node1: standby
* Node f20node1: standby (with active resources)
* Online: [ f20node2 ]

* Full List of Resources:
* Clone Set: myclone-clone [myclone]:
* Started: [ f20node2 ]
* Stopped: [ f20node1 ]
* vm (ocf:heartbeat:Dummy): Started f20node2
* Started: [ f20node1 ]
* Stopped: [ f20node2 ]
* vm (ocf:heartbeat:Dummy): Started f20node1
12 changes: 5 additions & 7 deletions cts/scheduler/summary/1360.summary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Current cluster status:
* Cluster Summary:

* Node List:
* Online: [ ssgtest1a ssgtest1b ]

Expand All @@ -12,19 +14,15 @@ Transition Summary:
* Move dollies:0 ( ssgtest1a -> ssgtest1b )

Executing Cluster Transition:
* Pseudo action: dolly_stop_0
* Resource action: dollies:0 stop on ssgtest1a
* Pseudo action: dolly_stopped_0
* Pseudo action: dolly_start_0
* Resource action: dollies:0 start on ssgtest1b
* Pseudo action: dolly_running_0

Revised Cluster Status:
* Cluster Summary:

* Node List:
* Online: [ ssgtest1a ssgtest1b ]

* Full List of Resources:
* Resource Group: ClusterAlias:
* VIP (ocf:testing:VIP-RIP.sh): Started ssgtest1a
* Clone Set: dolly [dollies]:
* Started: [ ssgtest1b ]
* Started: [ ssgtest1a ]
7 changes: 5 additions & 2 deletions cts/scheduler/summary/1484.summary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Current cluster status:
* Cluster Summary:

* Node List:
* Online: [ hb1 hb2 ]
* OFFLINE: [ hb3 ]
Expand All @@ -10,12 +12,13 @@ Transition Summary:
* Stop the-future-of-vaj ( hb2 ) due to node availability

Executing Cluster Transition:
* Resource action: the-future-of-vaj stop on hb2

Revised Cluster Status:
* Cluster Summary:

* Node List:
* Online: [ hb1 hb2 ]
* OFFLINE: [ hb3 ]

* Full List of Resources:
* the-future-of-vaj (ocf:heartbeat:Dummy): Stopped
* the-future-of-vaj (ocf:heartbeat:Dummy): FAILED hb2
11 changes: 7 additions & 4 deletions cts/scheduler/summary/1494.summary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Current cluster status:
* Cluster Summary:

* Node List:
* Online: [ hb1 hb2 ]
* OFFLINE: [ hb3 ]
Expand All @@ -10,18 +12,19 @@ Current cluster status:

Transition Summary:
* Stop ima_rscid:0 ( hb1 ) due to node availability
Transition failed: terminated
An invalid transition was produced

Executing Cluster Transition:
* Pseudo action: ima_cloneid_stop_0
* Resource action: ima_rscid:0 stop on hb1
* Pseudo action: ima_cloneid_stopped_0

Revised Cluster Status:
* Cluster Summary:

* Node List:
* Online: [ hb1 hb2 ]
* OFFLINE: [ hb3 ]

* Full List of Resources:
* Clone Set: ima_cloneid [ima_rscid] (unique):
* ima_rscid:0 (ocf:heartbeat:Dummy): Stopped
* ima_rscid:0 (ocf:heartbeat:Dummy): Started hb1
* ima_rscid:1 (ocf:heartbeat:Dummy): Started hb2
Loading