Repository: ambari Updated Branches: refs/heads/branch-1.7.0 31c96b840 -> aaf7bcbe3
Revert "AMBARI-8216. Change hive settings to configure transactions. With some yarn-site changes. (swagle)" This reverts commit 38c1ab8b6c6a56fc01d802095b0af142a1ff9dca. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aaf7bcbe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aaf7bcbe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aaf7bcbe Branch: refs/heads/branch-1.7.0 Commit: aaf7bcbe352c2af52d0be8a18f1739e06b11e5c8 Parents: 31c96b8 Author: Mahadev Konar <maha...@apache.org> Authored: Fri Nov 7 17:41:53 2014 -0800 Committer: Mahadev Konar <maha...@apache.org> Committed: Fri Nov 7 17:42:40 2014 -0800 ---------------------------------------------------------------------- .../services/HIVE/configuration/hive-site.xml | 18 +---- .../services/YARN/configuration/yarn-site.xml | 76 ++++++-------------- 2 files changed, 23 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/aaf7bcbe/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index 12b4612..2e0e12f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -221,11 +221,10 @@ limitations under the License. <property> <name>hive.exec.dynamic.partition.mode</name> - <value>nonstrict</value> + <value>strict</value> <description> In strict mode, the user must specify at least one static partition in case the user accidentally overwrites all partitions. - NonStrict allows all partitions of a table to be dynamic. </description> </property> @@ -661,21 +660,6 @@ limitations under the License. </description> </property> - <property> - <name>hive.support.concurrency</name> - <value>false</value> - <description> - Support concurrency and use locks, needed for Transactions. Requires Zookeeper. - </description> - </property> - - <property> - <name>hive.cli.print.header</name> - <value>false</value> - <description> - Whether to print the names of the columns in query output. - </description> - </property> <property> <name>hive.compactor.worker.timeout</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/aaf7bcbe/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml index be96c64..b4f6558 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml @@ -42,16 +42,13 @@ </property> <property> <name>yarn.nodemanager.recovery.enabled</name> - <value>true</value> - <description>Enable the node manager to recover after starting</description> + <value>1</value> + <description></description> </property> <property> <name>yarn.nodemanager.recovery.dir</name> <value>/hadoop/yarn/yarn-nm-recovery</value> - <description> - The local filesystem directory in which the node manager will store - state when recovery is enabled. - </description> + <description></description> </property> <property> <name>yarn.client.nodemanager-connect.retry-interval-ms</name> @@ -65,28 +62,18 @@ </property> <property> <name>yarn.resourcemanager.recovery.enabled</name> - <value>true</value> - <description> - Enable RM to recover state after starting. - If true, then yarn.resourcemanager.store.class must be specified. - </description> + <value>1</value> + <description></description> </property> <property> <name>yarn.resourcemanager.work-preserving-recovery.enabled</name> - <value>true</value> - <description> - Enable RM work preserving recovery. This configuration is private to YARN for experimenting the feature. - </description> + <value>1</value> + <description></description> </property> <property> <name>yarn.resourcemanager.store.class</name> <value>org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore</value> - <description> - The class to use as the persistent store. - If org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore is used, - the store is implicitly fenced; meaning a single ResourceManager - is able to use the store at any point in time. - </description> + <description></description> </property> <property> <name>yarn.resourcemanager.zk-address</name> @@ -156,7 +143,7 @@ </property> <property> <name>yarn.resourcemanager.ha.enabled</name> - <value>false</value> + <value>0</value> <description>enable RM HA or not</description> </property> <property> @@ -171,12 +158,12 @@ </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.mount</name> - <value>true</value> + <value>1</value> <description>If true, YARN will automount the CGroup, however the directory needs to already exist; else, the cgroup should be mounted by the admin</description> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name> - <value>false</value> + <value>0</value> <description>Strictly limit CPU resource usage to allocated usage even if spare CPU is available</description> </property> <property> @@ -216,11 +203,8 @@ </property> <property> <name>yarn.nodemanager.log-aggregation.debug-enabled</name> - <value>false</value> - <description> - This configuration is for debug and test purpose. - By setting this configuration as true. - We can break the lower bound of yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</description> + <value>0</value> + <description>This configuration is for debug and test purpose. By setting this configuration as true. We can break the lower bound of yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</description> </property> <property> <name>yarn.nodemanager.log-aggregation.num-log-files-per-app</name> @@ -229,7 +213,7 @@ </property> <property> <name>yarn.resourcemanager.system-metrics-publisher.enabled</name> - <value>true</value> + <value>1</value> <description></description> </property> <property> @@ -250,43 +234,32 @@ <property> <name>yarn.timeline-service.ttl-enable</name> <value>true</value> - <description> - Enable age off of timeline store data. - </description> + <description></description> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.path</name> <value>/hadoop/yarn/timeline</value> - <description>Store file name for leveldb timeline store.</description> + <description></description> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.read-cache-size</name> <value>104857600</value> - <description> - Size of read cache for uncompressed blocks for leveldb timeline store in bytes. - </description> + <description></description> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.start-time-read-cache-size</name> <value>10000</value> - <description> - Size of cache for recently read entity start times for leveldb timeline store in number of entities. - </description> + <description></description> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.start-time-write-cache-size</name> <value>10000</value> - <description> - Size of cache for recently written entity start times for leveldb timeline store in number of entities. - </description> + <description></description> </property> <property> <name>yarn.timeline-service.http-authentication.type</name> <value>simple</value> - <description> - Defines authentication used for the Timeline Server HTTP endpoint. - Supported values are: simple | kerberos | $AUTHENTICATION_HANDLER_CLASSNAME - </description> + <description></description> </property> <property> <name>yarn.timeline-service.http-authentication.simple.anonymous.allowed</name> @@ -295,13 +268,8 @@ </property> <property> <name>yarn.resourcemanager.webapp.delegation-token-auth-filter.enabled</name> - <value>false</value> - <description> - Flag to enable override of the default kerberos authentication filter with - the RM authentication filter to allow authentication using delegation - tokens(fallback to kerberos if the tokens are missing). - Only applicable when the http authentication type is kerberos. - </description> + <value>0</value> + <description></description> </property> <property> <name>yarn.resourcemanager.bind-host</name>
