aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zma...@apache.org
Subject aurora git commit: Make --announcer-enable optional no-op instead of removing it completely.
Date Tue, 02 Feb 2016 23:28:36 GMT
Repository: aurora
Updated Branches:
  refs/heads/master 2f485e856 -> d033d5393


Make --announcer-enable optional no-op instead of removing it completely.

Reviewed at https://reviews.apache.org/r/43112/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/d033d539
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/d033d539
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/d033d539

Branch: refs/heads/master
Commit: d033d5393348ed3e90ebd66513b58c09f540267b
Parents: 2f485e8
Author: Zhitao Li <zhitaoli.cs@gmail.com>
Authored: Tue Feb 2 15:28:25 2016 -0800
Committer: Zameer Manji <zmanji@apache.org>
Committed: Tue Feb 2 15:28:25 2016 -0800

----------------------------------------------------------------------
 NEWS                                                    |  3 ++-
 .../apache/aurora/executor/bin/thermos_executor_main.py | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/d033d539/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 318979e..395c281 100644
--- a/NEWS
+++ b/NEWS
@@ -45,8 +45,9 @@ Deprecations and removals:
 - 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
+- Deprecated executor flag `--announcer-enable`. Enabling the announcer previously required
both flags
   `--announcer-enable` and `--announcer-ensemble`, but now only `--announcer-ensemble` must
be set.
+  `--announcer-enable` is a no-op flag now and will be removed in future version.
 - Removed scheduler command line arguments:
   - `-enable_cors_support`.  Enabling CORS is now implicit by setting the argument
     `-enable_cors_for`.

http://git-wip-us.apache.org/repos/asf/aurora/blob/d033d539/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 f4f5cd7..f82858c 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
@@ -59,6 +59,15 @@ _LOGGER_DESTINATIONS = ', '.join(LoggerDestination.VALUES)
 _LOGGER_MODES = ', '.join(LoggerMode.VALUES)
 
 
+# TODO(AURORA-1606): remove this flag after deprecation cycle.
+app.add_option(
+    '--announcer-enable',
+    dest='announcer_enable',
+    action='store_true',
+    default=False,
+    help='Deprecated and no-op.')
+
+
 app.add_option(
     '--announcer-ensemble',
     dest='announcer_ensemble',
@@ -170,6 +179,9 @@ def initialize(options):
       ResourceManagerProvider(checkpoint_root=checkpoint_root)
   ]
 
+  if options.announcer_enable:
+    log.warn('Please remove the deprecated and no-op --announcer-enable flag in scheduler
config!')
+
   if options.announcer_ensemble is not None:
     status_providers.append(DefaultAnnouncerCheckerProvider(
       options.announcer_ensemble,


Mime
View raw message