Repository: ambari Updated Branches: refs/heads/trunk 79437ef2b -> df12905a4
AMBARI-11604: [WinTP2]: Hive Enhanced Configs not loading on Windows (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df12905a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df12905a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df12905a Branch: refs/heads/trunk Commit: df12905a44300e2bf9107a0f408f54aeaba10eca Parents: 79437ef Author: Jayush Luniya <[email protected]> Authored: Tue Jun 2 12:02:43 2015 -0700 Committer: Jayush Luniya <[email protected]> Committed: Tue Jun 2 12:02:43 2015 -0700 ---------------------------------------------------------------------- ambari-server/conf/windows/log4j.properties | 2 +- .../python/ambari_server/serverConfiguration.py | 2 +- .../services/HIVE/configuration/hive-site.xml | 238 ------------------- .../app/controllers/wizard/step7_controller.js | 2 +- 4 files changed, 3 insertions(+), 241 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/df12905a/ambari-server/conf/windows/log4j.properties ---------------------------------------------------------------------- diff --git a/ambari-server/conf/windows/log4j.properties b/ambari-server/conf/windows/log4j.properties index 4b5232f..607cdf9 100644 --- a/ambari-server/conf/windows/log4j.properties +++ b/ambari-server/conf/windows/log4j.properties @@ -18,7 +18,7 @@ # Define some default values that can be overridden by system properties ambari.root.logger=INFO,DRFA -ambari.log.dir=\\var\\log\\ambari-server-1.3.0-SNAPSHOT\\ +ambari.log.dir=\\var\\log\\ambari-server\\ ambari.log.file=ambari-server.log ambari.config-changes.file=ambari-config-changes.log ambari.alerts.file=ambari-alerts.log http://git-wip-us.apache.org/repos/asf/ambari/blob/df12905a/ambari-server/src/main/python/ambari_server/serverConfiguration.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py index fec54e9..b12228a 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -369,7 +369,7 @@ def get_conf_dir(): return conf_dir except KeyError: default_conf_dir = configDefaults.DEFAULT_CONF_DIR - print AMBARI_CONF_VAR + " is not set, using default " + default_conf_dir + print_info_msg(AMBARI_CONF_VAR + " is not set, using default " + default_conf_dir) return default_conf_dir def find_properties_file(): http://git-wip-us.apache.org/repos/asf/ambari/blob/df12905a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HIVE/configuration/hive-site.xml deleted file mode 100644 index 1aaacb8..0000000 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HIVE/configuration/hive-site.xml +++ /dev/null @@ -1,238 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. ---> - -<configuration supports_final="true"> - - <property> - <name>hive.cbo.enable</name> - <value>true</value> - <description>Flag to control enabling Cost Based Optimizations using Calcite framework.</description> - </property> - - <property> - <name>hive.exec.reducers.bytes.per.reducer</name> - <value>67108864</value> - <description>Defines the size per reducer. For example, if it is set to 64M, given 256M input size, 4 reducers will be used.</description> - </property> - - <property> - <name>hive.exec.dynamic.partition.mode</name> - <value>nonstrict</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> - - <property> - <name>hive.exec.orc.default.stripe.size</name> - <value>67108864</value> - <description>Define the default ORC stripe size</description> - </property> - - <property> - <name>hive.exec.orc.default.compress</name> - <value>ZLIB</value> - <description>Define the default compression codec for ORC file</description> - </property> - - <property> - <name>hive.tez.log.level</name> - <value>INFO</value> - <description> - The log level to use for tasks executing as part of the DAG. - Used only if hive.tez.java.opts is used to configure Java options. - </description> - </property> - <property> - <name>hive.enforce.bucketing</name> - <value>true</value> - <description>Whether bucketing is enforced. If true, while inserting into the table, bucketing is enforced.</description> - </property> - - <property> - <name>hive.optimize.sort.dynamic.partition</name> - <value>false</value> - <description> - When enabled dynamic partitioning column will be globally sorted. - This way we can keep only one record writer open for each partition value - in the reducer thereby reducing the memory pressure on reducers. - </description> - </property> - - <property> - <name>hive.stats.fetch.partition.stats</name> - <value>true</value> - <description> - Annotation of operator tree with statistics information requires partition level basic - statistics like number of rows, data size and file size. Partition statistics are fetched from - metastore. Fetching partition statistics for each needed partition can be expensive when the - number of partitions is high. This flag can be used to disable fetching of partition statistics - from metastore. When this flag is disabled, Hive will make calls to filesystem to get file sizes - and will estimate the number of rows from row schema. - </description> - </property> - <property> - <name>hive.stats.fetch.column.stats</name> - <value>false</value> - <description> - Annotation of operator tree with statistics information requires column statistics. - Column statistics are fetched from metastore. Fetching column statistics for each needed column - can be expensive when the number of columns is high. This flag can be used to disable fetching - of column statistics from metastore. - </description> - </property> - - <property> - <name>hive.txn.manager</name> - <value>org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager</value> - <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.security.authorization.enabled</name> - <value>false</value> - <description>enable or disable the Hive client authorization</description> - </property> - - <property> - <name>hive.security.metastore.authorization.manager</name> - <value>org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider</value> - <description> - authorization manager class name to be used in the metastore for authorization. - The user defined authorization class should implement interface - org.apache.hadoop.hive.ql.security.authorization.HiveMetastoreAuthorizationProvider. - </description> - </property> - - <property> - <name>hive.server2.authentication</name> - <description>Authentication mode, default NONE. Options are NONE, NOSASL, KERBEROS, LDAP, PAM and CUSTOM</description> - <value>NONE</value> - </property> - - <property> - <name>hive.server2.enable.doAs</name> - <value>true</value> - <description> - Setting this property to true will have HiveServer2 execute - Hive operations as the user making the calls to it. - </description> - </property> - - <property> - <name>hive.server2.use.SSL</name> - <value>false</value> - <description/> - </property> - - <property> - <name>hive.prewarm.enabled</name> - <value>false</value> - <description>Enables container prewarm for Tez (Hadoop 2 only)</description> - </property> - <property> - <name>hive.prewarm.numcontainers</name> - <value>10</value> - <description>Controls the number of containers to prewarm for Tez (Hadoop 2 only)</description> - </property> - - <property> - <name>hive.tez.auto.reducer.parallelism</name> - <value>false</value> - <description> - Turn on Tez' auto reducer parallelism feature. When enabled, Hive will still estimate data sizes - and set parallelism estimates. Tez will sample source vertices' output sizes and adjust the estimates at runtime as - necessary. - </description> - </property> - - <property> - <name>hive.tez.dynamic.partition.pruning</name> - <value>true</value> - <description>When dynamic pruning is enabled, joins on partition keys will be processed by sending events from the processing vertices to the tez application master. These events will be used to prune unnecessary partitions.</description> - </property> - - <!-- performance --> - - <property> - <name>hive.vectorized.execution.enabled</name> - <value>true</value> - <description> - This flag should be set to true to enable vectorized mode of query execution. - The default value is false. - </description> - </property> - - <property> - <name>hive.vectorized.execution.reduce.enabled</name> - <value>false</value> - <description> - This flag should be set to true to enable vectorized mode of the reduce-side of query execution. - The default value is true. - </description> - </property> - - <property> - <name>hive.optimize.index.filter</name> - <value>true</value> - <description>Whether to enable automatic use of indexes</description> - </property> - - <property> - <name>hive.compute.query.using.stats</name> - <value>true</value> - <description> - When set to true Hive will answer a few queries like count(1) purely using stats - stored in metastore. For basic stats collection turn on the config hive.stats.autogather to true. - For more advanced stats collection need to run analyze table queries. - </description> - </property> - - <property> - <name>hive.server2.tez.sessions.per.default.queue</name> - <value>1</value> - <description> - A positive integer that determines the number of Tez sessions that should be - launched on each of the queues specified by "hive.server2.tez.default.queues". - Determines the parallelism on each queue. - </description> - </property> - - <property> - <name>hive.server2.tez.initialize.default.sessions</name> - <value>false</value> - <description> - This flag is used in HiveServer2 to enable a user to use HiveServer2 without - turning on Tez for HiveServer2. The user could potentially want to run queries - over Tez without the pool of sessions. - </description> - </property> - - -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/df12905a/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 8550932..cd7fbe7 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -684,7 +684,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E }); var rangerService = App.StackService.find().findProperty('serviceName', 'RANGER'); - if (!rangerService.get('isInstalled') && !rangerService.get('isSelected')) { + if (rangerService && !rangerService.get('isInstalled') && !rangerService.get('isSelected')) { App.config.removeRangerConfigs(self.get('stepConfigs')); } self.updateDependentConfigs();
