This is an automated email from the ASF dual-hosted git repository. ncole pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 696083e [AMBARI-23329] Ambari: set 'cloud storage' usage tracking properties for AWS, Azure object stores 696083e is described below commit 696083e0ce406fea1eccc7a9dbbca8b7d3700d66 Author: Nate Cole <nc...@hortonworks.com> AuthorDate: Thu Mar 29 16:01:00 2018 -0400 [AMBARI-23329] Ambari: set 'cloud storage' usage tracking properties for AWS, Azure object stores --- .../common-services/HDFS/2.1.0.2.0/configuration/core-site.xml | 10 ++++++++++ .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 9 +++++++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 4 ++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 4 ++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 4 ++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 4 ++++ .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 9 +++++++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 4 ++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 4 ++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 4 ++++ .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 9 +++++++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 4 ++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 4 ++++ 22 files changed, 109 insertions(+) diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml index d39ea78..4933a4a 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml @@ -197,4 +197,14 @@ DEFAULT </supported-refresh-commands> <on-ambari-upgrade add="false"/> </property> + <property> + <name>fs.azure.user.agent.prefix</name> + <value>User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}</value> + <on-ambari-upgrade add="false" /> + </property> + <property> + <name>fs.s3a.user.agent.prefix</name> + <value>User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}</value> + <on-ambari-upgrade add="false" /> + </property> </configuration> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index 2324673..4195484 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -393,6 +393,15 @@ </changes> </component> + <component name="HDFS_CLIENT"> + <changes> + <definition xsi:type="configure" id="hdfs_user_agent" summary="Set User-Agent"> + <type>core-site</type> + <set key="fs.azure.user.agent.prefix" value="User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}" if-type="core-site" if-key="fs.azure.user.agent.prefix" if-key-state="absent" /> + <set key="fs.s3a.user.agent.prefix" value="User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}" if-type="core-site" if-key="fs.s3a.user.agent.prefix" if-key-state="absent" /> + </definition> + </changes> + </component> </service> <service name="SPARK"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml index 7260b35..f48751a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml @@ -258,6 +258,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!--YARN--> <execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml index aca8891..214e80d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml @@ -269,6 +269,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml index d3f287b..f006cf5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml @@ -290,6 +290,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml index bc5893c..5b701c1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml @@ -303,6 +303,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Calculating Yarn Properties for Spark"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.SparkShufflePropertyConfig"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml index 19031a8..5146b7b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml @@ -571,6 +571,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task"/> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index 11fb0c5..d159ce0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -598,6 +598,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml index 56c1552..ad9221d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml @@ -697,6 +697,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml index faf8cbc..a4e6a26 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml @@ -707,6 +707,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index efb997a..8871ff9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -277,6 +277,15 @@ </definition> </changes> </component> + <component name="HDFS_CLIENT"> + <changes> + <definition xsi:type="configure" id="hdfs_user_agent" summary="Set User-Agent"> + <type>core-site</type> + <set key="fs.azure.user.agent.prefix" value="User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}" if-type="core-site" if-key="fs.azure.user.agent.prefix" if-key-state="absent" /> + <set key="fs.s3a.user.agent.prefix" value="User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}" if-type="core-site" if-key="fs.s3a.user.agent.prefix" if-key-state="absent" /> + </definition> + </changes> + </component> </service> <service name="YARN"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml index cbde5ce..af282f9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml @@ -256,6 +256,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!--YARN--> <execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml index 15abd7b..8d73638 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml @@ -383,6 +383,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!-- SQOOP --> <execute-stage service="SQOOP" component="SQOOP" title="Apply config changes for Sqoop to remove Atlas Configs"> <!-- Remove Atlas configs that were incorrectly added to sqoop-site instead of Atlas' application.properties. --> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml index 447dc3d..4299f46 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml @@ -452,6 +452,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!--SPARK--> <execute-stage service="SPARK" component="SPARK_CLIENT" title="Apply config changes for Spark"> <task xsi:type="configure" id="hdp_2_5_0_0_spark_yarn_queue"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml index 80436bf..6948a27 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml @@ -547,6 +547,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml index e2c7557..ac69e2f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml @@ -697,6 +697,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml index 9e56d97..048a634 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml @@ -712,6 +712,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml index 8c2c860..690f916 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml @@ -296,6 +296,15 @@ </definition> </changes> </component> + <component name="HDFS_CLIENT"> + <changes> + <definition xsi:type="configure" id="hdfs_user_agent" summary="Set User-Agent"> + <type>core-site</type> + <set key="fs.azure.user.agent.prefix" value="User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}" if-type="core-site" if-key="fs.azure.user.agent.prefix" if-key-state="absent" /> + <set key="fs.s3a.user.agent.prefix" value="User-Agent: APN/1.0 Hortonworks/1.0 HDP/{{version}}" if-type="core-site" if-key="fs.s3a.user.agent.prefix" if-key-state="absent" /> + </definition> + </changes> + </component> </service> <service name="HBASE"> <component name="HBASE_MASTER"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index e5ae667..1042795 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -281,6 +281,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!--YARN--> <execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index f696ced..a3961ea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -296,6 +296,10 @@ <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> </execute-stage> + <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set User-Agent"> + <task xsi:type="configure" id="hdfs_user_agent" /> + </execute-stage> + <!--YARN--> <execute-stage service="MAPREDUCE2" component="MAPREDUCE2_CLIENT" title="Apply config changes for Mapreduce2 client"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.FixLzoCodecPath"> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index 159b81a..5a2a72a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -597,6 +597,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index bcf8dee..5437370 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -651,6 +651,10 @@ </component> <component name="HDFS_CLIENT"> + <pre-upgrade> + <task xsi:type="configure" id="hdfs_user_agent" /> + </pre-upgrade> + <pre-downgrade /> <upgrade> <task xsi:type="restart-task" /> </upgrade> -- To stop receiving notification emails like this one, please contact nc...@apache.org.