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/04/10 17:23:16 UTC
ambari git commit: AMBARI-9849. .log Files are not placed in the
changed directory in Ambari 1.6 and 1.7
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint d1acddade -> c558acc5d
AMBARI-9849. .log Files are not placed in the changed directory in Ambari 1.6 and 1.7
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c558acc5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c558acc5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c558acc5
Branch: refs/heads/branch-2.0.maint
Commit: c558acc5d27402c5a7c19f0bc037f6eb43971a68
Parents: d1acdda
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Apr 10 18:22:20 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Apr 10 18:23:07 2015 +0300
----------------------------------------------------------------------
.../common-services/STORM/0.9.1.2.1/configuration/storm-env.xml | 3 +++
.../STORM/0.9.1.2.1/package/templates/storm.yaml.j2 | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c558acc5/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 c663116..30ea7f8 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
@@ -50,6 +50,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/c558acc5/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.yaml.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.yaml.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.yaml.j2
index cc3e631..72b74fb 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.yaml.j2
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm.yaml.j2
@@ -62,4 +62,6 @@ topology.metrics.consumer.register:
metrics.reporter.register: "org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsReporter"
{% endif %}
-storm.log.dir: "{{log_dir}}"
\ No newline at end of file
+{% if stack_is_hdp22_or_further %}
+storm.log.dir: "{{log_dir}}"
+{% endif %}
\ No newline at end of file