Remove some stonith-enabled uses, etc. #3989
Open
+411
−177
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
To replace stonith-enabled. This affects XML output for the crm_mon CLI tool and the pcmk_status() public API function. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
To replace stonith-timeout-ms. This affects XML output for the crm_mon CLI tool and the pcmk_status() public API function. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Look for fencing-enabled instead. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Look for fencing-timeout-ms instead. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Cluster properties are processed case-insensitively. So for example, either "fencing-ENABLED" or "STONITH-enabled" would set the pcmk__sched_fencing_enabled flag at unpack time. Thus, querying the "stonith-enabled" attribute is an incomplete check. Likewise for the no-quorum-policy attribute. Also, its value in the CIB may be "freeze" but with some uppercase letters. We fix both of these issues by running crm_mon instead of crm_attribute. crm_mon's XML output includes a cluster_options element with attributes for some important cluster properties. These are set not from the CIB directly, but rather from the scheduler data. The scheduler has already handled things like case-insensitivity, alternate option names, etc. Further, the crm_mon output contains standardized values: * stonith-enabled is set to "true" or "false" by pcmk__flag_text(). * no-quorum-policy is set to one of a few lowercase string values by no_quorum_policy_text(). This makes for easy and correct comparisons. Also, refer to "fencing-enabled" instead of the deprecated "stonith-enabled". Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
This duplicates allow_stonith_disabled, which is about to be deprecated. Also, drop setting of OCF_RESKEY_sctp, which is unused. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
This property is deprecated. Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
stonith-enabledhas been deprecated in favor offencing-enabled. I missed a few things when doing that.For one thing, we're still using
stonith-enabledin a few places internally. I must have only checked the C files. We should be using the newfencing-enabledexcept where we needstonith-enabledexplicitly for backward compatibility.For another, the
controldresource agent can misbehave iffencing-enabledis set. That agent only checks the value ofstonith-enabled. Iffencing-enabledis set, it overrides any value that may be set forstonith-enabled.We also replace and deprecate
stonith-timeout-msin thecrm_monoutput here, fix a minor bug in the controld RA, and drop an occurrence of the deprecatedcluster-ipc-limitfrom a scheduler input.