Fix: ui_context: crm configure up prompt #1466 #1481
Merged
Conversation
This file contains 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
The regression was introduced in beb26f3 Before beb26f3 it was like $ crm(live/15sp5-1)configure# primitive d Dummy $ crm(live/15sp5-1)configure# up $ There are changes pending. Do you want to commit them (y/n)? After beb26f3 there is no prompt 'There are changes pending... (y/n)?' This change brings the prompt back.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
liangxin1300
approved these changes
Jul 8, 2024
|
It seems that this patch breaks regression tests. |
aleksei-burlakov
pushed a commit
to aleksei-burlakov/crmsh
that referenced
this pull request
Jul 8, 2024
backport ClusterLabs#1481 The regression was introduced in beb26f3 Before beb26f3 it was like $ crm(live/15sp5-1)configure# primitive d Dummy $ crm(live/15sp5-1)configure# up $ There are changes pending. Do you want to commit them (y/n)? After beb26f3 there is no prompt 'There are changes pending... (y/n)?' This change brings the prompt back.
liangxin1300
added a commit
that referenced
this pull request
Jul 9, 2024
backport #1481 The regression was introduced in beb26f3 Before beb26f3 it was like $ crm(live/15sp5-1)configure# primitive d Dummy $ crm(live/15sp5-1)configure# up $ There are changes pending. Do you want to commit them (y/n)? After beb26f3 there is no prompt 'There are changes pending... (y/n)?' This change brings the prompt back.
liangxin1300
added a commit
that referenced
this pull request
Jul 11, 2024
#1300 tried to remove unnecessary dependencies on a running pacemaker service when crmsh is not actually going to call the service. However, it removed the call to `end_game()` from `up()` and `quit()` incorrectly. This made sublevel `configure` not to have a chance to check uncommitted changes anymore, leading to a regression described in #1466. #1481 tried to fix this regression by adding the call to `end_game()` back to `up()`, and check if pacemaker service is running before calling `end_game()`. This is not optimal as `up()` is a common method used for all sublevels and the status of pacemaker service is only related sublevel `configure`. Checking the status of pacemaker service when using other sublevels does not make sense. This pull request uses a more straightforward method to fix the problem: improve how to detect uncommitted changes in `has_cib_changes()`. The original implementation is to check if there is any elements in change queue. This requires the in memory representation of cib to be populated, leading to an indirect dependency to pacemaker service. However, we can take advantage of a property: the in memory cib needs to be populated before doing any changes. So in the implementation can be optimized: if the in memory cib is not populated, we will know there is not any change.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The regression was introduced in beb26f3
Before beb26f3 it was like
After beb26f3 there is no prompt
There are changes pending. Do you want to commit them (y/n)?This change brings the prompt back.