Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to attach telemetry devices without reprovisioning #737

Merged
merged 6 commits into from
Aug 20, 2019
Merged

Allow to attach telemetry devices without reprovisioning #737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3661748
Revert PR#711 to use ES_JAVA_OPTS for telemetry devices
ebadyano Jul 29, 2019
51ed029
Address Daniel's comments
ebadyano Aug 12, 2019
a4db9f7
Another round of review.
ebadyano Aug 12, 2019
d625b2b
Address comments, add a test for launcher _set_env
ebadyano Aug 15, 2019
fec2fbf
Address latest comments.
ebadyano Aug 16, 2019
7c20f4f
Fix to use elif
ebadyano Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions esrally/mechanic/launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,9 @@ def _set_env(self, env, k, v, separator=' ', prepend=False):
if v is not None:
if k not in env:
env[k] = v
else: # merge
if (prepend == True):
elif (prepend == True):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While this will work correctly, idiomatic usage is elif prepend instead of elif (prepend == True). Can you please change that?

env[k] = v + separator + env[k]
else:
else:
env[k] = env[k] + separator + v

@staticmethod
Expand Down
3 changes: 1 addition & 2 deletions tests/mechanic/launcher_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ def test_daemon_start_stop(self, process, wait_for_pidfile, node_config, ms, cfg
proc_launcher.stop(nodes)
self.assertTrue(kill.called)

@mock.patch('os.path.join', return_value="/java_home/bin")
def test_env_options_order(self, path):
def test_env_options_order(self):
cfg = config.Config()
cfg.add(config.Scope.application, "mechanic", "keep.running", False)
proc_launcher = launcher.ProcessLauncher(cfg, MockMetricsStore(), races_root_dir="/home")
Expand Down