Repository: ambari Updated Branches: refs/heads/trunk 1d01a85ad -> f74ec8712
AMBARI-14129 No error appeared after pid dir and log dir property set to value with space at start. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f74ec871 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f74ec871 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f74ec871 Branch: refs/heads/trunk Commit: f74ec8712beb8414cbbe830aee16266bf4bd197e Parents: 1d01a85 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Tue Dec 1 13:57:44 2015 +0200 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Tue Dec 1 14:01:58 2015 +0200 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/configuration/ams-env.xml | 12 ++++++++++++ .../0.1.0/configuration/ams-hbase-env.xml | 6 ++++++ .../0.1.0/configuration/ams-hbase-site.xml | 6 ++++++ .../AMBARI_METRICS/0.1.0/configuration/ams-site.xml | 3 +++ .../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 3 +++ .../SPARK/1.2.0.2.2/configuration/spark-env.xml | 6 ++++++ .../0.8/services/HBASE/configuration/hbase-env.xml | 6 ++++++ .../0.8/services/HBASE/configuration/hbase-site.xml | 3 +++ .../services/HBASE/configuration/hbase-site.xml | 3 +++ .../services/HBASE/configuration/hbase-site.xml | 3 +++ .../HDP/2.2/services/HBASE/configuration/hbase-env.xml | 2 ++ .../services/HBASE/configuration/hbase-site.xml | 3 +++ .../services/AMBARI_METRICS/configuration/ams-env.xml | 12 ++++++++++++ 13 files changed, 68 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml index 41d8912..8384767 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml @@ -34,24 +34,36 @@ <value>/var/log/ambari-metrics-collector</value> <display-name>Metrics Collector log dir</display-name> <description>Collector log directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>metrics_collector_pid_dir</name> <value>/var/run/ambari-metrics-collector</value> <display-name>Metrics Collector pid dir</display-name> <description>Collector pid directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>metrics_monitor_pid_dir</name> <value>/var/run/ambari-metrics-monitor</value> <display-name>Metrics Monitor pid dir</display-name> <description>Monitor pid directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>metrics_monitor_log_dir</name> <value>/var/log/ambari-metrics-monitor</value> <display-name>Metrics Monitor log dir</display-name> <description>Monitor log directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>metrics_collector_heapsize</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml index d475932..a061006 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml @@ -25,11 +25,17 @@ <name>hbase_log_dir</name> <value>/var/log/ambari-metrics-collector</value> <description>Log Directories for HBase.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase_pid_dir</name> <value>/var/run/ambari-metrics-collector/</value> <description>Pid Directory for HBase.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase_classpath_additional</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml index 3f4a9d4..33ac1b7 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml @@ -39,6 +39,9 @@ than '/tmp' (The '/tmp' directory is often cleared on machine restart). </description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase.local.dir</name> @@ -313,6 +316,9 @@ Set directory for Phoenix spill files. If possible set this to a different mount point from the one for hbase.rootdir in embedded mode. </description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>phoenix.mutate.batchSize</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml index 04b7806..4237f21 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml @@ -406,6 +406,9 @@ Set directory for Phoenix spill files. If possible set this to a different mount point from the one for hbase.rootdir in embedded mode. </description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>timeline.metrics.service.cluster.aggregator.appIds</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 773a8c9..cabd4fd 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -117,6 +117,9 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <name>hbase_java_io_tmpdir</name> <value>/tmp</value> <description>Used in hbase-env.sh as HBASE_OPTS=-Djava.io.tmpdir=java_io_tmpdir</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml index 7374972..24b373b 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml @@ -46,11 +46,17 @@ <name>spark_log_dir</name> <value>/var/log/spark</value> <description>Spark Log Dir</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>spark_pid_dir</name> <value>/var/run/spark</value> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <!-- spark-env.sh --> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml index 732d0e4..81f392f 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml @@ -25,11 +25,17 @@ <name>hbase_log_dir</name> <value>/var/log/hbase</value> <description>Log Directories for HBase.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase_pid_dir</name> <value>/var/run/hbase</value> <description>Pid Directory for HBase.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase_regionserver_heapsize</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml index 84900d1..62b1a2c 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-site.xml @@ -55,6 +55,9 @@ than '/tmp' (The '/tmp' directory is often cleared on machine restart). </description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase.local.dir</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml index cf8ddd3..c9a5220 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HBASE/configuration/hbase-site.xml @@ -55,6 +55,9 @@ than '/tmp' (The '/tmp' directory is often cleared on machine restart). </description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase.local.dir</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml index 8bdd8d5..6354d44 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HBASE/configuration/hbase-site.xml @@ -59,6 +59,9 @@ than '/tmp' (The '/tmp' directory is often cleared on machine restart). </description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase.local.dir</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml index d4a6aac..7aafa86 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml @@ -27,6 +27,7 @@ <display-name>HBase Log Dir Prefix</display-name> <description>Log Directories for HBase.</description> <value-attributes> + <type>directory</type> <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> @@ -37,6 +38,7 @@ <display-name>HBase PID Dir</display-name> <description>Pid Directory for HBase.</description> <value-attributes> + <type>directory</type> <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml index 82b6e09..1895169 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HBASE/configuration/hbase-site.xml @@ -56,6 +56,9 @@ than '/tmp' (The '/tmp' directory is often cleared on machine restart). </description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>hbase.local.dir</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/f74ec871/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml index 5dfa769..efb44d1 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml @@ -28,24 +28,36 @@ <value>C:\var\log\ambari-metrics-collector</value> <display-name>Metrics Collector log dir</display-name> <description>Collector log directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>metrics_collector_pid_dir</name> <value>C:\var\run\ambari-metrics-collector</value> <display-name>Metrics Collector pid dir</display-name> <description>Collector pid directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>metrics_monitor_pid_dir</name> <value>C:\var\run\ambari-metrics-monitor</value> <display-name>Metrics Monitor pid dir</display-name> <description>Monitor pid directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property> <name>metrics_monitor_log_dir</name> <value>C:\var\log\ambari-metrics-monitor</value> <display-name>Metrics Monitor log dir</display-name> <description>Monitor log directory.</description> + <value-attributes> + <type>directory</type> + </value-attributes> </property> <property>