make cli options available to pre_submit_hooks #396
Merged
Conversation
This file contains hidden or 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
use storm.workers.list from cli in remove_logs and create_or_update_virtualenvs
dan-blanchard
requested changes
Sep 12, 2017
streamparse/util.py
Outdated
| @@ -120,7 +120,10 @@ def activate_env(env_name=None): | |||
| """ | |||
| env_name, env_config = get_env_config(env_name) | |||
|
|
|||
| env.storm_workers = get_storm_workers(env_config) | |||
| if options and 'storm.workers.list' in options: | |||
There was a problem hiding this comment.
Is there a case where we'd want to keep an empty list here? Seems like we'd be better off with
if options.get('storm.workers.list'):
streamparse/cli/common.py
Outdated
| @@ -230,7 +230,10 @@ def resolve_options(cli_options, env_config, topology_class, topology_name, | |||
|
|
|||
| # If ackers and executors still aren't set, use number of worker nodes | |||
| if not local_only: | |||
| storm_options['storm.workers.list'] = get_storm_workers(env_config) | |||
| if 'storm.workers.list' not in storm_options: | |||
There was a problem hiding this comment.
if storm_options.get('storm.workers.list'):might be better since we otherwise ignore empty lists.
streamparse/cli/common.py
Outdated
| if 'storm.workers.list' not in storm_options: | ||
| storm_options['storm.workers.list'] = get_storm_workers(env_config) | ||
| else: | ||
| storm_options['storm.workers.list'] = storm_options['storm.workers.list'].split(",") |
There was a problem hiding this comment.
Proba 8000 bly best to check that this is a string before doing this a split, incase someone passes in a list.
| # Run pre_submit actions provided by project | ||
| _pre_submit_hooks(override_name, env_name, env_config) | ||
| _pre_submit_hooks(override_name, env_name, env_config, options) |
There was a problem hiding this comment.
We should make these available to _post_submit_hooks too for consistency.
|
@dan-blanchard This is tested locally and should be ready to go if the changes look good to you. |
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 makes CLI options available to
pre_submit_hooks, as well as passing them tocreate_or_update_virtualenvs. It also ensures thatstorm.workers.listset on the CLI is used in these contexts. This allows client programs to override the storm workers list from the CLI.