You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/01/26 19:15:15 UTC
ambari git commit: AMBARI-9337. Add hiveserver2-site.xml in scope of
Upgrade (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk dc4c216c9 -> 6a70baa2a
AMBARI-9337. Add hiveserver2-site.xml in scope of Upgrade (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a70baa2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a70baa2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a70baa2
Branch: refs/heads/trunk
Commit: 6a70baa2a0ef444444f933584a8cf3a8c1a79074
Parents: dc4c216
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Jan 26 20:14:09 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Jan 26 20:14:09 2015 +0200
----------------------------------------------------------------------
.../org/apache/ambari/server/upgrade/UpgradeCatalog200.java | 1 +
.../apache/ambari/server/upgrade/UpgradeCatalog200Test.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a70baa2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
index 783f7a2..85a43e3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
@@ -274,6 +274,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog {
protected void executeDMLUpdates() throws AmbariException, SQLException {
// remove NAGIOS to make way for the new embedded alert framework
removeNagiosService();
+ addNewConfigurationsFromXml();
updateHiveDatabaseType();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a70baa2/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
index e7e1358..44fd94b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
@@ -295,12 +295,16 @@ public class UpgradeCatalog200Test {
public void testExecuteDMLUpdates() throws Exception {
Method removeNagiosService = UpgradeCatalog200.class.getDeclaredMethod("removeNagiosService");
Method updateHiveDatabaseType = UpgradeCatalog200.class.getDeclaredMethod("updateHiveDatabaseType");
+ Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod
+ ("addNewConfigurationsFromXml");
UpgradeCatalog200 upgradeCatalog = createMockBuilder(
- UpgradeCatalog200.class).addMockedMethod(removeNagiosService).addMockedMethod(updateHiveDatabaseType).createMock();
+ UpgradeCatalog200.class).addMockedMethod(removeNagiosService).addMockedMethod(updateHiveDatabaseType).addMockedMethod(addNewConfigurationsFromXml).createMock();
upgradeCatalog.removeNagiosService();
expectLastCall().once();
+ upgradeCatalog.addNewConfigurationsFromXml();
+ expectLastCall();
upgradeCatalog.updateHiveDatabaseType();
expectLastCall().once();