You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2016/03/30 13:48:09 UTC
ambari git commit: AMBARI-15613. Provide a mapping for
service/component to log ID (Miklos Gergely via oleewere)
Repository: ambari
Updated Branches:
refs/heads/trunk 13dfd3f19 -> 7bc68e162
AMBARI-15613. Provide a mapping for service/component to log ID (Miklos Gergely via oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7bc68e16
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7bc68e16
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7bc68e16
Branch: refs/heads/trunk
Commit: 7bc68e1626c8ea82820cbea391a3026d8824c586
Parents: 13dfd3f
Author: Miklos Gergely <mg...@hortonworks.com>
Authored: Wed Mar 30 12:20:17 2016 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Wed Mar 30 12:20:17 2016 +0200
----------------------------------------------------------------------
.../ambari/server/state/ComponentInfo.java | 35 ++++++++--
.../ambari/server/state/LogDefinition.java | 70 ++++++++++++++++++++
.../ACCUMULO/1.6.1.2.2.0/metainfo.xml | 25 +++++++
.../AMBARI_METRICS/0.1.0/metainfo.xml | 11 +++
.../ATLAS/0.1.0.2.3/metainfo.xml | 5 ++
.../FALCON/0.5.0.2.1/metainfo.xml | 5 ++
.../HBASE/0.96.0.2.0/metainfo.xml | 10 +++
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 28 ++++++++
.../HIVE/0.12.0.2.0/metainfo.xml | 10 +++
.../KAFKA/0.8.1.2.2/metainfo.xml | 17 +++++
.../common-services/KNOX/0.5.0.2.2/metainfo.xml | 47 ++++++++-----
.../OOZIE/4.0.0.2.0/metainfo.xml | 5 ++
.../OOZIE/4.2.0.2.3/metainfo.xml | 5 ++
.../common-services/RANGER/0.4.0/metainfo.xml | 19 +++++-
.../RANGER_KMS/0.5.0.2.3/metainfo.xml | 5 ++
.../STORM/0.9.1.2.1/metainfo.xml | 28 ++++++++
.../common-services/YARN/2.1.0.2.0/metainfo.xml | 22 ++++++
.../ZOOKEEPER/3.4.5.2.0/metainfo.xml | 5 ++
.../server/api/services/AmbariMetaInfoTest.java | 22 ++++++
.../stacks/HDP/2.1.1/services/HDFS/metainfo.xml | 28 ++++++++
20 files changed, 377 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
index 770ee5c..0d2053c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
@@ -23,6 +23,10 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
import java.util.ArrayList;
import java.util.List;
@@ -52,6 +56,13 @@ public class ComponentInfo {
private CommandScriptDefinition commandScript;
/**
+ * List of the logs that the component writes
+ */
+ @XmlElementWrapper(name = "logs")
+ @XmlElements(@XmlElement(name = "log"))
+ private List<LogDefinition> logs;
+
+ /**
* List of clients which configs are updated with master component.
* If clientsToUpdateConfigs is not specified all clients are considered to be updated.
* If clientsToUpdateConfigs is empty no clients are considered to be updated
@@ -82,6 +93,10 @@ public class ComponentInfo {
@XmlElements(@XmlElement(name="dependency"))
private List<DependencyInfo> dependencies = new ArrayList<DependencyInfo>();
+ @XmlElementWrapper(name="configuration-dependencies")
+ @XmlElements(@XmlElement(name="config-type"))
+ private List<String> configDependencies;
+
/**
* Auto-deployment information.
* If auto-deployment is enabled and the component doesn't meet the cardinality requirement,
@@ -110,6 +125,7 @@ public class ComponentInfo {
versionAdvertised = prototype.versionAdvertised;
clientsToUpdateConfigs = prototype.clientsToUpdateConfigs;
commandScript = prototype.commandScript;
+ logs = prototype.logs;
customCommands = prototype.customCommands;
dependencies = prototype.dependencies;
autoDeploy = prototype.autoDeploy;
@@ -170,6 +186,14 @@ public class ComponentInfo {
this.commandScript = commandScript;
}
+ public List<LogDefinition> getLogs() {
+ return logs;
+ }
+
+ public void setLogs(List<LogDefinition> logs) {
+ this.logs = logs;
+ }
+
public List<ClientConfigFileDefinition> getClientConfigFiles() {
return clientConfigFiles;
}
@@ -211,10 +235,6 @@ public class ComponentInfo {
public List<DependencyInfo> getDependencies() {
return dependencies;
}
- @XmlElementWrapper(name="configuration-dependencies")
- @XmlElements(@XmlElement(name="config-type"))
- private List<String> configDependencies;
-
public List<String> getConfigDependencies() {
return configDependencies;
@@ -294,6 +314,7 @@ public class ComponentInfo {
if (clientConfigFiles != null ? !clientConfigFiles.equals(that.clientConfigFiles) : that.clientConfigFiles != null)
return false;
if (commandScript != null ? !commandScript.equals(that.commandScript) : that.commandScript != null) return false;
+ if (logs != null ? !logs.equals(that.logs) : that.logs != null) return false;
if (configDependencies != null ? !configDependencies.equals(that.configDependencies) : that.configDependencies != null)
return false;
if (customCommands != null ? !customCommands.equals(that.customCommands) : that.customCommands != null)
@@ -316,6 +337,7 @@ public class ComponentInfo {
result = 31 * result + (cardinality != null ? cardinality.hashCode() : 0);
result = 31 * result + (versionAdvertised ? 1 : 0);
result = 31 * result + (commandScript != null ? commandScript.hashCode() : 0);
+ result = 31 * result + (logs != null ? logs.hashCode() : 0);
result = 31 * result + (clientConfigFiles != null ? clientConfigFiles.hashCode() : 0);
result = 31 * result + (customCommands != null ? customCommands.hashCode() : 0);
result = 31 * result + (dependencies != null ? dependencies.hashCode() : 0);
@@ -324,4 +346,9 @@ public class ComponentInfo {
result = 31 * result + (clientConfigFiles != null ? clientConfigFiles.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/java/org/apache/ambari/server/state/LogDefinition.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/LogDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/state/LogDefinition.java
new file mode 100644
index 0000000..7a70e98
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/LogDefinition.java
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.state;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+/**
+ * Represents the log tag at service/component metainfo
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+public class LogDefinition
+{
+ private String logId;
+
+ public String getLogId() {
+ return logId;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ return false;
+
+ if (obj == this)
+ return true;
+
+ if ( !(obj instanceof LogDefinition) )
+ return false;
+
+ LogDefinition other = (LogDefinition) obj;
+ return new EqualsBuilder()
+ .append(logId, other.logId)
+ .isEquals();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return new HashCodeBuilder(17, 31)
+ .append(logId)
+ .toHashCode();
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml
index bd9f357..a5a4414 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/metainfo.xml
@@ -54,6 +54,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>accumulo_master</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -68,6 +73,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>accumulo_monitor</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -82,6 +92,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>accumulo_gc</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -96,6 +111,11 @@
<scriptType>PYTHON</scriptType>
<timeout>180</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>accumulo_tracer</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -109,6 +129,11 @@
<script>scripts/accumulo_tserver.py</script>
<scriptType>PYTHON</scriptType>
</commandScript>
+ <logs>
+ <log>
+ <logId>accumulo_tserver</logId>
+ </log>
+ </logs>
</component>
<component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
index b06f55b..59dbd84 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
@@ -47,6 +47,17 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>ams_hbase_master</logId>
+ </log>
+ <log>
+ <logId>ams_hbase_regionserver</logId>
+ </log>
+ <log>
+ <logId>ams_collector</logId>
+ </log>
+ </logs>
<configuration-dependencies>
<config-type>ams-site</config-type>
<config-type>ams-log4j</config-type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
index 719f92c..bad9e95 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
@@ -38,6 +38,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>atlas_app</logId>
+ </log>
+ </logs>
<configFile>
<type>properties</type>
<fileName>application.properties</fileName>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml
index 80a563c..451a500 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/metainfo.xml
@@ -80,6 +80,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>falcon_app</logId>
+ </log>
+ </logs>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml
index 057e126..d96c6fb 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml
@@ -55,6 +55,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hbase_master</logId>
+ </log>
+ </logs>
<customCommands>
<customCommand>
<name>DECOMMISSION</name>
@@ -78,6 +83,11 @@
<script>scripts/hbase_regionserver.py</script>
<scriptType>PYTHON</scriptType>
</commandScript>
+ <logs>
+ <log>
+ <logId>hbase_regionserver</logId>
+ </log>
+ </logs>
</component>
<component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
index 75d3bea..0ffd8f5 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
@@ -36,6 +36,14 @@
<scriptType>PYTHON</scriptType>
<timeout>1800</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_namenode</logId>
+ </log>
+ <log>
+ <logId>hdfs_audit</logId>
+ </log>
+ </logs>
<customCommands>
<customCommand>
<name>DECOMMISSION</name>
@@ -67,6 +75,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_datanode</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -81,6 +94,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_secondarynamenode</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -129,6 +147,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_journalnode</logId>
+ </log>
+ </logs>
<dependencies>
<dependency>
<name>HDFS/HDFS_CLIENT</name>
@@ -152,6 +175,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_zkfc</logId>
+ </log>
+ </logs>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
index a71e392..4842f32 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
@@ -41,6 +41,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hive_metastore</logId>
+ </log>
+ </logs>
<configuration-dependencies>
<config-type>hive-site</config-type>
</configuration-dependencies>
@@ -81,6 +86,11 @@
<script>scripts/hive_server.py</script>
<scriptType>PYTHON</scriptType>
</commandScript>
+ <logs>
+ <log>
+ <logId>hive_hiveserver2</logId>
+ </log>
+ </logs>
<configuration-dependencies>
<config-type>hive-site</config-type>
</configuration-dependencies>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
index 1970113..c2cb8f5 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
@@ -44,6 +44,23 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>kafka_controller</logId>
+ </log>
+ <log>
+ <logId>kafka_request</logId>
+ </log>
+ <log>
+ <logId>kafka_logcleaner</logId>
+ </log>
+ <log>
+ <logId>kafka_server</logId>
+ </log>
+ <log>
+ <logId>kafka_statechange</logId>
+ </log>
+ </logs>
</component>
</components>
<commandScript>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml
index 657a300..940fc8f 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/metainfo.xml
@@ -35,24 +35,35 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
- <customCommands>
- <customCommand>
- <name>STARTDEMOLDAP</name>
- <commandScript>
- <script>scripts/knox_gateway.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>600</timeout>
- </commandScript>
- </customCommand>
- <customCommand>
- <name>STOPDEMOLDAP</name>
- <commandScript>
- <script>scripts/knox_gateway.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>600</timeout>
- </commandScript>
- </customCommand>
- </customCommands>
+ <logs>
+ <log>
+ <logId>knox_gateway</logId>
+ </log>
+ <log>
+ <logId>knox_cli</logId>
+ </log>
+ <log>
+ <logId>knox_ldap</logId>
+ </log>
+ </logs>
+ <customCommands>
+ <customCommand>
+ <name>STARTDEMOLDAP</name>
+ <commandScript>
+ <script>scripts/knox_gateway.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ <customCommand>
+ <name>STOPDEMOLDAP</name>
+ <commandScript>
+ <script>scripts/knox_gateway.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
</component>
</components>
<commandScript>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml
index 52fb4ac..bd1b193 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml
@@ -59,6 +59,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>oozie_app</logId>
+ </log>
+ </logs>
</component>
<component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
index f12d695..f1e377b 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
@@ -60,6 +60,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>oozie_app</logId>
+ </log>
+ </logs>
</component>
<component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
index eac60f9..3e59f91 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml
@@ -39,6 +39,14 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>ranger_admin</logId>
+ </log>
+ <log>
+ <logId>ranger_dbpatch</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -51,10 +59,15 @@
<script>scripts/ranger_usersync.py</script>
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
- </commandScript>
+ </commandScript>
+ <logs>
+ <log>
+ <logId>ranger_usersync</logId>
+ </log>
+ </logs>
</component>
- </components>
+ </components>
<configuration-dependencies>
<config-type>admin-properties</config-type>
@@ -65,7 +78,7 @@
<commandScript>
<script>scripts/service_check.py</script>
<scriptType>PYTHON</scriptType>
- <timeout>300</timeout>
+ <timeout>300</timeout>
</commandScript>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
index 74c5697..f61059b 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
@@ -39,6 +39,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>ranger_kms</logId>
+ </log>
+ </logs>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
index 804374a..08286f3 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml
@@ -46,6 +46,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>storm_nimbus</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -59,6 +64,14 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>storm_logviewer</logId>
+ </log>
+ <log>
+ <logId>storm_worker</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -72,6 +85,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>storm_supervisor</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -85,6 +103,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>storm_ui</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -98,6 +121,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>storm_drpc</logId>
+ </log>
+ </logs>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml
index 0f71585..592631e 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml
@@ -37,6 +37,23 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>mapred_historyserver</logId>
+ </log>
+ <log>
+ <logId>yarn_resourcemanager</logId>
+ </log>
+ <log>
+ <logId>yarn_timelineserver</logId>
+ </log>
+ <log>
+ <logId>yarn_historyserver</logId>
+ </log>
+ <log>
+ <logId>yarn_jobsummary</logId>
+ </log>
+ </logs>
<customCommands>
<customCommand>
<name>DECOMMISSION</name>
@@ -72,6 +89,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>yarn_nodemanager</logId>
+ </log>
+ </logs>
</component>
<component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/metainfo.xml
index 4d14725..e9e8407 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/metainfo.xml
@@ -36,6 +36,11 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>zookeeper</logId>
+ </log>
+ </logs>
</component>
<component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 3c8c5a3..2730463 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -183,6 +183,28 @@ public class AmbariMetaInfoTest {
}
@Test
+ public void getLogs() throws AmbariException {
+ ComponentInfo component;
+
+ component = metaInfo.getComponent(STACK_NAME_HDP, "2.1.1", SERVICE_NAME_HDFS, "NAMENODE");
+ assertNotNull(component);
+ assertNotNull(component.getLogs());
+ assertTrue(component.getLogs().size() == 2);
+ assertEquals(component.getLogs().get(0).getLogId(), "hdfs_namenode");
+ assertEquals(component.getLogs().get(1).getLogId(), "hdfs_audit");
+
+ component = metaInfo.getComponent(STACK_NAME_HDP, "2.1.1", SERVICE_NAME_HDFS, "DATANODE");
+ assertNotNull(component);
+ assertNotNull(component.getLogs());
+ assertTrue(component.getLogs().size() == 1);
+ assertEquals(component.getLogs().get(0).getLogId(), "hdfs_datanode");
+
+ component = metaInfo.getComponent(STACK_NAME_HDP, "2.1.1", SERVICE_NAME_HDFS, "HDFS_CLIENT");
+ assertNotNull(component);
+ assertNull(component.getLogs());
+ }
+
+ @Test
public void getRepository() throws AmbariException {
Map<String, List<RepositoryInfo>> repository = metaInfo.getRepository(
STACK_NAME_HDP, STACK_VERSION_HDP);
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bc68e16/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/HDFS/metainfo.xml
index d3bef74..f23d0d7 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/services/HDFS/metainfo.xml
@@ -32,6 +32,14 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_namenode</logId>
+ </log>
+ <log>
+ <logId>hdfs_audit</logId>
+ </log>
+ </logs>
<customCommands>
<customCommand>
<name>DECOMMISSION</name>
@@ -60,6 +68,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_datanode</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -70,6 +83,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_secondarynamenode</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -90,6 +108,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_journalnode</logId>
+ </log>
+ </logs>
</component>
<component>
@@ -100,6 +123,11 @@
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
+ <logs>
+ <log>
+ <logId>hdfs_zkfc</logId>
+ </log>
+ </logs>
</component>
</components>