You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/04/01 17:57:09 UTC
ambari git commit: AMBARI-9849 .log Files are not placed in the
changed directory in Ambari 1.6 and 1.7 (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 75f9c51f6 -> 1eb9315d1
AMBARI-9849 .log Files are not placed in the changed directory in Ambari 1.6 and 1.7 (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1eb9315d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1eb9315d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1eb9315d
Branch: refs/heads/trunk
Commit: 1eb9315d15fbd97b79b7d58eec2c450b9b6e82ec
Parents: 75f9c51
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Apr 1 18:56:48 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Apr 1 18:56:48 2015 +0300
----------------------------------------------------------------------
.../STORM/0.9.1.2.1/configuration/storm-env.xml | 3 +++
.../STORM/0.9.1.2.1/configuration/storm-site.xml | 5 -----
.../stacks/HDP/2.2/services/STORM/configuration/storm-site.xml | 6 ++++++
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1eb9315d/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
index d79629a..c1850e9 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
@@ -55,6 +55,9 @@
# The java implementation to use.
export JAVA_HOME={{java64_home}}
+# Storm log folder
+export STORM_LOG_DIR={{log_dir}}
+
# export STORM_CONF_DIR=""
</value>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1eb9315d/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
index 2d7b97a..b1cf129 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
@@ -37,11 +37,6 @@
have permission to read/write from this location.</description>
</property>
<property>
- <name>storm.log.dir</name>
- <value>{{log_dir}}</value>
- <description>Log directory for Storm.</description>
- </property>
- <property>
<name>storm.zookeeper.servers</name>
<value>['localhost']</value>
<description>A list of hosts of ZooKeeper servers used to manage the cluster.</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1eb9315d/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
index f894ddd..aaf027d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml
@@ -94,4 +94,10 @@
<value>null</value>
<description>min.user.id is set to the first real user id on the system. If value is 'null' than default value will be taken from key UID_MIN of /etc/login.defs otherwise the specified value will be used for all hosts.</description>
</property>
+
+ <property>
+ <name>storm.log.dir</name>
+ <value>{{log_dir}}</value>
+ <description>Log directory for Storm.</description>
+ </property>
</configuration>