Repository: aurora Updated Branches: refs/heads/master 7ccd5325b -> 9faec2f05
Remove the --announcer-enable executor flag. Reviewed at https://reviews.apache.org/r/42727/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/9faec2f0 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/9faec2f0 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/9faec2f0 Branch: refs/heads/master Commit: 9faec2f0544e6165357105e4cd01c682cb316a00 Parents: 7ccd532 Author: Bill Farner <[email protected]> Authored: Tue Jan 26 11:43:20 2016 -0800 Committer: Bill Farner <[email protected]> Committed: Tue Jan 26 11:43:20 2016 -0800 ---------------------------------------------------------------------- NEWS | 3 +++ .../vagrant/upstart/aurora-scheduler-kerberos.conf | 2 +- examples/vagrant/upstart/aurora-scheduler.conf | 2 +- .../aurora/scheduler/mesos/TestExecutorSettings.java | 1 - .../aurora/executor/bin/thermos_executor_main.py | 13 +------------ .../configuration/executor/test-thermos-executor.json | 1 - 6 files changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/9faec2f0/NEWS ---------------------------------------------------------------------- diff --git a/NEWS b/NEWS index 3f40aba..e46b2cc 100644 --- a/NEWS +++ b/NEWS @@ -35,6 +35,9 @@ - Removed the deprecated 'JobUpdateSettings.maxWaitToInstanceRunningMs' thrift api field ( UpdateConfig.restart_threshold in client-side configuration). This aspect of job restarts is now controlled exclusively via the client with `aurora job restart --restart-threshold=[seconds]`. +- Removed executor flag `--announcer-enable`. Enabling the announcer previously required both flags + `--announcer-enable` and `--announcer-ensemble`, but now only `--announcer-ensemble` must be set. + 0.11.0 ------ http://git-wip-us.apache.org/repos/asf/aurora/blob/9faec2f0/examples/vagrant/upstart/aurora-scheduler-kerberos.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/aurora-scheduler-kerberos.conf b/examples/vagrant/upstart/aurora-scheduler-kerberos.conf index 57fa312..53db93c 100644 --- a/examples/vagrant/upstart/aurora-scheduler-kerberos.conf +++ b/examples/vagrant/upstart/aurora-scheduler-kerberos.conf @@ -45,7 +45,7 @@ exec bin/aurora-scheduler \ -native_log_file_path=/var/db/aurora \ -backup_dir=/var/lib/aurora/backups \ -thermos_executor_path=$DIST_DIR/thermos_executor.pex \ - -thermos_executor_flags="--announcer-enable --announcer-ensemble localhost:2181" \ + -thermos_executor_flags="--announcer-ensemble localhost:2181" \ -allowed_container_types=MESOS,DOCKER \ -shiro_realm_modules=KERBEROS5_AUTHN,INI_AUTHNZ \ -shiro_ini_path=/home/vagrant/aurora/src/test/resources/org/apache/aurora/scheduler/http/api/security/shiro-example.ini \ http://git-wip-us.apache.org/repos/asf/aurora/blob/9faec2f0/examples/vagrant/upstart/aurora-scheduler.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf index 69025dd..70e56b0 100644 --- a/examples/vagrant/upstart/aurora-scheduler.conf +++ b/examples/vagrant/upstart/aurora-scheduler.conf @@ -40,7 +40,7 @@ exec bin/aurora-scheduler \ -native_log_file_path=/var/db/aurora \ -backup_dir=/var/lib/aurora/backups \ -thermos_executor_path=$DIST_DIR/thermos_executor.pex \ - -thermos_executor_flags="--announcer-enable --announcer-ensemble localhost:2181" \ + -thermos_executor_flags="--announcer-ensemble localhost:2181" \ -allowed_container_types=MESOS,DOCKER \ -http_authentication_mechanism=BASIC \ -use_beta_db_task_store=true \ http://git-wip-us.apache.org/repos/asf/aurora/blob/9faec2f0/src/main/java/org/apache/aurora/scheduler/mesos/TestExecutorSettings.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/mesos/TestExecutorSettings.java b/src/main/java/org/apache/aurora/scheduler/mesos/TestExecutorSettings.java index 6214882..16fa2d3 100644 --- a/src/main/java/org/apache/aurora/scheduler/mesos/TestExecutorSettings.java +++ b/src/main/java/org/apache/aurora/scheduler/mesos/TestExecutorSettings.java @@ -41,7 +41,6 @@ public final class TestExecutorSettings { .setExecutorId(Executors.PLACEHOLDER_EXECUTOR_ID) .setCommand(CommandInfo.newBuilder().setValue("thermos_executor.pex") .addAllArguments(ImmutableList.of( - "--announcer-enable", "--announcer-ensemble", "localhost:2181")) .addAllUris(ImmutableList.of( http://git-wip-us.apache.org/repos/asf/aurora/blob/9faec2f0/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py ---------------------------------------------------------------------- diff --git a/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py b/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py index 1272693..f4f5cd7 100644 --- a/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py +++ b/src/main/python/apache/aurora/executor/bin/thermos_executor_main.py @@ -60,15 +60,6 @@ _LOGGER_MODES = ', '.join(LoggerMode.VALUES) app.add_option( - '--announcer-enable', - dest='announcer_enable', - action='store_true', - default=False, - help='Enable the ServerSet announcer for this executor. Jobs must still activate using ' - 'the Announcer configuration.') - - -app.add_option( '--announcer-ensemble', dest='announcer_ensemble', type=str, @@ -179,9 +170,7 @@ def initialize(options): ResourceManagerProvider(checkpoint_root=checkpoint_root) ] - if options.announcer_enable: - if options.announcer_ensemble is None: - app.error('Must specify --announcer-ensemble if the announcer is enabled.') + if options.announcer_ensemble is not None: status_providers.append(DefaultAnnouncerCheckerProvider( options.announcer_ensemble, options.announcer_serverset_path, http://git-wip-us.apache.org/repos/asf/aurora/blob/9faec2f0/src/test/resources/org/apache/aurora/scheduler/configuration/executor/test-thermos-executor.json ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/aurora/scheduler/configuration/executor/test-thermos-executor.json b/src/test/resources/org/apache/aurora/scheduler/configuration/executor/test-thermos-executor.json index 8d4d90b..114eb4f 100644 --- a/src/test/resources/org/apache/aurora/scheduler/configuration/executor/test-thermos-executor.json +++ b/src/test/resources/org/apache/aurora/scheduler/configuration/executor/test-thermos-executor.json @@ -4,7 +4,6 @@ "command": { "value": "thermos_executor.pex", "arguments": [ - "--announcer-enable", "--announcer-ensemble", "localhost:2181" ],
