Repository: ambari Updated Branches: refs/heads/trunk d2cad200f -> 87ff159bb
AMBARI-17032. Fix files mentioned by ServicePropertiesTest on latest commits (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87ff159b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87ff159b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87ff159b Branch: refs/heads/trunk Commit: 87ff159bb513267e9629806c248084272e1a61b7 Parents: d2cad20 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Tue Jun 7 14:18:26 2016 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Tue Jun 7 14:18:55 2016 +0300 ---------------------------------------------------------------------- .../HDP/2.5/services/SPARK/configuration/livy-conf.xml | 8 ++++++++ .../HDP/2.5/services/SPARK/configuration/livy-env.xml | 12 ++++++++++++ .../SPARK/configuration/livy-log4j-properties.xml | 2 ++ .../SPARK/configuration/livy-spark-blacklist.xml | 2 ++ 4 files changed, 24 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/87ff159b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml index d0acdda..1f6ee21 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml @@ -29,6 +29,8 @@ mode, Livy will enable debugging options, such as reporting possible routes on a 404. defaults to development </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> @@ -37,6 +39,8 @@ <description> What port to start the server on. Defaults to 8998. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> @@ -46,6 +50,8 @@ Time in milliseconds on how long Livy will wait before timing out an idle session. Default is one hour. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> @@ -54,6 +60,8 @@ <description> If livy should use proxy users when submitting a job. </description> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/87ff159b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml index 410a1c1..60a13a9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml @@ -30,6 +30,8 @@ <type>user</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> @@ -41,6 +43,8 @@ <value-attributes> <type>user</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> @@ -50,6 +54,8 @@ <value-attributes> <type>directory</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> @@ -58,6 +64,8 @@ <value-attributes> <type>directory</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <property> @@ -66,6 +74,8 @@ <value-attributes> <type>directory</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> <!-- livy-env.sh --> @@ -87,6 +97,8 @@ <value-attributes> <type>content</type> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/87ff159b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml index d84207a..630c42d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml @@ -37,5 +37,7 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/87ff159b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml index 4a5fbfb..41e8f6f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml @@ -36,5 +36,7 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> + <on-ambari-upgrade add="false" change="true" delete="true"/> + <on-stack-upgrade add="true" change="true" delete="false"/> </property> </configuration> \ No newline at end of file
