AMBARI-17971. Ambari upgrade to 2.4.0 adds several config properties that are not necessary and some are incorrect (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00a44d8a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00a44d8a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00a44d8a Branch: refs/heads/branch-2.4 Commit: 00a44d8af0eca48f2c953c9d53c3cec2290a09dd Parents: f533754 Author: Sumit Mohanty <[email protected]> Authored: Tue Aug 2 18:43:32 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue Aug 2 18:43:32 2016 -0700 ---------------------------------------------------------------------- .../configuration/application-properties.xml | 8 +- .../0.1.0.2.3/configuration/atlas-log4j.xml | 6 +- .../configuration/atlas-solrconfig.xml | 641 ------------------- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 13 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 2 +- .../configuration/atlas-solrconfig.xml | 641 +++++++++++++++++++ .../falcon-atlas-application.properties.xml | 61 -- .../0.9.0/configuration/ranger-kafka-audit.xml | 32 +- .../ranger-kafka-plugin-properties.xml | 12 +- .../ranger-kafka-policymgr-ssl.xml | 12 +- .../configuration/ranger-kafka-security.xml | 12 +- .../ranger-knox-plugin-properties.xml | 60 +- .../1.4.4.2.0/configuration/sqoop-site.xml | 4 +- .../0.10.0/configuration/ranger-storm-audit.xml | 32 +- .../ranger-storm-policymgr-ssl.xml | 12 +- .../configuration/ranger-storm-security.xml | 12 +- .../STORM/0.9.1/configuration/storm-site.xml | 2 +- .../ranger-storm-plugin-properties.xml | 58 +- .../services/HBASE/configuration/hbase-env.xml | 2 +- .../services/HBASE/configuration/hbase-site.xml | 14 +- .../ranger-hbase-plugin-properties.xml | 60 +- .../ranger-hdfs-plugin-properties.xml | 60 +- .../ranger-hive-plugin-properties.xml | 60 +- .../ranger-knox-plugin-properties.xml | 2 +- .../HBASE/configuration/ranger-hbase-audit.xml | 32 +- .../ranger-hbase-policymgr-ssl.xml | 12 +- .../configuration/ranger-hbase-security.xml | 14 +- .../HDFS/configuration/ranger-hdfs-audit.xml | 32 +- .../configuration/ranger-hdfs-policymgr-ssl.xml | 12 +- .../HDFS/configuration/ranger-hdfs-security.xml | 14 +- .../HIVE/configuration/ranger-hive-audit.xml | 32 +- .../configuration/ranger-hive-policymgr-ssl.xml | 12 +- .../HIVE/configuration/ranger-hive-security.xml | 14 +- .../ranger-kafka-policymgr-ssl.xml | 4 +- .../KNOX/configuration/ranger-knox-audit.xml | 32 +- .../configuration/ranger-knox-policymgr-ssl.xml | 12 +- .../KNOX/configuration/ranger-knox-security.xml | 12 +- .../ranger-storm-policymgr-ssl.xml | 4 +- .../configuration/ranger-storm-security.xml | 2 +- .../YARN/configuration/ranger-yarn-audit.xml | 32 +- .../ranger-yarn-plugin-properties.xml | 12 +- .../configuration/ranger-yarn-policymgr-ssl.xml | 12 +- .../YARN/configuration/ranger-yarn-security.xml | 12 +- .../services/YARN/configuration/yarn-site.xml | 9 - .../ATLAS/configuration/ranger-atlas-audit.xml | 6 +- .../ranger-atlas-plugin-properties.xml | 10 +- .../ranger-atlas-policymgr-ssl.xml | 12 +- .../configuration/ranger-atlas-security.xml | 14 +- .../falcon-atlas-application.properties.xml | 61 ++ .../ranger-hdfs-plugin-properties.xml | 2 +- .../configuration/ranger-kms-audit.xml | 4 +- .../ranger-storm-policymgr-ssl.xml | 4 +- .../configuration/ranger-storm-security.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 19 +- 54 files changed, 1135 insertions(+), 1134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml index 108c7b4..9efa4f9 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml @@ -126,7 +126,7 @@ <name>atlas.notification.embedded</name> <value>false</value> <description>Indicates whether or not the notification service should be embedded.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- atlas.cluster.name is also part of Atlas Hooks --> @@ -134,7 +134,7 @@ <name>atlas.cluster.name</name> <value>{{cluster_name}}</value> <description>The cluster name.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> @@ -154,12 +154,12 @@ <name>atlas.audit.hbase.tablename</name> <value>ATLAS_ENTITY_AUDIT_EVENTS</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.audit.zookeeper.session.timeout.ms</name> <value>1000</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml index a071442..753232a 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-log4j.xml @@ -24,13 +24,13 @@ <name>atlas_log_level</name> <value>info</value> <description>Log level for atlas logging</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>audit_log_level</name> <value>info</value> <description>Log level for audit logging</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>content</name> @@ -125,6 +125,6 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-solrconfig.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-solrconfig.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-solrconfig.xml deleted file mode 100644 index 35e9f58..0000000 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-solrconfig.xml +++ /dev/null @@ -1,641 +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_adding_forbidden="true"> - <property> - <name>content</name> - <display-name>atlas-solrconfig template</display-name> - <description>Atlas Solr configuration</description> - <value><![CDATA[<?xml version="1.0" encoding="UTF-8" ?> -<!-- - 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. ---> - -<!-- - *** - For more details about configurations options that may appear in - this file, see http://wiki.apache.org/solr/SolrConfigXml. ---> -<config> - <!-- In all configuration below, a prefix of "solr." for class names - is an alias that causes solr to search appropriate packages, - including org.apache.solr.(search|update|request|core|analysis) - - You may also specify a fully qualified Java classname if you - have your own custom plugins. - --> - - <!-- Controls what version of Lucene various components of Solr - adhere to. Generally, you want to use the latest version to - get all bug fixes and improvements. It is highly recommended - that you fully re-index after changing this setting as it can - affect both how text is indexed and queried. - --> - <luceneMatchVersion>5.5.1</luceneMatchVersion> - - <!-- Data Directory - - Used to specify an alternate directory to hold all index data - other than the default ./data under the Solr home. If - replication is in use, this should match the replication - configuration. - --> - <dataDir>${solr.data.dir:}</dataDir> - - - <!-- The DirectoryFactory to use for indexes. - - solr.StandardDirectoryFactory is filesystem - based and tries to pick the best implementation for the current - JVM and platform. solr.NRTCachingDirectoryFactory, the default, - wraps solr.StandardDirectoryFactory and caches small files in memory - for better NRT performance. - - One can force a particular implementation via solr.MMapDirectoryFactory, - solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory. - - solr.RAMDirectoryFactory is memory based, not - persistent, and doesn't work with replication. - --> - <directoryFactory name="DirectoryFactory" - class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"> - </directoryFactory> - - <!-- The CodecFactory for defining the format of the inverted index. - The default implementation is SchemaCodecFactory, which is the official Lucene - index format, but hooks into the schema to provide per-field customization of - the postings lists and per-document values in the fieldType element - (postingsFormat/docValuesFormat). Note that most of the alternative implementations - are experimental, so if you choose to customize the index format, it's a good - idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader) - before upgrading to a newer version to avoid unnecessary reindexing. - A "compressionMode" string element can be added to <codecFactory> to choose - between the existing compression modes in the default codec: "BEST_SPEED" (default) - or "BEST_COMPRESSION". - --> - <codecFactory class="solr.SchemaCodecFactory"/> - - <!-- To disable dynamic schema REST APIs, use the following for <schemaFactory>: - - <schemaFactory class="ClassicIndexSchemaFactory"/> - - When ManagedIndexSchemaFactory is specified instead, Solr will load the schema from - the resource named in 'managedSchemaResourceName', rather than from schema.xml. - Note that the managed schema resource CANNOT be named schema.xml. If the managed - schema does not exist, Solr will create it after reading schema.xml, then rename - 'schema.xml' to 'schema.xml.bak'. - - Do NOT hand edit the managed schema - external modifications will be ignored and - overwritten as a result of schema modification REST API calls. - - When ManagedIndexSchemaFactory is specified with mutable = true, schema - modification REST API calls will be allowed; otherwise, error responses will be - sent back for these requests. - --> - <schemaFactory class="ManagedIndexSchemaFactory"> - <bool name="mutable">true</bool> - <str name="managedSchemaResourceName">managed-schema</str> - </schemaFactory> - - <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Index Config - These settings control low-level behavior of indexing - Most example settings here show the default value, but are commented - out, to more easily see where customizations have been made. - - Note: This replaces <indexDefaults> and <mainIndex> from older versions - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <indexConfig> - - <!-- LockFactory - - This option specifies which Lucene LockFactory implementation - to use. - - single = SingleInstanceLockFactory - suggested for a - read-only index or when there is no possibility of - another process trying to modify the index. - native = NativeFSLockFactory - uses OS native file locking. - Do not use when multiple solr webapps in the same - JVM are attempting to share a single index. - simple = SimpleFSLockFactory - uses a plain file for locking - - Defaults: 'native' is default for Solr3.6 and later, otherwise - 'simple' is the default - - More details on the nuances of each LockFactory... - http://wiki.apache.org/lucene-java/AvailableLockFactories - --> - <lockType>${solr.lock.type:native}</lockType> - - <!-- Lucene Infostream - - To aid in advanced debugging, Lucene provides an "InfoStream" - of detailed information when indexing. - - Setting the value to true will instruct the underlying Lucene - IndexWriter to write its info stream to solr's log. By default, - this is enabled here, and controlled through log4j.properties. - --> - <infoStream>true</infoStream> - </indexConfig> - - - <!-- JMX - - This example enables JMX if and only if an existing MBeanServer - is found, use this if you want to configure JMX through JVM - parameters. Remove this to disable exposing Solr configuration - and statistics to JMX. - - For more details see http://wiki.apache.org/solr/SolrJmx - --> - <jmx /> - <!-- If you want to connect to a particular server, specify the - agentId - --> - <!-- <jmx agentId="myAgent" /> --> - <!-- If you want to start a new MBeanServer, specify the serviceUrl --> - <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/> - --> - - <!-- The default high-performance update handler --> - <updateHandler class="solr.DirectUpdateHandler2"> - - <!-- Enables a transaction log, used for real-time get, durability, and - and solr cloud replica recovery. The log can grow as big as - uncommitted changes to the index, so use of a hard autoCommit - is recommended (see below). - "dir" - the target directory for transaction logs, defaults to the - solr data directory. - "numVersionBuckets" - sets the number of buckets used to keep - track of max version values when checking for re-ordered - updates; increase this value to reduce the cost of - synchronizing access to version buckets during high-volume - indexing, this requires 8 bytes (long) * numVersionBuckets - of heap space per Solr core. - --> - <updateLog> - <str name="dir">${solr.ulog.dir:}</str> - <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int> - </updateLog> - - <!-- AutoCommit - - Perform a hard commit automatically under certain conditions. - Instead of enabling autoCommit, consider using "commitWithin" - when adding documents. - - http://wiki.apache.org/solr/UpdateXmlMessages - - maxDocs - Maximum number of documents to add since the last - commit before automatically triggering a new commit. - - maxTime - Maximum amount of time in ms that is allowed to pass - since a document was added before automatically - triggering a new commit. - openSearcher - if false, the commit causes recent index changes - to be flushed to stable storage, but does not cause a new - searcher to be opened to make those changes visible. - - If the updateLog is enabled, then it's highly recommended to - have some sort of hard autoCommit to limit the log size. - --> - <autoCommit> - <maxTime>${solr.autoCommit.maxTime:15000}</maxTime> - <openSearcher>false</openSearcher> - </autoCommit> - - <!-- softAutoCommit is like autoCommit except it causes a - 'soft' commit which only ensures that changes are visible - but does not ensure that data is synced to disk. This is - faster and more near-realtime friendly than a hard commit. - --> - <autoSoftCommit> - <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> - </autoSoftCommit> - - </updateHandler> - - <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Query section - these settings control query time things like caches - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <query> - <!-- Max Boolean Clauses - - Maximum number of clauses in each BooleanQuery, an exception - is thrown if exceeded. - - ** WARNING ** - - This option actually modifies a global Lucene property that - will affect all SolrCores. If multiple solrconfig.xml files - disagree on this property, the value at any given moment will - be based on the last SolrCore to be initialized. - - --> - <maxBooleanClauses>1024</maxBooleanClauses> - - - <!-- Solr Internal Query Caches - - There are two implementations of cache available for Solr, - LRUCache, based on a synchronized LinkedHashMap, and - FastLRUCache, based on a ConcurrentHashMap. - - FastLRUCache has faster gets and slower puts in single - threaded operation and thus is generally faster than LRUCache - when the hit ratio of the cache is high (> 75%), and may be - faster under other scenarios on multi-cpu systems. - --> - - <!-- Filter Cache - - Cache used by SolrIndexSearcher for filters (DocSets), - unordered sets of *all* documents that match a query. When a - new searcher is opened, its caches may be prepopulated or - "autowarmed" using data from caches in the old searcher. - autowarmCount is the number of items to prepopulate. For - LRUCache, the autowarmed items will be the most recently - accessed items. - - Parameters: - class - the SolrCache implementation LRUCache or - (LRUCache or FastLRUCache) - size - the maximum number of entries in the cache - initialSize - the initial capacity (number of entries) of - the cache. (see java.util.HashMap) - autowarmCount - the number of entries to prepopulate from - and old cache. - --> - <filterCache class="solr.FastLRUCache" - size="512" - initialSize="512" - autowarmCount="0"/> - - <!-- Query Result Cache - - Caches results of searches - ordered lists of document ids - (DocList) based on a query, a sort, and the range of documents requested. - Additional supported parameter by LRUCache: - maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed - to occupy - --> - <queryResultCache class="solr.LRUCache" - size="512" - initialSize="512" - autowarmCount="0"/> - - <!-- Document Cache - - Caches Lucene Document objects (the stored fields for each - document). Since Lucene internal document ids are transient, - this cache will not be autowarmed. - --> - <documentCache class="solr.LRUCache" - size="512" - initialSize="512" - autowarmCount="0"/> - - <!-- custom cache currently used by block join --> - <cache name="perSegFilter" - class="solr.search.LRUCache" - size="10" - initialSize="0" - autowarmCount="10" - regenerator="solr.NoOpRegenerator" /> - - <!-- Lazy Field Loading - - If true, stored fields that are not requested will be loaded - lazily. This can result in a significant speed improvement - if the usual case is to not load all stored fields, - especially if the skipped fields are large compressed text - fields. - --> - <enableLazyFieldLoading>true</enableLazyFieldLoading> - - <!-- Result Window Size - - An optimization for use with the queryResultCache. When a search - is requested, a superset of the requested number of document ids - are collected. For example, if a search for a particular query - requests matching documents 10 through 19, and queryWindowSize is 50, - then documents 0 through 49 will be collected and cached. Any further - requests in that range can be satisfied via the cache. - --> - <queryResultWindowSize>20</queryResultWindowSize> - - <!-- Maximum number of documents to cache for any entry in the - queryResultCache. - --> - <queryResultMaxDocsCached>200</queryResultMaxDocsCached> - - <!-- Use Cold Searcher - - If a search request comes in and there is no current - registered searcher, then immediately register the still - warming searcher and use it. If "false" then all requests - will block until the first searcher is done warming. - --> - <useColdSearcher>false</useColdSearcher> - - <!-- Max Warming Searchers - - Maximum number of searchers that may be warming in the - background concurrently. An error is returned if this limit - is exceeded. - - Recommend values of 1-2 for read-only slaves, higher for - masters w/o cache warming. - --> - <maxWarmingSearchers>2</maxWarmingSearchers> - - </query> - - - <!-- Request Dispatcher - - This section contains instructions for how the SolrDispatchFilter - should behave when processing requests for this SolrCore. - - handleSelect is a legacy option that affects the behavior of requests - such as /select?qt=XXX - - handleSelect="true" will cause the SolrDispatchFilter to process - the request and dispatch the query to a handler specified by the - "qt" param, assuming "/select" isn't already registered. - - handleSelect="false" will cause the SolrDispatchFilter to - ignore "/select" requests, resulting in a 404 unless a handler - is explicitly registered with the name "/select" - - handleSelect="true" is not recommended for new users, but is the default - for backwards compatibility - --> - <requestDispatcher handleSelect="false" > - <!-- Request Parsing - - These settings indicate how Solr Requests may be parsed, and - what restrictions may be placed on the ContentStreams from - those requests - - enableRemoteStreaming - enables use of the stream.file - and stream.url parameters for specifying remote streams. - - multipartUploadLimitInKB - specifies the max size (in KiB) of - Multipart File Uploads that Solr will allow in a Request. - - formdataUploadLimitInKB - specifies the max size (in KiB) of - form data (application/x-www-form-urlencoded) sent via - POST. You can use POST to pass request parameters not - fitting into the URL. - - addHttpRequestToContext - if set to true, it will instruct - the requestParsers to include the original HttpServletRequest - object in the context map of the SolrQueryRequest under the - key "httpRequest". It will not be used by any of the existing - Solr components, but may be useful when developing custom - plugins. - - *** WARNING *** - The settings below authorize Solr to fetch remote files, You - should make sure your system has some authentication before - using enableRemoteStreaming="true" - - --> - <requestParsers enableRemoteStreaming="true" - multipartUploadLimitInKB="2048000" - formdataUploadLimitInKB="2048" - addHttpRequestToContext="false"/> - - <!-- HTTP Caching - - Set HTTP caching related parameters (for proxy caches and clients). - - The options below instruct Solr not to output any HTTP Caching - related headers - --> - <httpCaching never304="true" /> - - </requestDispatcher> - - <!-- Request Handlers - - http://wiki.apache.org/solr/SolrRequestHandler - - Incoming queries will be dispatched to a specific handler by name - based on the path specified in the request. - - Legacy behavior: If the request path uses "/select" but no Request - Handler has that name, and if handleSelect="true" has been specified in - the requestDispatcher, then the Request Handler is dispatched based on - the qt parameter. Handlers without a leading '/' are accessed this way - like so: http://host/app/[core/]select?qt=name If no qt is - given, then the requestHandler that declares default="true" will be - used or the one named "standard". - - If a Request Handler is declared with startup="lazy", then it will - not be initialized until the first request that uses it. - - --> - <!-- SearchHandler - - http://wiki.apache.org/solr/SearchHandler - - For processing Search Queries, the primary Request Handler - provided with Solr is "SearchHandler" It delegates to a sequent - of SearchComponents (see below) and supports distributed - queries across multiple shards - --> - <requestHandler name="/select" class="solr.SearchHandler"> - <!-- default values for query parameters can be specified, these - will be overridden by parameters in the request - --> - <lst name="defaults"> - <str name="echoParams">explicit</str> - <int name="rows">10</int> - </lst> - - </requestHandler> - - <!-- A request handler that returns indented JSON by default --> - <requestHandler name="/query" class="solr.SearchHandler"> - <lst name="defaults"> - <str name="echoParams">explicit</str> - <str name="wt">json</str> - <str name="indent">true</str> - <str name="df">text</str> - </lst> - </requestHandler> - - <!-- - The export request handler is used to export full sorted result sets. - Do not change these defaults. - --> - <requestHandler name="/export" class="solr.SearchHandler"> - <lst name="invariants"> - <str name="rq">{!xport}</str> - <str name="wt">xsort</str> - <str name="distrib">false</str> - </lst> - - <arr name="components"> - <str>query</str> - </arr> - </requestHandler> - - - <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell"> - <lst name="defaults"> - <str name="df">text</str> - </lst> - </initParams> - - <!-- Field Analysis Request Handler - - RequestHandler that provides much the same functionality as - analysis.jsp. Provides the ability to specify multiple field - types and field names in the same request and outputs - index-time and query-time analysis for each of them. - - Request parameters are: - analysis.fieldname - field name whose analyzers are to be used - - analysis.fieldtype - field type whose analyzers are to be used - analysis.fieldvalue - text for index-time analysis - q (or analysis.q) - text for query time analysis - analysis.showmatch (true|false) - When set to true and when - query analysis is performed, the produced tokens of the - field value analysis will be marked as "matched" for every - token that is produces by the query analysis - --> - <requestHandler name="/analysis/field" - startup="lazy" - class="solr.FieldAnalysisRequestHandler" /> - - - <!-- Document Analysis Handler - - http://wiki.apache.org/solr/AnalysisRequestHandler - - An analysis handler that provides a breakdown of the analysis - process of provided documents. This handler expects a (single) - content stream with the following format: - - <docs> - <doc> - <field name="id">1</field> - <field name="name">The Name</field> - <field name="text">The Text Value</field> - </doc> - <doc>...</doc> - <doc>...</doc> - ... - </docs> - - Note: Each document must contain a field which serves as the - unique key. This key is used in the returned response to associate - an analysis breakdown to the analyzed document. - - Like the FieldAnalysisRequestHandler, this handler also supports - query analysis by sending either an "analysis.query" or "q" - request parameter that holds the query text to be analyzed. It - also supports the "analysis.showmatch" parameter which when set to - true, all field tokens that match the query tokens will be marked - as a "match". - --> - <requestHandler name="/analysis/document" - class="solr.DocumentAnalysisRequestHandler" - startup="lazy" /> - - <!-- Echo the request contents back to the client --> - <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" > - <lst name="defaults"> - <str name="echoParams">explicit</str> - <str name="echoHandler">true</str> - </lst> - </requestHandler> - - - - <!-- Search Components - - Search components are registered to SolrCore and used by - instances of SearchHandler (which can access them by name) - - By default, the following components are available: - - <searchComponent name="query" class="solr.QueryComponent" /> - <searchComponent name="facet" class="solr.FacetComponent" /> - <searchComponent name="mlt" class="solr.MoreLikeThisComponent" /> - <searchComponent name="highlight" class="solr.HighlightComponent" /> - <searchComponent name="stats" class="solr.StatsComponent" /> - <searchComponent name="debug" class="solr.DebugComponent" /> - - --> - - <!-- Terms Component - - http://wiki.apache.org/solr/TermsComponent - - A component to return terms and document frequency of those - terms - --> - <searchComponent name="terms" class="solr.TermsComponent"/> - - <!-- A request handler for demonstrating the terms component --> - <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy"> - <lst name="defaults"> - <bool name="terms">true</bool> - <bool name="distrib">false</bool> - </lst> - <arr name="components"> - <str>terms</str> - </arr> - </requestHandler> - - <!-- Legacy config for the admin interface --> - <admin> - <defaultQuery>*:*</defaultQuery> - </admin> - -</config> - ]]></value> - <value-attributes> - <type>content</type> - <show-property-name>false</show-property-name> - </value-attributes> - <on-ambari-upgrade add="true"/> - </property> -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py index 1a0e797..7e9c0f6 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py @@ -92,12 +92,13 @@ def metadata(type='server'): mode=0755, content=InlineTemplate(params.metadata_env_content) ) - File(format("{conf_dir}/solr/solrconfig.xml"), - mode=0644, - owner=params.metadata_user, - group=params.user_group, - content=InlineTemplate(params.metadata_solrconfig_content) - ) + if params.metadata_solrconfig_content: + File(format("{conf_dir}/solr/solrconfig.xml"), + mode=0644, + owner=params.metadata_user, + group=params.user_group, + content=InlineTemplate(params.metadata_solrconfig_content) + ) # Needed by both Server and Client PropertiesFile(format('{conf_dir}/{conf_file}'), http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py index 8006158..ab4af79 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py @@ -163,7 +163,7 @@ expanded_war_dir = os.environ['METADATA_EXPANDED_WEBAPP_DIR'] if 'METADATA_EXPAN metadata_log4j_content = config['configurations']['atlas-log4j']['content'] -metadata_solrconfig_content = config['configurations']['atlas-solrconfig']['content'] +metadata_solrconfig_content = default("/configurations/atlas-solrconfig/content", None) atlas_log_level = config['configurations']['atlas-log4j']['atlas_log_level'] audit_log_level = config['configurations']['atlas-log4j']['audit_log_level'] http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml new file mode 100644 index 0000000..cba4a4e --- /dev/null +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/atlas-solrconfig.xml @@ -0,0 +1,641 @@ +<?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_adding_forbidden="true"> + <property> + <name>content</name> + <display-name>atlas-solrconfig template</display-name> + <description>Atlas Solr configuration</description> + <value><![CDATA[<?xml version="1.0" encoding="UTF-8" ?> +<!-- + 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. +--> + +<!-- + *** + For more details about configurations options that may appear in + this file, see http://wiki.apache.org/solr/SolrConfigXml. +--> +<config> + <!-- In all configuration below, a prefix of "solr." for class names + is an alias that causes solr to search appropriate packages, + including org.apache.solr.(search|update|request|core|analysis) + + You may also specify a fully qualified Java classname if you + have your own custom plugins. + --> + + <!-- Controls what version of Lucene various components of Solr + adhere to. Generally, you want to use the latest version to + get all bug fixes and improvements. It is highly recommended + that you fully re-index after changing this setting as it can + affect both how text is indexed and queried. + --> + <luceneMatchVersion>5.5.1</luceneMatchVersion> + + <!-- Data Directory + + Used to specify an alternate directory to hold all index data + other than the default ./data under the Solr home. If + replication is in use, this should match the replication + configuration. + --> + <dataDir>${solr.data.dir:}</dataDir> + + + <!-- The DirectoryFactory to use for indexes. + + solr.StandardDirectoryFactory is filesystem + based and tries to pick the best implementation for the current + JVM and platform. solr.NRTCachingDirectoryFactory, the default, + wraps solr.StandardDirectoryFactory and caches small files in memory + for better NRT performance. + + One can force a particular implementation via solr.MMapDirectoryFactory, + solr.NIOFSDirectoryFactory, or solr.SimpleFSDirectoryFactory. + + solr.RAMDirectoryFactory is memory based, not + persistent, and doesn't work with replication. + --> + <directoryFactory name="DirectoryFactory" + class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"> + </directoryFactory> + + <!-- The CodecFactory for defining the format of the inverted index. + The default implementation is SchemaCodecFactory, which is the official Lucene + index format, but hooks into the schema to provide per-field customization of + the postings lists and per-document values in the fieldType element + (postingsFormat/docValuesFormat). Note that most of the alternative implementations + are experimental, so if you choose to customize the index format, it's a good + idea to convert back to the official format e.g. via IndexWriter.addIndexes(IndexReader) + before upgrading to a newer version to avoid unnecessary reindexing. + A "compressionMode" string element can be added to <codecFactory> to choose + between the existing compression modes in the default codec: "BEST_SPEED" (default) + or "BEST_COMPRESSION". + --> + <codecFactory class="solr.SchemaCodecFactory"/> + + <!-- To disable dynamic schema REST APIs, use the following for <schemaFactory>: + + <schemaFactory class="ClassicIndexSchemaFactory"/> + + When ManagedIndexSchemaFactory is specified instead, Solr will load the schema from + the resource named in 'managedSchemaResourceName', rather than from schema.xml. + Note that the managed schema resource CANNOT be named schema.xml. If the managed + schema does not exist, Solr will create it after reading schema.xml, then rename + 'schema.xml' to 'schema.xml.bak'. + + Do NOT hand edit the managed schema - external modifications will be ignored and + overwritten as a result of schema modification REST API calls. + + When ManagedIndexSchemaFactory is specified with mutable = true, schema + modification REST API calls will be allowed; otherwise, error responses will be + sent back for these requests. + --> + <schemaFactory class="ManagedIndexSchemaFactory"> + <bool name="mutable">true</bool> + <str name="managedSchemaResourceName">managed-schema</str> + </schemaFactory> + + <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Index Config - These settings control low-level behavior of indexing + Most example settings here show the default value, but are commented + out, to more easily see where customizations have been made. + + Note: This replaces <indexDefaults> and <mainIndex> from older versions + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <indexConfig> + + <!-- LockFactory + + This option specifies which Lucene LockFactory implementation + to use. + + single = SingleInstanceLockFactory - suggested for a + read-only index or when there is no possibility of + another process trying to modify the index. + native = NativeFSLockFactory - uses OS native file locking. + Do not use when multiple solr webapps in the same + JVM are attempting to share a single index. + simple = SimpleFSLockFactory - uses a plain file for locking + + Defaults: 'native' is default for Solr3.6 and later, otherwise + 'simple' is the default + + More details on the nuances of each LockFactory... + http://wiki.apache.org/lucene-java/AvailableLockFactories + --> + <lockType>${solr.lock.type:native}</lockType> + + <!-- Lucene Infostream + + To aid in advanced debugging, Lucene provides an "InfoStream" + of detailed information when indexing. + + Setting the value to true will instruct the underlying Lucene + IndexWriter to write its info stream to solr's log. By default, + this is enabled here, and controlled through log4j.properties. + --> + <infoStream>true</infoStream> + </indexConfig> + + + <!-- JMX + + This example enables JMX if and only if an existing MBeanServer + is found, use this if you want to configure JMX through JVM + parameters. Remove this to disable exposing Solr configuration + and statistics to JMX. + + For more details see http://wiki.apache.org/solr/SolrJmx + --> + <jmx /> + <!-- If you want to connect to a particular server, specify the + agentId + --> + <!-- <jmx agentId="myAgent" /> --> + <!-- If you want to start a new MBeanServer, specify the serviceUrl --> + <!-- <jmx serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:9999/solr"/> + --> + + <!-- The default high-performance update handler --> + <updateHandler class="solr.DirectUpdateHandler2"> + + <!-- Enables a transaction log, used for real-time get, durability, and + and solr cloud replica recovery. The log can grow as big as + uncommitted changes to the index, so use of a hard autoCommit + is recommended (see below). + "dir" - the target directory for transaction logs, defaults to the + solr data directory. + "numVersionBuckets" - sets the number of buckets used to keep + track of max version values when checking for re-ordered + updates; increase this value to reduce the cost of + synchronizing access to version buckets during high-volume + indexing, this requires 8 bytes (long) * numVersionBuckets + of heap space per Solr core. + --> + <updateLog> + <str name="dir">${solr.ulog.dir:}</str> + <int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int> + </updateLog> + + <!-- AutoCommit + + Perform a hard commit automatically under certain conditions. + Instead of enabling autoCommit, consider using "commitWithin" + when adding documents. + + http://wiki.apache.org/solr/UpdateXmlMessages + + maxDocs - Maximum number of documents to add since the last + commit before automatically triggering a new commit. + + maxTime - Maximum amount of time in ms that is allowed to pass + since a document was added before automatically + triggering a new commit. + openSearcher - if false, the commit causes recent index changes + to be flushed to stable storage, but does not cause a new + searcher to be opened to make those changes visible. + + If the updateLog is enabled, then it's highly recommended to + have some sort of hard autoCommit to limit the log size. + --> + <autoCommit> + <maxTime>${solr.autoCommit.maxTime:15000}</maxTime> + <openSearcher>false</openSearcher> + </autoCommit> + + <!-- softAutoCommit is like autoCommit except it causes a + 'soft' commit which only ensures that changes are visible + but does not ensure that data is synced to disk. This is + faster and more near-realtime friendly than a hard commit. + --> + <autoSoftCommit> + <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> + </autoSoftCommit> + + </updateHandler> + + <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Query section - these settings control query time things like caches + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <query> + <!-- Max Boolean Clauses + + Maximum number of clauses in each BooleanQuery, an exception + is thrown if exceeded. + + ** WARNING ** + + This option actually modifies a global Lucene property that + will affect all SolrCores. If multiple solrconfig.xml files + disagree on this property, the value at any given moment will + be based on the last SolrCore to be initialized. + + --> + <maxBooleanClauses>1024</maxBooleanClauses> + + + <!-- Solr Internal Query Caches + + There are two implementations of cache available for Solr, + LRUCache, based on a synchronized LinkedHashMap, and + FastLRUCache, based on a ConcurrentHashMap. + + FastLRUCache has faster gets and slower puts in single + threaded operation and thus is generally faster than LRUCache + when the hit ratio of the cache is high (> 75%), and may be + faster under other scenarios on multi-cpu systems. + --> + + <!-- Filter Cache + + Cache used by SolrIndexSearcher for filters (DocSets), + unordered sets of *all* documents that match a query. When a + new searcher is opened, its caches may be prepopulated or + "autowarmed" using data from caches in the old searcher. + autowarmCount is the number of items to prepopulate. For + LRUCache, the autowarmed items will be the most recently + accessed items. + + Parameters: + class - the SolrCache implementation LRUCache or + (LRUCache or FastLRUCache) + size - the maximum number of entries in the cache + initialSize - the initial capacity (number of entries) of + the cache. (see java.util.HashMap) + autowarmCount - the number of entries to prepopulate from + and old cache. + --> + <filterCache class="solr.FastLRUCache" + size="512" + initialSize="512" + autowarmCount="0"/> + + <!-- Query Result Cache + + Caches results of searches - ordered lists of document ids + (DocList) based on a query, a sort, and the range of documents requested. + Additional supported parameter by LRUCache: + maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed + to occupy + --> + <queryResultCache class="solr.LRUCache" + size="512" + initialSize="512" + autowarmCount="0"/> + + <!-- Document Cache + + Caches Lucene Document objects (the stored fields for each + document). Since Lucene internal document ids are transient, + this cache will not be autowarmed. + --> + <documentCache class="solr.LRUCache" + size="512" + initialSize="512" + autowarmCount="0"/> + + <!-- custom cache currently used by block join --> + <cache name="perSegFilter" + class="solr.search.LRUCache" + size="10" + initialSize="0" + autowarmCount="10" + regenerator="solr.NoOpRegenerator" /> + + <!-- Lazy Field Loading + + If true, stored fields that are not requested will be loaded + lazily. This can result in a significant speed improvement + if the usual case is to not load all stored fields, + especially if the skipped fields are large compressed text + fields. + --> + <enableLazyFieldLoading>true</enableLazyFieldLoading> + + <!-- Result Window Size + + An optimization for use with the queryResultCache. When a search + is requested, a superset of the requested number of document ids + are collected. For example, if a search for a particular query + requests matching documents 10 through 19, and queryWindowSize is 50, + then documents 0 through 49 will be collected and cached. Any further + requests in that range can be satisfied via the cache. + --> + <queryResultWindowSize>20</queryResultWindowSize> + + <!-- Maximum number of documents to cache for any entry in the + queryResultCache. + --> + <queryResultMaxDocsCached>200</queryResultMaxDocsCached> + + <!-- Use Cold Searcher + + If a search request comes in and there is no current + registered searcher, then immediately register the still + warming searcher and use it. If "false" then all requests + will block until the first searcher is done warming. + --> + <useColdSearcher>false</useColdSearcher> + + <!-- Max Warming Searchers + + Maximum number of searchers that may be warming in the + background concurrently. An error is returned if this limit + is exceeded. + + Recommend values of 1-2 for read-only slaves, higher for + masters w/o cache warming. + --> + <maxWarmingSearchers>2</maxWarmingSearchers> + + </query> + + + <!-- Request Dispatcher + + This section contains instructions for how the SolrDispatchFilter + should behave when processing requests for this SolrCore. + + handleSelect is a legacy option that affects the behavior of requests + such as /select?qt=XXX + + handleSelect="true" will cause the SolrDispatchFilter to process + the request and dispatch the query to a handler specified by the + "qt" param, assuming "/select" isn't already registered. + + handleSelect="false" will cause the SolrDispatchFilter to + ignore "/select" requests, resulting in a 404 unless a handler + is explicitly registered with the name "/select" + + handleSelect="true" is not recommended for new users, but is the default + for backwards compatibility + --> + <requestDispatcher handleSelect="false" > + <!-- Request Parsing + + These settings indicate how Solr Requests may be parsed, and + what restrictions may be placed on the ContentStreams from + those requests + + enableRemoteStreaming - enables use of the stream.file + and stream.url parameters for specifying remote streams. + + multipartUploadLimitInKB - specifies the max size (in KiB) of + Multipart File Uploads that Solr will allow in a Request. + + formdataUploadLimitInKB - specifies the max size (in KiB) of + form data (application/x-www-form-urlencoded) sent via + POST. You can use POST to pass request parameters not + fitting into the URL. + + addHttpRequestToContext - if set to true, it will instruct + the requestParsers to include the original HttpServletRequest + object in the context map of the SolrQueryRequest under the + key "httpRequest". It will not be used by any of the existing + Solr components, but may be useful when developing custom + plugins. + + *** WARNING *** + The settings below authorize Solr to fetch remote files, You + should make sure your system has some authentication before + using enableRemoteStreaming="true" + + --> + <requestParsers enableRemoteStreaming="true" + multipartUploadLimitInKB="2048000" + formdataUploadLimitInKB="2048" + addHttpRequestToContext="false"/> + + <!-- HTTP Caching + + Set HTTP caching related parameters (for proxy caches and clients). + + The options below instruct Solr not to output any HTTP Caching + related headers + --> + <httpCaching never304="true" /> + + </requestDispatcher> + + <!-- Request Handlers + + http://wiki.apache.org/solr/SolrRequestHandler + + Incoming queries will be dispatched to a specific handler by name + based on the path specified in the request. + + Legacy behavior: If the request path uses "/select" but no Request + Handler has that name, and if handleSelect="true" has been specified in + the requestDispatcher, then the Request Handler is dispatched based on + the qt parameter. Handlers without a leading '/' are accessed this way + like so: http://host/app/[core/]select?qt=name If no qt is + given, then the requestHandler that declares default="true" will be + used or the one named "standard". + + If a Request Handler is declared with startup="lazy", then it will + not be initialized until the first request that uses it. + + --> + <!-- SearchHandler + + http://wiki.apache.org/solr/SearchHandler + + For processing Search Queries, the primary Request Handler + provided with Solr is "SearchHandler" It delegates to a sequent + of SearchComponents (see below) and supports distributed + queries across multiple shards + --> + <requestHandler name="/select" class="solr.SearchHandler"> + <!-- default values for query parameters can be specified, these + will be overridden by parameters in the request + --> + <lst name="defaults"> + <str name="echoParams">explicit</str> + <int name="rows">10</int> + </lst> + + </requestHandler> + + <!-- A request handler that returns indented JSON by default --> + <requestHandler name="/query" class="solr.SearchHandler"> + <lst name="defaults"> + <str name="echoParams">explicit</str> + <str name="wt">json</str> + <str name="indent">true</str> + <str name="df">text</str> + </lst> + </requestHandler> + + <!-- + The export request handler is used to export full sorted result sets. + Do not change these defaults. + --> + <requestHandler name="/export" class="solr.SearchHandler"> + <lst name="invariants"> + <str name="rq">{!xport}</str> + <str name="wt">xsort</str> + <str name="distrib">false</str> + </lst> + + <arr name="components"> + <str>query</str> + </arr> + </requestHandler> + + + <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell"> + <lst name="defaults"> + <str name="df">text</str> + </lst> + </initParams> + + <!-- Field Analysis Request Handler + + RequestHandler that provides much the same functionality as + analysis.jsp. Provides the ability to specify multiple field + types and field names in the same request and outputs + index-time and query-time analysis for each of them. + + Request parameters are: + analysis.fieldname - field name whose analyzers are to be used + + analysis.fieldtype - field type whose analyzers are to be used + analysis.fieldvalue - text for index-time analysis + q (or analysis.q) - text for query time analysis + analysis.showmatch (true|false) - When set to true and when + query analysis is performed, the produced tokens of the + field value analysis will be marked as "matched" for every + token that is produces by the query analysis + --> + <requestHandler name="/analysis/field" + startup="lazy" + class="solr.FieldAnalysisRequestHandler" /> + + + <!-- Document Analysis Handler + + http://wiki.apache.org/solr/AnalysisRequestHandler + + An analysis handler that provides a breakdown of the analysis + process of provided documents. This handler expects a (single) + content stream with the following format: + + <docs> + <doc> + <field name="id">1</field> + <field name="name">The Name</field> + <field name="text">The Text Value</field> + </doc> + <doc>...</doc> + <doc>...</doc> + ... + </docs> + + Note: Each document must contain a field which serves as the + unique key. This key is used in the returned response to associate + an analysis breakdown to the analyzed document. + + Like the FieldAnalysisRequestHandler, this handler also supports + query analysis by sending either an "analysis.query" or "q" + request parameter that holds the query text to be analyzed. It + also supports the "analysis.showmatch" parameter which when set to + true, all field tokens that match the query tokens will be marked + as a "match". + --> + <requestHandler name="/analysis/document" + class="solr.DocumentAnalysisRequestHandler" + startup="lazy" /> + + <!-- Echo the request contents back to the client --> + <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" > + <lst name="defaults"> + <str name="echoParams">explicit</str> + <str name="echoHandler">true</str> + </lst> + </requestHandler> + + + + <!-- Search Components + + Search components are registered to SolrCore and used by + instances of SearchHandler (which can access them by name) + + By default, the following components are available: + + <searchComponent name="query" class="solr.QueryComponent" /> + <searchComponent name="facet" class="solr.FacetComponent" /> + <searchComponent name="mlt" class="solr.MoreLikeThisComponent" /> + <searchComponent name="highlight" class="solr.HighlightComponent" /> + <searchComponent name="stats" class="solr.StatsComponent" /> + <searchComponent name="debug" class="solr.DebugComponent" /> + + --> + + <!-- Terms Component + + http://wiki.apache.org/solr/TermsComponent + + A component to return terms and document frequency of those + terms + --> + <searchComponent name="terms" class="solr.TermsComponent"/> + + <!-- A request handler for demonstrating the terms component --> + <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy"> + <lst name="defaults"> + <bool name="terms">true</bool> + <bool name="distrib">false</bool> + </lst> + <arr name="components"> + <str>terms</str> + </arr> + </requestHandler> + + <!-- Legacy config for the admin interface --> + <admin> + <defaultQuery>*:*</defaultQuery> + </admin> + +</config> + ]]></value> + <value-attributes> + <type>content</type> + <show-property-name>false</show-property-name> + </value-attributes> + <on-ambari-upgrade add="false"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-atlas-application.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-atlas-application.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-atlas-application.properties.xml deleted file mode 100644 index e653651..0000000 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-atlas-application.properties.xml +++ /dev/null @@ -1,61 +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="false"> - <!-- These are the Atlas Hooks properties specific to this service. This file is then merged with common properties - that apply to all services. --> - <property> - <name>atlas.hook.falcon.synchronous</name> - <value>false</value> - <description/> - <on-ambari-upgrade add="true"/> - </property> - <property> - <name>atlas.hook.falcon.numRetries</name> - <value>3</value> - <description/> - <on-ambari-upgrade add="true"/> - </property> - <property> - <name>atlas.hook.falcon.minThreads</name> - <value>5</value> - <description/> - <on-ambari-upgrade add="true"/> - </property> - <property> - <name>atlas.hook.falcon.maxThreads</name> - <value>5</value> - <description/> - <on-ambari-upgrade add="true"/> - </property> - <property> - <name>atlas.hook.falcon.keepAliveTime</name> - <value>10</value> - <description/> - <on-ambari-upgrade add="true"/> - </property> - <property> - <name>atlas.hook.falcon.queueSize</name> - <value>1000</value> - <description/> - <on-ambari-upgrade add="true"/> - </property> -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml index 5257549..b4c0790 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml @@ -23,7 +23,7 @@ <name>xasecure.audit.is.enabled</name> <value>true</value> <description>Is Audit enabled?</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.db</name> @@ -39,19 +39,19 @@ <name>xasecure.audit.destination.db</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> <description>Audit DB JDBC URL</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> <description>Audit DB JDBC User</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.db.password</name> @@ -61,25 +61,25 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> <description>Audit DB JDBC Driver</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> <description>Credential file store</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/kafka/audit/db/spool</value> <description>/var/log/kafka/audit/db/spool</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.hdfs</name> @@ -95,7 +95,7 @@ <name>xasecure.audit.destination.hdfs</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> @@ -107,13 +107,13 @@ <name>xasecure.audit.destination.hdfs.dir</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/kafka/audit/hdfs/spool</value> <description>/var/log/kafka/audit/hdfs/spool</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.solr</name> @@ -129,7 +129,7 @@ <name>xasecure.audit.destination.solr</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.solr.urls</name> @@ -144,7 +144,7 @@ <name>ranger.audit.solr.urls</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> @@ -156,13 +156,13 @@ <name>ranger.audit.solr.zookeepers</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/kafka/audit/solr/spool</value> <description>/var/log/kafka/audit/solr/spool</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> @@ -172,6 +172,6 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml index 74cdf63..3949402 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml @@ -24,7 +24,7 @@ <value>ambari-qa</value> <display-name>Policy user for KAFKA</display-name> <description>This user must be system user and also present at Ranger admin portal</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>hadoop.rpc.protection</name> @@ -33,7 +33,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>common.name.for.certificate</name> @@ -42,7 +42,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>zookeeper.connect</name> @@ -65,14 +65,14 @@ <type>boolean</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>REPOSITORY_CONFIG_USERNAME</name> <value>kafka</value> <display-name>Ranger repository config user</display-name> <description>Used for repository creation on ranger admin</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>REPOSITORY_CONFIG_PASSWORD</name> @@ -83,6 +83,6 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml index f0fc160..cf4a82e 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml @@ -23,7 +23,7 @@ <name>xasecure.policymgr.clientssl.keystore</name> <value>kafkadev-clientcert.jks</value> <description>Java Keystore files</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.policymgr.clientssl.keystore.password</name> @@ -33,13 +33,13 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore</name> <value>cacerts-xasecure.jks</value> <description>java truststore file</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore.password</name> @@ -49,18 +49,18 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file/{{credential_file}}</value> <description>java keystore credential file</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file/{{credential_file}}</value> <description>java truststore credential file</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml index 3967e3e..91061d1 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml @@ -23,36 +23,36 @@ <name>ranger.plugin.kafka.service.name</name> <value>{{repo_name}}</value> <description>Name of the Ranger service containing policies for this Kafka instance</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>ranger.plugin.kafka.policy.source.impl</name> <value>org.apache.ranger.admin.client.RangerAdminRESTClient</value> <description>Class to retrieve policies from the source</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>ranger.plugin.kafka.policy.rest.url</name> <value>{{policymgr_mgr_url}}</value> <description>URL to Ranger Admin</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>ranger.plugin.kafka.policy.rest.ssl.config.file</name> <value>/etc/kafka/conf/ranger-policymgr-ssl.xml</value> <description>Path to the file containing SSL details to contact Ranger Admin</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>ranger.plugin.kafka.policy.pollIntervalMs</name> <value>30000</value> <description>How often to poll for changes in policies?</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>ranger.plugin.kafka.policy.cache.dir</name> <value>/etc/ranger/{{repo_name}}/policycache</value> <description>Directory where Ranger policies are cached after successful retrieval from the source</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml index f0f6f41..ae9314b 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml @@ -24,7 +24,7 @@ <value>ambari-qa</value> <display-name>Policy user for KNOX</display-name> <description>This user must be system user and also present at Ranger admin portal</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>common.name.for.certificate</name> @@ -33,7 +33,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>ranger-knox-plugin-enabled</name> @@ -50,14 +50,14 @@ <type>boolean</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>REPOSITORY_CONFIG_USERNAME</name> <value>admin</value> <display-name>Ranger repository config user</display-name> <description>Used for repository creation on ranger admin</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>REPOSITORY_CONFIG_PASSWORD</name> @@ -68,14 +68,14 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>KNOX_HOME</name> <value>/usr/local/knox-server</value> <display-name>Knox Home</display-name> <description>Knox home folder</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.DB.IS_ENABLED</name> @@ -91,7 +91,7 @@ <name>xasecure.audit.destination.db</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.IS_ENABLED</name> @@ -107,7 +107,7 @@ <name>xasecure.audit.destination.hdfs</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name> @@ -125,55 +125,55 @@ <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name> <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name> <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_FILE</name> <value>%hostname%-audit.log</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name> <value>900</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name> <value>86400</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name> <value>60</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name> <value>%time:yyyyMMdd-HHmm.ss%.log</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name> <value>60</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name> <value>600</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name> @@ -182,26 +182,26 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>SSL_KEYSTORE_FILE_PATH</name> <value>/etc/hadoop/conf/ranger-plugin-keystore.jks</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>SSL_KEYSTORE_PASSWORD</name> <value>myKeyFilePassword</value> <property-type>PASSWORD</property-type> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>SSL_TRUSTSTORE_FILE_PATH</name> <value>/etc/hadoop/conf/ranger-plugin-truststore.jks</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>SSL_TRUSTSTORE_PASSWORD</name> @@ -211,37 +211,37 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>POLICY_MGR_URL</name> <value>{{policymgr_mgr_url}}</value> <description>Policy Manager url</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>SQL_CONNECTOR_JAR</name> <value>{{sql_connector_jar}}</value> <description>Location of DB client library (please check the location of the jar file)</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.DB.FLAVOUR</name> <value>{{xa_audit_db_flavor}}</value> <description>The database type to be used (mysql/oracle)</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.DB.DATABASE_NAME</name> <value>{{xa_audit_db_name}}</value> <description>Audit database name</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.DB.USER_NAME</name> <value>{{xa_audit_db_user}}</value> <description>Audit database user</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.DB.PASSWORD</name> @@ -251,18 +251,18 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <value>{{xa_db_host}}</value> <description>Audit database hostname</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>REPOSITORY_NAME</name> <value>{{repo_name}}</value> <description>Ranger repository name</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/00a44d8a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml index f7823d2..20e6d42 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-site.xml @@ -30,10 +30,10 @@ <name>atlas.cluster.name</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>sqoop.job.data.publish.class</name> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration>
