You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/11/04 14:37:00 UTC
[33/50] [abbrv] ambari git commit: AMBARI-13682. RU Progress: skipped
failure during service check it has a green tick mark (ncole)
AMBARI-13682. RU Progress: skipped failure during service check it has a green tick mark (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ce6311f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ce6311f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ce6311f
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9ce6311f6c644b629e268101b3dd6ea8277c9fb4
Parents: 60b8358
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Nov 2 16:17:56 2015 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Nov 3 08:42:45 2015 -0500
----------------------------------------------------------------------
.../ambari/server/controller/internal/CalculatedStatus.java | 1 +
.../ambari/server/controller/internal/CalculatedStatusTest.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ce6311f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CalculatedStatus.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CalculatedStatus.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CalculatedStatus.java
index 55d91c7..f87c32c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CalculatedStatus.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CalculatedStatus.java
@@ -342,6 +342,7 @@ public class CalculatedStatus {
counters.get(HostRoleStatus.HOLDING) > 0 ? HostRoleStatus.HOLDING :
counters.get(HostRoleStatus.HOLDING_FAILED) > 0 ? HostRoleStatus.HOLDING_FAILED :
counters.get(HostRoleStatus.HOLDING_TIMEDOUT) > 0 ? HostRoleStatus.HOLDING_TIMEDOUT :
+ counters.get(HostRoleStatus.SKIPPED_FAILED) > 0 ? HostRoleStatus.SKIPPED_FAILED :
counters.get(HostRoleStatus.FAILED) > 0 && !skippable ? HostRoleStatus.FAILED :
counters.get(HostRoleStatus.ABORTED) > 0 ? HostRoleStatus.ABORTED:
counters.get(HostRoleStatus.TIMEDOUT) > 0 && !skippable ? HostRoleStatus.TIMEDOUT :
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ce6311f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
index f3295ac..4b8587f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
@@ -498,6 +498,8 @@ public class CalculatedStatusTest {
assertEquals(80d, calc.getPercent(), 0.1d);
}
+
+
/**
* Tests that a SKIPPED_FAILED status means the stage has completed.
*
@@ -509,7 +511,7 @@ public class CalculatedStatusTest {
CalculatedStatus status = CalculatedStatus.statusFromTaskEntities(tasks, false);
- assertEquals(HostRoleStatus.COMPLETED, status.getStatus());
+ assertEquals(HostRoleStatus.SKIPPED_FAILED, status.getStatus());
}
private Collection<HostRoleCommandEntity> getTaskEntities(HostRoleStatus... statuses) {