This is an automated email from the ASF dual-hosted git repository.

ncole pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 8a594e1  AMBARI-23329. Ambari: set 'cloud storage' usage tracking 
properties for AWS, Azure object stores
8a594e1 is described below

commit 8a594e105340c012b8a830e0e47dc45c3218f727
Author: Nate Cole <[email protected]>
AuthorDate: Thu Mar 22 13:15:05 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 ++++
 .../main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  |  9 +++++++++
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml         |  4 ++++
 .../src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  4 ++++
 25 files changed, 126 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 5c6f043..550845a 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
@@ -185,4 +185,14 @@ DEFAULT
     </description>
     <on-ambari-upgrade add="true"/>
   </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 09422cb..2635548 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 e700dfe..0025c98 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
@@ -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.3/upgrades/nonrolling-upgrade-2.4.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index 3f0c752..db26200 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 8dbc82b..abb9c87 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 ed7e4b4..f72d607 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 16f7fab..681e93c 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
@@ -570,6 +570,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 bd55e7c..967a18b 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
@@ -596,6 +596,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 f76bb5a..c994d1f 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
@@ -698,6 +698,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 3042197..61e4794 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
@@ -708,6 +708,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 813e3ae..d0f1881 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 acf737a..fee5ed1 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 084993a..1b07c40 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 23412a0..2f76f93 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 919f6d8..9e9bea7 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 26d36d4..699c3c6 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
@@ -698,6 +698,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 661be06..1e16194 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
@@ -713,6 +713,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 4dd7f6f..d0f83f2 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
@@ -297,6 +297,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 c8bafc4..b19093a 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 2cba275..611de7f 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 bc45084..a1a076e 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 0d02ba6..c2c6d55 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>
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 9478722..cc2b1bb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -51,6 +51,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="HIVE">
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 39d36b0..db37624 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -305,6 +305,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>
+
       <!-- HIVE -->
       <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply 
config changes for Ranger Hive plugin">
         <task xsi:type="configure" 
id="hdp_2_6_maint_ranger_hive_plugin_cluster_name"/>
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index c1f5755..5017212 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -639,6 +639,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
[email protected].

Reply via email to