ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [16/50] [abbrv] ambari git commit: AMBARI-21068 : Kafka broker goes down after Ambari upgrade from 2.5.0 to 2.5.1 due to missing 'kafka.timeline.metrics.instanceId' property. (dsen via avijayan)
Date Wed, 24 May 2017 02:39:33 GMT
AMBARI-21068 : Kafka broker goes down after Ambari upgrade from 2.5.0 to 2.5.1 due to missing
'kafka.timeline.metrics.instanceId' property. (dsen via avijayan)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: c9f705de801aac16f7da4550bcd180ff56b8c685
Parents: ae40bed
Author: Aravindan Vijayan <avijayan@hortonworks.com>
Authored: Fri May 19 16:39:55 2017 -0700
Committer: Aravindan Vijayan <avijayan@hortonworks.com>
Committed: Fri May 19 16:39:55 2017 -0700

----------------------------------------------------------------------
 .../org/apache/ambari/server/upgrade/UpgradeCatalog251.java     | 1 +
 .../org/apache/ambari/server/upgrade/UpgradeCatalog251Test.java | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f705de/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
index 5ed33a8..5e2eb16 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog251.java
@@ -104,6 +104,7 @@ public class UpgradeCatalog251 extends AbstractUpgradeCatalog {
    */
   @Override
   protected void executeDMLUpdates() throws AmbariException, SQLException {
+    addNewConfigurationsFromXml();
     updateKAFKAConfigs();
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f705de/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog251Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog251Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog251Test.java
index d725ec4..fda5f0e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog251Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog251Test.java
@@ -179,11 +179,16 @@ public class UpgradeCatalog251Test {
   @Test
   public void testExecuteDMLUpdates() throws Exception {
     Method updateKAFKAConfigs = UpgradeCatalog251.class.getDeclaredMethod("updateKAFKAConfigs");
+    Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
 
     UpgradeCatalog251 upgradeCatalog251 = createMockBuilder(UpgradeCatalog251.class)
         .addMockedMethod(updateKAFKAConfigs)
+        .addMockedMethod(addNewConfigurationsFromXml)
         .createMock();
 
+    upgradeCatalog251.addNewConfigurationsFromXml();
+    expectLastCall().once();
+
     Field field = AbstractUpgradeCatalog.class.getDeclaredField("dbAccessor");
     field.set(upgradeCatalog251, dbAccessor);
 


Mime
View raw message