broker: ensure parent-uri and parent-kvs-namespace are only set for jobs
#6561
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
Problem: Some broker attributes that are initialized in init_attrs() may be more properly initialized after bootstrap is complete (i.e. after the call to boot_pmi() or boot_config() returns) Split a new function init_attrs_post_boot() out of init_attrs() and run it after bootstrap is complete. There are no other substantive changes at this time.
Problem: The broker uses presence of FLUX_JOB_ID in the environment to determine if it needs to set the parent-uri attribute, but this ends up setting parent-uri in cases where the instance is not a job such as `flux run flux start --test-size=1`. Use the `jobid` broker attribute instead of FLUX_JOB_ID. This attribute is only set by boot_pmi() if the instance was really started as a job in another Flux instance.
Problem: The broker always sets the parent-kvs-namespace broker attribute if FLUX_KVS_NAMESPACE is set in the environment, but this doesn't make sense unless the current instance is a job. Only set parent-kvs-namespace if the current instance is a job.
Problem: No tests in the testsuite ensure that parent-uri and parent-kvs-namespace are set only for instance that are jobs. Add a couple tests to t0001-basic.t.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6561 +/- ##
=======================================
Coverage 79.43% 79.43%
=======================================
Files 531 531
Lines 88280 88286 +6
=======================================
+ Hits 70125 70133 +8
+ Misses 18155 18153 -2
|
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.
This PR fixes #6560 by delaying initialization of the mentioned attributes until after bootstrap. Then the
jobidattribute instead ofFLUX_JOB_IDis used since this more correctly indicates if the current instance is a job or not.Fixes #6560