aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmclaugh...@apache.org
Subject git commit: Fix the default values for min/max time running while updating.
Date Fri, 19 Sep 2014 04:30:39 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 53e5cd2d0 -> cff853771


Fix the default values for min/max time running while updating.

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


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

Branch: refs/heads/master
Commit: cff85377199de85a6342b69d1bf787c4d264f9bf
Parents: 53e5cd2
Author: David McLaughlin <david@dmclaughlin.com>
Authored: Thu Sep 18 21:30:10 2014 -0700
Committer: David McLaughlin <dmclaughlin@twitter.com>
Committed: Thu Sep 18 21:30:10 2014 -0700

----------------------------------------------------------------------
 .../org/apache/aurora/scheduler/updater/InstanceUpdater.java     | 2 ++
 src/main/python/apache/aurora/client/api/updater_util.py         | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cff85377/src/main/java/org/apache/aurora/scheduler/updater/InstanceUpdater.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/InstanceUpdater.java b/src/main/java/org/apache/aurora/scheduler/updater/InstanceUpdater.java
index 13599c0..09f2a74 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/InstanceUpdater.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/InstanceUpdater.java
@@ -155,8 +155,10 @@ class InstanceUpdater implements StateEvaluator<Optional<IScheduledTask>>
{
         }
       } else if (Tasks.isTerminated(status)) {
         // The desired task has terminated, this is a failure.
+        LOG.info("Task is in terminal state " + status);
         return addFailureAndCheckIfFailed();
       } else if (appearsStuck(actualState)) {
+        LOG.info("Task appears stuck.");
         // The task is not running, but not terminated, and appears to have been in this
state
         // long enough that we should intervene.
         StateEvaluator.Result updaterStatus = addFailureAndCheckIfFailed();

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cff85377/src/main/python/apache/aurora/client/api/updater_util.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/api/updater_util.py b/src/main/python/apache/aurora/client/api/updater_util.py
index 178c2fb..06eaf3d 100644
--- a/src/main/python/apache/aurora/client/api/updater_util.py
+++ b/src/main/python/apache/aurora/client/api/updater_util.py
@@ -91,8 +91,8 @@ class UpdaterConfig(object):
         updateGroupSize=self.batch_size,
         maxPerInstanceFailures=self.max_per_instance_failures,
         maxFailedInstances=self.max_total_failures,
-        maxWaitToInstanceRunningMs=self.restart_threshold,
-        minWaitInInstanceRunningMs=self.watch_secs,
+        maxWaitToInstanceRunningMs=self.restart_threshold*1000,
+        minWaitInInstanceRunningMs=self.watch_secs*1000,
         rollbackOnFailure=self.rollback_on_failure,
         updateOnlyTheseInstances=self.instances_to_ranges(instances) if instances else None)
 


Mime
View raw message