ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [02/17] ambari git commit: AMBARI-13496: Rolling Upgrades Are Duplicating Service Checks (jluniya)
Date Mon, 26 Oct 2015 14:19:11 GMT
AMBARI-13496: Rolling Upgrades Are Duplicating Service Checks (jluniya)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 2116e000abe9419e5c603a21334db02791b9bdc2
Parents: bf0e3db
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Fri Oct 23 09:12:36 2015 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Fri Oct 23 09:12:36 2015 -0700

----------------------------------------------------------------------
 .../server/state/stack/upgrade/ServiceCheckGrouping.java | 11 -----------
 .../apache/ambari/server/state/UpgradeHelperTest.java    |  1 -
 2 files changed, 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2116e000/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
index 19fabe8..7a182e2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServiceCheckGrouping.java
@@ -142,17 +142,6 @@ public class ServiceCheckGrouping extends Grouping {
       if (upgradeContext.getType() == UpgradeType.ROLLING) {
         // During Rolling Upgrade, create stages for everything else, as long it is valid
         for (String service : clusterServices) {
-          if (ServiceCheckGrouping.this.excludeServices.contains(service)) {
-            continue;
-          }
-          if (checkServiceValidity(upgradeContext, service, serviceMap)) {
-            StageWrapper wrapper = new StageWrapper(
-              StageWrapper.Type.SERVICE_CHECK,
-              "Service Check " + upgradeContext.getServiceDisplay(service),
-              new TaskWrapper(service, "", Collections.<String>emptySet(),
-                new ServiceCheckTask()));
-            result.add(wrapper);
-          }
           if (excludeServices.contains(service)) {
             continue;
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2116e000/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
index 1cc67ef..2dab9e3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
@@ -663,7 +663,6 @@ public class UpgradeHelperTest {
   }
 
   @Test
-  @Ignore
   public void testServiceCheckUpgradeStages() throws Exception {
     Map<String, UpgradePack> upgrades = ambariMetaInfo.getUpgradePacks("HDP", "2.2.0");
     assertTrue(upgrades.containsKey("upgrade_test_checks"));


Mime
View raw message