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

Restore Error Return When Non-Leader Calls LeaderSettingsChanged #10301

Merged
merged 1 commit into from Jun 10, 2019
Merged

Restore Error Return When Non-Leader Calls LeaderSettingsChanged #10301

merged 1 commit into from Jun 10, 2019

Conversation

manadart
Copy link
Member

Description of change

This is a reversion of a single commit from #9353.

The commit logs a warning instead of returning an error when LeaderSettingsChanged is called by a non-leader unit.

That commit should not have been retained in the patch, which ultimately focussed on re-checking leader status when preparing to fire the leader-elected hook.

QA steps

  • Bootstrap.
  • juju deploy ubuntu -n 2
  • juju run --unit <whichever is not the leader> leader-set.
  • Result should be: ERROR cannot write leadership settings: cannot write settings: not the leader.

Documentation changes

None.

Bug reference

Original: https://bugs.launchpad.net/juju-core/+bug/1723184

@manadart
Reverts 7f6600f, which incorrectly supresses error feedback when atte…
a9a4ead 
…mpting to change leader settings while not the leader.
@manadart manadart changed the title Reverts 7f6600fb15b7435a740f51d01ea087e286a4e1da, which incorrectly s… Restore Error Return When Non-Leader Calls LeaderSettingsChanged Jun 10, 2019
@manadart
Copy link
Member Author

Restore Error in WriteLeaderSettings When Not Leader

jameinel
jameinel approved these changes Jun 10, 2019
View reviewed changes
Copy link
Member

@jameinel jameinel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@manadart
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit 72d9064 into juju:2.5 Jun 10, 2019
@manadart manadart mentioned this pull request Jun 10, 2019
Merged
jujubot added a commit that referenced this pull request Jun 10, 2019
@jujubot
Merge pull request #10304 from manadart/2.5-into-2.6
0e9db42 
#10304

## Description of change

Merges 2.5 into 2.6, bringing in:
- #10301 from manadart/2.5-write-leader-settings-guard
- #10302 from manadart/2.5-spelling-corrections

Includes an additional one-word spelling fix to appease the invigorated linter.
@manadart manadart deleted the 2.5-write-leader-settings-guard branch June 10, 2019 16:06
@manadart manadart mentioned this pull request Jun 11, 2019
Merged
jujubot added a commit that referenced this pull request Jun 11, 2019
@jujubot
Merge pull request #10308 from manadart/2.5-into-2.6
0ef49c3 
#10308

## Description of change

This brings forward #10301 and syncs the branches around recent forward/back porting.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jameinel jameinel jameinel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@manadart @jameinel @jujubot