http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml index 0654132..b0818bc 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/hdfs-site.xml @@ -34,6 +34,7 @@ directories, for redundancy. </description> <display-name>NameNode directories</display-name> <final>true</final> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directories</type> <overridable>false</overridable> @@ -45,6 +46,7 @@ <value>true</value> <description>to enable dfs append</description> <final>true</final> + <on-ambari-upgrade add="true"/> </property> <property> @@ -53,6 +55,7 @@ <display-name>WebHDFS enabled</display-name> <description>Whether to enable WebHDFS feature</description> <final>true</final> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> <overridable>false</overridable> @@ -65,6 +68,7 @@ <description> Number of failed disks a DataNode would tolerate before it stops offering service</description> <final>true</final> <display-name>DataNode failed disk tolerance</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -90,6 +94,7 @@ Directories that do not exist are ignored. </description> <final>true</final> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directories</type> </value-attributes> @@ -102,6 +107,7 @@ not permitted to connect to the namenode. The full pathname of the file must be specified. If the value is empty, no hosts are excluded.</description> + <on-ambari-upgrade add="true"/> </property> <!-- @@ -112,6 +118,7 @@ permitted to connect to the namenode. The full pathname of the file must be specified. If the value is empty, all hosts are permitted.</description> + <on-ambari-upgrade add="true"/> </property> --> @@ -124,6 +131,7 @@ If this is a comma-delimited list of directories then the image is replicated in all of the directories for redundancy. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directories</type> <overridable>false</overridable> @@ -139,6 +147,7 @@ replicated in all of the directories for redundancy. Default value is same as dfs.namenode.checkpoint.dir </description> + <on-ambari-upgrade add="true"/> </property> @@ -147,6 +156,7 @@ <value>21600</value> <display-name>HDFS Maximum Checkpoint Delay</display-name> <description>The number of seconds between two periodic checkpoints.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>seconds</unit> @@ -160,6 +170,7 @@ of the namespace every 'dfs.namenode.checkpoint.txns' transactions, regardless of whether 'dfs.namenode.checkpoint.period' has expired. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -167,6 +178,7 @@ <value>50</value> <description>Maximal block replication. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -174,6 +186,7 @@ <value>3</value> <description>Default block replication.</description> <display-name>Block replication</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> </value-attributes> @@ -183,12 +196,14 @@ <name>dfs.heartbeat.interval</name> <value>3</value> <description>Determines datanode heartbeat interval in seconds.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.heartbeat.interval</name> <value>3</value> <description>Determines datanode heartbeat interval in seconds.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -201,6 +216,7 @@ Values greater than 1 will make safe mode permanent. </description> <display-name>Minimum replicated blocks %</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>float</type> <minimum>0.990</minimum> @@ -217,6 +233,7 @@ can utilize for the balancing purpose in term of the number of bytes per second. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -225,6 +242,7 @@ <description> This property is used by HftpFileSystem. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -233,6 +251,7 @@ <description> The datanode server address and port for data transfer. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -241,6 +260,7 @@ <description> The datanode http server address and port. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -249,12 +269,14 @@ <description> The datanode https server address and port. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.blocksize</name> <value>134217728</value> <description>The default block size for new files.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -263,6 +285,7 @@ <description>The name of the default file system. Either the literal string "local" or a host:port for NDFS.</description> <final>true</final> + <on-ambari-upgrade add="false"/> </property> <property> @@ -271,6 +294,7 @@ <value>1073741824</value> <display-name>Reserved space for HDFS</display-name> <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <unit>bytes</unit> @@ -284,12 +308,14 @@ The datanode ipc server address and port. If the port is 0 then the server will start on a free port. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.blockreport.initialDelay</name> <value>120</value> <description>Delay for first block report in seconds.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -297,6 +323,7 @@ <value>8192</value> <description>Specifies the maximum number of threads to use for transferring data in and out of the datanode.</description> <display-name>DataNode max data transfer threads</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>0</minimum> @@ -312,6 +339,7 @@ <description> The octal umask used when creating files and directories. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -324,12 +352,14 @@ Switching from one parameter value to the other does not change the mode, owner or group of files or directories. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.permissions.superusergroup</name> <value>hdfs</value> <description>The name of the group of super-users.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -337,6 +367,7 @@ <value>64</value> <description>Added to grow Queue size so that more client connections are allowed</description> <display-name>NameNode Server threads</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>1</minimum> @@ -351,6 +382,7 @@ If "true", access tokens are used as capabilities for accessing datanodes. If "false", no access tokens are checked on accessing datanodes. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -359,6 +391,7 @@ <description> Kerberos principal name for the NameNode </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -367,6 +400,7 @@ <description> Kerberos principal name for the secondary NameNode. </description> + <on-ambari-upgrade add="true"/> </property> @@ -378,6 +412,7 @@ <value>HTTP/[email protected]</value> <description>The Kerberos principal for the host that the NameNode runs on.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -385,6 +420,7 @@ <value>HTTP/[email protected]</value> <description>The Kerberos principal for the hostthat the secondary NameNode runs on.</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -392,6 +428,7 @@ <name>dfs.namenode.secondary.http-address</name> <value>localhost:50090</value> <description>Address of secondary namenode web server</description> + <on-ambari-upgrade add="false"/> </property> <property> @@ -402,6 +439,7 @@ The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos HTTP SPENGO specification. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -411,6 +449,7 @@ The Kerberos keytab file with the credentials for the HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -419,6 +458,7 @@ <description> The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -427,6 +467,7 @@ <description> Combined keytab file containing the namenode service and host principals. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -435,6 +476,7 @@ <description> Combined keytab file containing the namenode service and host principals. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -443,13 +485,14 @@ <description> The filename of the keytab file for the DataNode. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.namenode.https-address</name> <value>localhost:50470</value> <description>The https address where namenode binds</description> - + <on-ambari-upgrade add="false"/> </property> <property> @@ -460,6 +503,7 @@ directories. The datanode will not come up if the permissions are different on existing dfs.datanode.data.dir directories. If the directories don't exist, they will be created with this permission.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> </value-attributes> @@ -473,6 +517,7 @@ The default value is 1 hour. Setting a value of 0 disables access times for HDFS. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> </value-attributes> @@ -482,6 +527,7 @@ <name>dfs.cluster.administrators</name> <value> hdfs</value> <description>ACL for who all can view the default servlets in the HDFS</description> + <on-ambari-upgrade add="true"/> <value-attributes> <visible>true</visible> </value-attributes> @@ -495,6 +541,7 @@ heartbeat messages have not been received by the namenode for more than a specified time interval. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.namenode.avoid.write.stale.datanode</name> @@ -504,6 +551,7 @@ heartbeat messages have not been received by the namenode for more than a specified time interval. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.namenode.write.stale.datanode.ratio</name> @@ -511,11 +559,13 @@ <description>When the ratio of number stale datanodes to total datanodes marked is greater than this ratio, stop avoiding writing to stale nodes so as to prevent causing hotspots. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.namenode.stale.datanode.interval</name> <value>30000</value> <description>Datanode is stale after not getting a heartbeat in this interval in ms</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -523,12 +573,14 @@ <value>0.0.0.0:8480</value> <description>The address and port the JournalNode web UI listens on. If the port is 0 then the server will start on a free port. </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.journalnode.edits.dir</name> <value>/grid/0/hdfs/journal</value> <description>The path where the JournalNode daemon will store its local state. </description> + <on-ambari-upgrade add="true"/> </property> <!-- HDFS Short-Circuit Local Reads --> @@ -538,6 +590,7 @@ <value>true</value> <description>This configuration parameter turns on short-circuit local reads.</description> <display-name>HDFS Short-circuit read</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -550,6 +603,7 @@ This is a path to a UNIX domain socket that will be used for communication between the DataNode and local HDFS clients. If the string "_PORT" is present in this path, it will be replaced by the TCP port of the DataNode. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -561,6 +615,7 @@ more file descriptors, but potentially provide better performance on workloads involving lots of seeks. </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -568,41 +623,49 @@ <value>true</value> <description>Set to true to enable NameNode to attempt recovering a previously failed dfs.namenode.name.dir. When enabled, a recovery of any failed directory is attempted during checkpoint.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.datanode.handler.count</name> <value>40</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.namenode.acls.enabled</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.client.file-block-storage-locations.timeout.millis</name> <value>3000</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.client.mmap.enabled</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.datanode.max.locked.memory</name> <value>0</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.datanode.hdfs-blocks-metadata.enabled</name> <value>true</value> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.http.policy</name> <value>HTTP_ONLY</value> + <on-ambari-upgrade add="true"/> </property> <property> @@ -615,6 +678,7 @@ they are accumulated to exceed certain threshold (e.g., 1MB) in memory. One needs to make sure the directory has enough space. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> </value-attributes> @@ -624,12 +688,14 @@ <name>nfs.exports.allowed.hosts</name> <value>* rw</value> <display-name>Allowed hosts</display-name> + <on-ambari-upgrade add="true"/> </property> <!-- Property from HDP 2.3 stack for Ranger --> <property> <name>dfs.namenode.inode.attributes.provider.class</name> <description>Enable ranger hdfs plugin</description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>ranger-hdfs-plugin-properties</type> @@ -645,6 +711,7 @@ <property> <name>dfs.encryption.key.provider.uri</name> <value></value> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -672,12 +739,14 @@ <name>dfs.content-summary.limit</name> <value>5000</value> <description>Dfs content summary limit.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>dfs.namenode.startup.delay.block.deletion.sec</name> <value>3600</value> <description></description> + <on-ambari-upgrade add="true"/> </property> </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml index 3f30839..a70f764 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-audit.xml @@ -24,6 +24,7 @@ <name>xasecure.audit.is.enabled</name> <value>true</value> <description>Is Audit enabled?</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -31,6 +32,7 @@ <value>false</value> <display-name>Audit to DB</display-name> <description>Is Audit to DB enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -46,17 +48,20 @@ <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> <description>Audit DB JDBC URL</description> + <on-ambari-upgrade add="true"/> </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"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <value>crypted</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Audit DB JDBC Password</description> </property> @@ -65,18 +70,21 @@ <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> <description>Audit DB JDBC Driver</description> + <on-ambari-upgrade add="true"/> </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"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hadoop/hdfs/audit/db/spool</value> <description>/var/log/hadoop/hdfs/audit/db/spool</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -84,6 +92,7 @@ <value>true</value> <display-name>Audit to HDFS</display-name> <description>Is Audit to HDFS enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -99,6 +108,7 @@ <name>xasecure.audit.destination.hdfs.dir</name> <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value> <description>HDFS folder to write audit to, make sure the service user has requried permissions</description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>ranger-env</type> @@ -111,6 +121,7 @@ <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hadoop/hdfs/audit/hdfs/spool</value> <description>/var/log/hadoop/hdfs/audit/hdfs/spool</description> + <on-ambari-upgrade add="true"/> </property> <!-- Removing auditing to Solr @@ -119,6 +130,7 @@ <value>false</value> <display-name>Audit to SOLR</display-name> <description>Is Solr audit enabled?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> @@ -134,6 +146,7 @@ <name>xasecure.audit.destination.solr.urls</name> <value></value> <description>Solr URL</description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -149,6 +162,7 @@ <name>xasecure.audit.destination.solr.zookeepers</name> <value>NONE</value> <description>Solr Zookeeper string</description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>ranger-admin-site</type> @@ -161,6 +175,7 @@ <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/hadoop/hdfs/audit/solr/spool</value> <description>/var/log/hadoop/hdfs/audit/solr/spool</description> + <on-ambari-upgrade add="true"/> </property> --> @@ -169,6 +184,7 @@ <value>false</value> <display-name>Audit provider summary enabled</display-name> <description>Enable Summary audit?</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>boolean</type> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml index 152c241..1ba60f6 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml @@ -26,12 +26,14 @@ <display-name>policy User for HDFS</display-name> <description>This user must be system user and also present at Ranger admin portal</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hadoop.rpc.protection</name> <value></value> <description>Used for repository creation on ranger admin </description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -40,6 +42,7 @@ <name>common.name.for.certificate</name> <value></value> <description>Common name for certificate, this value should match what is specified in repo within ranger admin</description> + <on-ambari-upgrade add="true"/> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -50,6 +53,7 @@ <value>No</value> <display-name>Enable Ranger for HDFS</display-name> <description>Enable ranger hdfs plugin</description> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>ranger-env</type> @@ -68,11 +72,13 @@ <display-name>Ranger repository config user</display-name> <description>Used for repository creation on ranger admin </description> + <on-ambari-upgrade add="true"/> </property> <property> <name>REPOSITORY_CONFIG_PASSWORD</name> <value>hadoop</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Used for repository creation on ranger admin </description> @@ -87,126 +93,151 @@ <property> <name>XAAUDIT.DB.IS_ENABLED</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.IS_ENABLED</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_FILE</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_KEYSTORE_FILE_PATH</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_KEYSTORE_PASSWORD</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_TRUSTSTORE_FILE_PATH</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SSL_TRUSTSTORE_PASSWORD</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>POLICY_MGR_URL</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>SQL_CONNECTOR_JAR</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.FLAVOUR</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.DATABASE_NAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.USER_NAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.PASSWORD</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>XAAUDIT.DB.HOSTNAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> <property> <name>REPOSITORY_NAME</name> <deleted>true</deleted> + <on-ambari-upgrade add="true"/> </property> --> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml index 2fd41d4..f681ad1 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml @@ -24,6 +24,7 @@ <name>xasecure.policymgr.clientssl.keystore</name> <value>/usr/iop/current/hadoop-client/conf/ranger-plugin-keystore.jks</value> <description>Java Keystore files</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -31,12 +32,14 @@ <value>myKeyFilePassword</value> <property-type>PASSWORD</property-type> <description>password for keystore</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore</name> <value>/usr/iop/current/hadoop-client/conf/ranger-plugin-truststore.jks</value> <description>java truststore file</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -44,18 +47,21 @@ <value>changeit</value> <property-type>PASSWORD</property-type> <description>java truststore password</description> + <on-ambari-upgrade add="true"/> </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"/> </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"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml index ba46278..ff83f9c 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ranger-hdfs-security.xml @@ -23,42 +23,49 @@ <name>ranger.plugin.hdfs.service.name</name> <value>{{repo_name}}</value> <description>Name of the Ranger service containing Hdfs policies</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hdfs.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"/> </property> <property> <name>ranger.plugin.hdfs.policy.rest.url</name> <value>{{policymgr_mgr_url}}</value> <description>URL to Ranger Admin</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hdfs.policy.rest.ssl.config.file</name> <value>/etc/hadoop/conf/ranger-policymgr-ssl.xml</value> <description>Path to the file containing SSL details to contact Ranger Admin</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hdfs.policy.pollIntervalMs</name> <value>30000</value> <description>How often to poll for changes in policies?</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.hdfs.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"/> </property> <property> <name>xasecure.add-hadoop-authorization</name> <value>true</value> <description>Enable/Disable the default hadoop authorization (based on rwxrwxrwx permission on the resource) if Ranger Authorization fails.</description> + <on-ambari-upgrade add="true"/> </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml index 4bc5ba5..11fa1e4 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-client.xml @@ -22,15 +22,18 @@ <name>ssl.client.truststore.location</name> <value>/etc/security/clientKeys/all.jks</value> <description>Location of the trust store file.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.client.truststore.type</name> <value>jks</value> <description>Optional. Default value is "jks".</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.client.truststore.password</name> <value>bigdata</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Password to open the trust store file.</description> </property> @@ -38,20 +41,24 @@ <name>ssl.client.truststore.reload.interval</name> <value>10000</value> <description>Truststore reload interval, in milliseconds.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.client.keystore.type</name> <value>jks</value> <description>Optional. Default value is "jks".</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.client.keystore.location</name> <value>/etc/security/clientKeys/keystore.jks</value> <description>Location of the keystore file.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.client.keystore.password</name> <value>bigdata</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Password to open the keystore file.</description> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml index 1a4cf77..b9e93ba 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HDFS/configuration/ssl-server.xml @@ -22,15 +22,18 @@ <name>ssl.server.truststore.location</name> <value>/etc/security/serverKeys/all.jks</value> <description>Location of the trust store file.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.server.truststore.type</name> <value>jks</value> <description>Optional. Default value is "jks".</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.server.truststore.password</name> <value>bigdata</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Password to open the trust store file.</description> </property> @@ -38,26 +41,31 @@ <name>ssl.server.truststore.reload.interval</name> <value>10000</value> <description>Truststore reload interval, in milliseconds.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.server.keystore.type</name> <value>jks</value> <description>Optional. Default value is "jks".</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.server.keystore.location</name> <value>/etc/security/serverKeys/keystore.jks</value> <description>Location of the keystore file.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ssl.server.keystore.password</name> <value>bigdata</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Password to open the keystore file.</description> </property> <property> <name>ssl.server.keystore.keypassword</name> <value>bigdata</value> + <on-ambari-upgrade add="true"/> <property-type>PASSWORD</property-type> <description>Password for private key in keystore file.</description> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml index 5f64adc..5f18fde 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hcat-env.xml @@ -52,6 +52,7 @@ USER={{hcat_user}} METASTORE_PORT={{hive_metastore_port}} </value> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml index d69a98d..96880ec 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-env.xml @@ -26,6 +26,7 @@ <value>1024</value> <description>Hive Java heap size</description> <display-name>HiveServer2 Heap Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -42,6 +43,7 @@ <value>512</value> <description>Hive Client Java heap size</description> <display-name>Client Heap Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -57,6 +59,7 @@ <value>1024</value> <description>Hive Metastore Java heap size</description> <display-name>Metastore Heap Size</display-name> + <on-ambari-upgrade add="true"/> <value-attributes> <type>int</type> <minimum>512</minimum> @@ -72,6 +75,7 @@ <value>mysql</value> <display-name>Hive Database Type</display-name> <description>Default HIVE DB type.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -83,6 +87,7 @@ <description> Property that determines whether the HIVE DB is managed by Ambari. </description> + <on-ambari-upgrade add="true"/> <value-attributes> <overridable>false</overridable> </value-attributes> @@ -91,11 +96,13 @@ <name>hive_ambari_database</name> <value>MySQL</value> <description>Database type.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive_database_name</name> <value>hive</value> <description>Database name.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>database</type> <visible>false</visible> @@ -108,6 +115,7 @@ <value>/var/log/hive</value> <display-name>Hive Log Dir</display-name> <description>Directory for Hive Log files.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <overridable>false</overridable> @@ -119,6 +127,7 @@ <value>/var/run/hive</value> <display-name>Hive PID Dir</display-name> <description>Hive PID Dir.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <overridable>false</overridable> @@ -129,6 +138,7 @@ <name>hive_user</name> <display-name>Hive User</display-name> <value>hive</value> + <on-ambari-upgrade add="true"/> <property-type>USER</property-type> <description>Hive User.</description> </property> @@ -140,6 +150,7 @@ <value>/var/log/webhcat</value> <display-name>WebHCat Log Dir</display-name> <description>WebHCat Log Dir.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <overridable>false</overridable> @@ -151,6 +162,7 @@ <value>/var/run/webhcat</value> <display-name>WebHCat Pid Dir</display-name> <description>WebHCat Pid Dir.</description> + <on-ambari-upgrade add="true"/> <value-attributes> <type>directory</type> <overridable>false</overridable> @@ -161,6 +173,7 @@ <name>hcat_user</name> <display-name>HCat User</display-name> <value>hcat</value> + <on-ambari-upgrade add="true"/> <property-type>USER</property-type> <description>HCat User.</description> </property> @@ -168,6 +181,7 @@ <name>webhcat_user</name> <display-name>WebHCat User</display-name> <value>hcat</value> + <on-ambari-upgrade add="true"/> <property-type>USER</property-type> <description>WebHCat User.</description> </property> @@ -176,12 +190,14 @@ <name>hive_user_nofile_limit</name> <value>32000</value> <description>Max open files limit setting for HIVE user.</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive_user_nproc_limit</name> <value>16000</value> <description>Max number of processes limit setting for HIVE user.</description> + <on-ambari-upgrade add="true"/> </property> <!-- hive-env.sh --> @@ -257,12 +273,14 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{{jdbc_libs_dir}}" export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}" {% endif %} </value> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive_security_authorization</name> <display-name>Choose Authorization</display-name> <value>None</value> + <on-ambari-upgrade add="true"/> <depends-on> <property> <type>ranger-env</type> @@ -292,6 +310,7 @@ export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}" <name>hive_exec_orc_storage_strategy</name> <display-name>ORC Storage Strategy</display-name> <value>SPEED</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> @@ -312,6 +331,7 @@ export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}" <name>hive_txn_acid</name> <display-name>ACID Transactions</display-name> <value>off</value> + <on-ambari-upgrade add="true"/> <value-attributes> <type>value-list</type> <entries> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml index 8529016..3de8a20 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-exec-log4j.xml @@ -113,6 +113,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,RFA log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN </value> + <on-ambari-upgrade add="true"/> <value-attributes> <show-property-name>false</show-property-name> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d6fcfa1/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml index ec8426b..ba7032a 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/configuration/hive-log4j.xml @@ -131,6 +131,7 @@ log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,RFA log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN </value> + <on-ambari-upgrade add="true"/> <value-attributes> <show-property-name>false</show-property-name> </value-attributes>
