diff options
| author | Jason Tedor <jason@tedor.me> | 2016-05-19 14:08:08 -0400 |
|---|---|---|
| committer | Jason Tedor <jason@tedor.me> | 2016-05-19 14:08:08 -0400 |
| commit | c257e2c51f235853c4453a86e10e463813140fc9 (patch) | |
| tree | 30e62c0b4b9d1340c0f6e97286b1087b63e2d0a2 /dev-tools | |
| parent | 5da9e5dcbcd7676e09060ddb0a64d4328d959a64 (diff) | |
Remove settings and system properties entanglement
Today when parsing settings during bootstrap, we add a system property
for every Elasticsearch setting. Additionally, settings can be set via
system properties. This commit simplifies this situation.
- settings are no longer propogated to system properties
- system properties can not be used to set settings
- the "es." prefix on settings is no longer required (nor permitted)
- test logging has a dedicated system property (tests.logger.level)
Relates #18198
Diffstat (limited to 'dev-tools')
| -rw-r--r-- | dev-tools/smoke_test_rc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev-tools/smoke_test_rc.py b/dev-tools/smoke_test_rc.py index 39db9929a5..ac5e9afec4 100644 --- a/dev-tools/smoke_test_rc.py +++ b/dev-tools/smoke_test_rc.py @@ -203,7 +203,7 @@ def smoke_test_release(release, files, expected_hash, plugins): headers = {} print(' Starting elasticsearch deamon from [%s]' % es_dir) try: - run('%s; %s -Ees.node.name=smoke_tester -Ees.cluster.name=prepare_release -Ees.script.inline=true -Ees.script.stored=true -Ees.repositories.url.allowed_urls=http://snapshot.test* %s -Ees.pidfile=%s -Ees.node.portsfile=true' + run('%s; %s -Enode.name=smoke_tester -Ecluster.name=prepare_release -Escript.inline=true -Escript.stored=true -Erepositories.url.allowed_urls=http://snapshot.test* %s -Epidfile=%s -Enode.portsfile=true' % (java_exe(), es_run_path, '-d', os.path.join(es_dir, 'es-smoke.pid'))) if not wait_for_node_startup(es_dir, header=headers): print("elasticsearch logs:") |