You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by tb...@apache.org on 2015/01/02 19:01:26 UTC
ambari git commit: AMBARI-8811 - Rolling Upgrade: inconsistent
statuses (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk c4fceabbc -> 1cc10ed3b
AMBARI-8811 - Rolling Upgrade: inconsistent statuses (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cc10ed3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cc10ed3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cc10ed3
Branch: refs/heads/trunk
Commit: 1cc10ed3b6202aa7bd3a1b4f8b1306ad97f9b4aa
Parents: c4fceab
Author: tbeerbower <tb...@hortonworks.com>
Authored: Fri Jan 2 13:01:05 2015 -0500
Committer: tbeerbower <tb...@hortonworks.com>
Committed: Fri Jan 2 13:01:12 2015 -0500
----------------------------------------------------------------------
.../server/controller/internal/StageResourceProvider.java | 2 +-
.../server/controller/internal/StageResourceProviderTest.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cc10ed3/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
index 8247153..9529001 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
@@ -381,7 +381,7 @@ public class StageResourceProvider extends AbstractResourceProvider implements E
counters.get(HostRoleStatus.ABORTED) > 0 ? HostRoleStatus.ABORTED :
counters.get(HostRoleStatus.TIMEDOUT) > 0 && failAll ? HostRoleStatus.TIMEDOUT :
counters.get(HostRoleStatus.IN_PROGRESS) > 0 ? HostRoleStatus.IN_PROGRESS :
- counters.get(HostRoleStatus.COMPLETED) == total ? HostRoleStatus.COMPLETED : HostRoleStatus.PENDING;
+ counters.get(HostRoleStatus.COMPLETED) == total && total > 0 ? HostRoleStatus.COMPLETED : HostRoleStatus.PENDING;
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cc10ed3/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
index 0238881..cdb5eb7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
@@ -276,6 +276,13 @@ public class StageResourceProviderTest {
counts = StageResourceProvider.calculateTaskStatusCounts(hostRoleStatuses);
assertEquals(HostRoleStatus.COMPLETED, StageResourceProvider.calculateSummaryStatus(counts, hostRoleStatuses.size(), false));
+
+
+ hostRoleStatuses = new LinkedList<HostRoleStatus>();
+
+ counts = StageResourceProvider.calculateTaskStatusCounts(hostRoleStatuses);
+
+ assertEquals(HostRoleStatus.PENDING, StageResourceProvider.calculateSummaryStatus(counts, hostRoleStatuses.size(), false));
}