aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject incubator-aurora git commit: Removing --rollback-on-failure from aurora restart.
Date Fri, 27 Feb 2015 21:28:33 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master cb41ae9e9 -> 938f47471


Removing --rollback-on-failure from aurora restart.

Bugs closed: AURORA-1020

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


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

Branch: refs/heads/master
Commit: 938f474710eca73a551039f2e525cdc2d5cb61b5
Parents: cb41ae9
Author: Maxim Khutornenko <maxim@apache.org>
Authored: Fri Feb 27 13:28:21 2015 -0800
Committer: Maxim Khutornenko <maxim@apache.org>
Committed: Fri Feb 27 13:28:21 2015 -0800

----------------------------------------------------------------------
 .../python/apache/aurora/client/cli/jobs.py     | 25 +++++++++++---------
 .../apache/aurora/client/cli/test_restart.py    |  3 +--
 2 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/938f4747/src/main/python/apache/aurora/client/cli/jobs.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/jobs.py b/src/main/python/apache/aurora/client/cli/jobs.py
index 4485675..286b218 100644
--- a/src/main/python/apache/aurora/client/cli/jobs.py
+++ b/src/main/python/apache/aurora/client/cli/jobs.py
@@ -480,20 +480,24 @@ class RestartCommand(Verb):
     return "restart"
 
   def get_options(self):
-    return [BATCH_OPTION, BIND_OPTION, BROWSER_OPTION, FORCE_OPTION, HEALTHCHECK_OPTION,
-        JSON_READ_OPTION, WATCH_OPTION,
+    return [
+        BATCH_OPTION,
+        BIND_OPTION,
+        BROWSER_OPTION,
+        CONFIG_OPTION,
+        FORCE_OPTION,
+        HEALTHCHECK_OPTION,
+        INSTANCES_SPEC_ARGUMENT,
+        JSON_READ_OPTION,
+        MAX_TOTAL_FAILURES_OPTION,
+        STRICT_OPTION,
+        WATCH_OPTION,
         CommandOption("--max-per-instance-failures", type=int, default=0,
              help="Maximum number of restarts per instance during restart. Increments total
"
                   "failure count when this limit is exceeded."),
         CommandOption("--restart-threshold", type=int, default=60,
              help="Maximum number of seconds before an instance must move into the RUNNING
state "
-                  "before considered a failure."),
-        CONFIG_OPTION,
-        MAX_TOTAL_FAILURES_OPTION,
-        STRICT_OPTION,
-        CommandOption("--rollback-on-failure", default=True, action="store_false",
-            help="If false, prevent update from performing a rollback."),
-        INSTANCES_SPEC_ARGUMENT]
+                  "before considered a failure.")]
 
   @property
   def help(self):
@@ -522,8 +526,7 @@ class RestartCommand(Verb):
         context.options.restart_threshold,
         context.options.watch_secs,
         context.options.max_per_instance_failures,
-        context.options.max_total_failures,
-        context.options.rollback_on_failure)
+        context.options.max_total_failures)
     resp = api.restart(job, instances, updater_config,
         context.options.healthcheck_interval_seconds, config=config)
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/938f4747/src/test/python/apache/aurora/client/cli/test_restart.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_restart.py b/src/test/python/apache/aurora/client/cli/test_restart.py
index aa389b4..b596bab 100644
--- a/src/test/python/apache/aurora/client/cli/test_restart.py
+++ b/src/test/python/apache/aurora/client/cli/test_restart.py
@@ -55,8 +55,7 @@ class TestRestartJobCommand(AuroraClientCommandTest):
       mock_options.restart_threshold,
       mock_options.watch_secs,
       mock_options.max_per_instance_failures,
-      mock_options.max_total_failures,
-      mock_options.rollback_on_failure)
+      mock_options.max_total_failures)
 
     mock_api.restart.assert_called_once_with(jobkey, mock_options.instance_spec.instance,
       updater_config, mock_options.healthcheck_interval_seconds, config=None)


Mime
View raw message