Refactor/monitor #897
Merged
Refactor/monitor #897
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
Monitor code now lives in backend/monitor. Initial refactoring to move keepalive specific code into keeaplived and abstract common functions into handlers within monitor.go. Signed-off-by: Mercedes Coyle <mercedes@sensu.io>
Added test update and failure handlers, removed entity and keepalive specific tests and functionality. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> WIP adding monitor to keepalived Moved deregister back to keepalived, commented out event creator for now while rolling that functionality into keepalived. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> Added monitor.New function for creating monitors Monitor now has a config for entity, timeout, and handlers. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> WIP adding in handler funcs Removed Monitor config as we don't need it Signed-off-by: Mercedes Coyle <mercedes@sensu.io>
Those functions need access to the message bus and store. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> Removed mock handlers for testing Signed-off-by: Mercedes Coyle <mercedes@sensu.io>
Created mocking package for monitor in testing, added interface in monitor.go, and modified MonitorFactory to use that interface. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> Removed event creator That functionality is now contained in keepalived. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> Added tests for checking handler returns Check that the monitor code will return expected values when the handler code is run. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> Updated monitorfactory, keepalive test, and mocks Signed-off-by: Mercedes Coyle <mercedes@sensu.io>
Signed-off-by: Eric Chlebek <eric@sensu.io> Appease linter. Apparently it's not OK to have Go variable names with leading k's. Signed-off-by: Eric Chlebek <eric@sensu.io>
Rebase fixes Signed-off-by: Mercedes Coyle <mercedes@sensu.io> Refactored integration test to include message bus Fixed time math issue in monitor so that it resets for the correct amount of time. Signed-off-by: Mercedes Coyle <mercedes@sensu.io> Updated changelog Signed-off-by: Mercedes Coyle <mercedes@sensu.io>
amdprophet
approved these changes
Jan 18, 2018
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.
What is this change?
Breaks out the monitor code into a separate package for use outside of keepalived.
Why is this change necessary?
Closes #865.
Does your change need a Changelog entry?
Added a bullet point under Changed.
Do you need clarification on anything?
Nope.
Were there any complications while making this change?
The monitor and keepalive code was fairly integrated, and it took some time to understand which components should be managed by keepalived vs monitor. I also had to do a lot of mucking about with mocks in the unit and integration tests.
Don't multiply a time.Duration by time.(Second|Minutes|Hours) or else you'll get ridiculous times like 27K hours for your monitor.