You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2017/06/15 15:54:40 UTC
ambari git commit: AMBARI-21261 : NiFi Metrics are not displaying in
Ambari. (avijayan)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 55891101d -> 5d511d858
AMBARI-21261 : NiFi Metrics are not displaying in Ambari. (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d511d85
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d511d85
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d511d85
Branch: refs/heads/branch-2.5
Commit: 5d511d858eb5a44809555575032dde33996551b9
Parents: 5589110
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Thu Jun 15 08:54:23 2017 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Thu Jun 15 08:54:23 2017 -0700
----------------------------------------------------------------------
.../ambari/server/stack/ComponentModule.java | 4 ++++
.../server/stack/ComponentModuleTest.java | 25 ++++++++++++++++++++
2 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5d511d85/ambari-server/src/main/java/org/apache/ambari/server/stack/ComponentModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ComponentModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ComponentModule.java
index 980eec2..de69bbf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ComponentModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ComponentModule.java
@@ -119,6 +119,10 @@ public class ComponentModule extends BaseModule<ComponentModule, ComponentInfo>
componentInfo.setReassignAllowed(parentInfo.getReassignAllowed());
}
+ if (componentInfo.getTimelineAppid() == null) {
+ componentInfo.setTimelineAppid(parentInfo.getTimelineAppid());
+ }
+
mergeComponentDependencies(parentInfo.getDependencies(),
componentInfo.getDependencies());
http://git-wip-us.apache.org/repos/asf/ambari/blob/5d511d85/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
index db47a10..3f47ca3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java
@@ -178,6 +178,31 @@ public class ComponentModuleTest {
}
@Test
+ public void testResolve_TimelineAppId() {
+ String timelineAppId = "app";
+
+ ComponentInfo info = new ComponentInfo();
+ assertEquals(null, resolveComponent(info, null).getModuleInfo().getTimelineAppid());
+
+ ComponentInfo parentInfo = new ComponentInfo();
+ info = new ComponentInfo();
+ // parent has value set, child value is null
+ parentInfo.setTimelineAppid(timelineAppId);
+ assertEquals(timelineAppId, resolveComponent(info, parentInfo).getModuleInfo().getTimelineAppid());
+
+ // child has value set, parent value is null
+ info.setTimelineAppid(timelineAppId);
+ parentInfo.setTimelineAppid(null);
+ assertEquals(timelineAppId, resolveComponent(info, parentInfo).getModuleInfo().getTimelineAppid());
+
+ // value set in both parent and child; child overwrites
+ String timelineAppId2 = "app2";
+ info.setTimelineAppid(timelineAppId2);
+ parentInfo.setTimelineAppid(timelineAppId);
+ assertEquals(timelineAppId2, resolveComponent(info, parentInfo).getModuleInfo().getTimelineAppid());
+ }
+
+ @Test
public void testResolve_AutoDeploy() {
AutoDeployInfo autoDeployInfo = new AutoDeployInfo();
autoDeployInfo.setEnabled(true);