[mesos_slave] Do not fail if no cluster name #1843
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
If the cluster doesn't have a name the check shouldn't fail.
| @@ -135,7 +135,7 @@ def _get_constant_attributes(self, url, timeout): | |||
| if state_metrics is not None: | |||
| self.version = map(int, state_metrics['version'].split('.')) | |||
| master_state = self._get_state('http://' + state_metrics['master_hostname'] + ':5050', timeout) | |||
| if master_state is not None: | |||
| if master_state is not None and 'cluster' in master_state: | |||
| self.cluster_name = master_state['cluster'] | |||
There was a problem hiding this comment.
if master_state is not None and 'cluster' in master_state:
self.cluster_name = master_state['cluster']could be simplified:
if master_state :
self.cluster_name = master_state.get('cluster')I am pretty sure we can drop the if statement too, and have simply:
self.cluster_name = master_state.get('cluster') as master_state could not be null at this point.
There was a problem hiding this comment.
What if the get master state fails?
|
LGTM 🌵. Thanks for tackling this issue. I just made a tiny/nitpick comment. Feel free to merge it. |
DorianZaccaria
added a commit
that referenced
this pull request
Aug 19, 2015
[mesos_slave] Do not fail if no cluster name
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.
If the cluster doesn't have a name the check shouldn't fail.