You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/09/18 18:26:37 UTC
ambari git commit: Fix ambari upgrade failing to map ClusterImpl
object. Change test to catch such failure in future. (Nishant Bangarwa via
Swapan Shridhar).
Repository: ambari
Updated Branches:
refs/heads/trunk bb6f0d2c8 -> f0b51a827
Fix ambari upgrade failing to map ClusterImpl object. Change test to catch such failure in future. (Nishant Bangarwa via Swapan Shridhar).
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0b51a82
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0b51a82
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0b51a82
Branch: refs/heads/trunk
Commit: f0b51a8275c8c3d1e25118f9debca319b4f63589
Parents: bb6f0d2
Author: Nishant <ni...@gmail.com>
Authored: Tue Sep 12 20:44:19 2017 +0530
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Mon Sep 18 11:26:17 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java | 3 +--
.../org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0b51a82/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
index 2669358..0b9f2c4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
@@ -398,7 +398,7 @@ public class UpgradeCatalog260 extends AbstractUpgradeCatalog {
*/
@Override
protected void executePreDMLUpdates() throws AmbariException, SQLException {
-
+ removeSupersetFromDruid();
}
/**
@@ -408,7 +408,6 @@ public class UpgradeCatalog260 extends AbstractUpgradeCatalog {
protected void executeDMLUpdates() throws AmbariException, SQLException {
addNewConfigurationsFromXml();
setUnmappedForOrphanedConfigs();
- removeSupersetFromDruid();
ensureZeppelinProxyUserConfigs();
updateKerberosDescriptorArtifacts();
updateAmsConfigs();
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0b51a82/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
index 34d415b..d7210c6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
@@ -568,7 +568,7 @@ public class UpgradeCatalog260Test {
Injector injector = Guice.createInjector(module);
UpgradeCatalog260 upgradeCatalog260 = injector.getInstance(UpgradeCatalog260.class);
- upgradeCatalog260.removeSupersetFromDruid();
+ upgradeCatalog260.executePreDMLUpdates();
verify(dbAccessor);