Broker cleanup 3 #1241
Merged
Broker cleanup 3 #1241
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
|
restarted one travis job that hit "write error" |
Codecov Report
@@ Coverage Diff @@
## master #1241 +/- ##
==========================================
- Coverage 78.03% 78.01% -0.03%
==========================================
Files 154 154
Lines 28936 28933 -3
==========================================
- Hits 22581 22571 -10
- Misses 6355 6362 +7
|
|
Good cleanup. Rebase? |
Remove stray overlay_set_rank() that should have been removed in PR #1234.
Rename calc_endpoint() to format_endpoint() to make its purpose more clear. It formats a string performing subsitutions much like the sprintf(). There are no calculations performed.
Rename attr_get_overlay() to overlay_attr_get_cb() and move it from broker.c into overlay.c. "attr_get_overlay" sounds like an accessor that retrives an overlay_t from an attr_t, but in reality it is a attr_get_f callback function. Move the new function to overlay.c from broker.c to further isolate broker.c from the operations of the overlay network. Also an overlay_register_attrs() is added to overlay.c to register all (both) of the overlay-specific attributes. Again, this abstracts more details away from broker.c.
Add FLUX_ATTRFLAG_READONLY to the "tbon.parent-endpoint" attribute, which directly accesses the overlay_t's internal value. We don't provide a "set" callback anyway.
Relocate the tbon structure and its base calculations out of the broker_ctx_t in broker.c and into the overlay_t in overlay.c. This moves closer to having the overlay.c file encapsulate the details the overlay network.
Remove the unused sigwatchers variable in broker_ctx_t.
Pid in broker_ctx_t is only used as a temporary variable, and therefore does not need to exist.
Remove the unused "quiet" variable from broker_ctx_t. We leave the non-functional "-q" command line option in place to avoid changing the command line interface. But now it is completely clear that it is ignored.
Move the timing of the boot_pmi() to the caller of the function rather than internal to the function. We will be breaking up boot_pmi() next, so getting that out of the way will make things slightly easier.
Closed
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.
More cleanup and refactoring of the broker in preparation for issue #1236. The next step will likely be to break up boot_pmi() to split out the things that are really specific to PMI, and those that are not.