ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adorosz...@apache.org
Subject [ambari] branch branch-2.7 updated: AMBARI-24823. Set path encoding for GCS (#2513)
Date Thu, 25 Oct 2018 16:00:41 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 6242f3a  AMBARI-24823. Set path encoding for GCS (#2513)
6242f3a is described below

commit 6242f3ab12686e92ecf218f833d6c61ee3dca4a9
Author: Doroszlai, Attila <6454655+adoroszlai@users.noreply.github.com>
AuthorDate: Thu Oct 25 18:00:32 2018 +0200

    AMBARI-24823. Set path encoding for GCS (#2513)
---
 .../HDFS/2.1.0.2.0/configuration/core-site.xml                | 11 +++++++++++
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml |  6 ++++++
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml        |  4 ++++
 .../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml    |  1 +
 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml |  6 ++++++
 .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml        |  4 ++++
 .../main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml    |  1 +
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml |  6 ++++++
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml        |  4 ++++
 .../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml    |  1 +
 10 files changed, 44 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 253e514..1e1c205 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
@@ -213,6 +213,17 @@ DEFAULT
     <on-ambari-upgrade add="false" />
   </property>
   <property>
+    <name>fs.gs.path.encoding</name>
+    <value>uri-path</value>
+    <description>The path encoding codec to be used for GCS</description>
+    <on-ambari-upgrade add="false" />
+  </property>
+  <property>
+    <name>fs.gs.working.dir</name>
+    <value>/</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" />
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 95a0d30..d0f69f2 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
@@ -401,6 +401,12 @@
             <set key="fs.gs.application.name.suffix" value=" (GPN:Hortonworks; version
1.0) HDP/{{version}}" if-type="core-site" if-key="fs.gs.application.name.suffix" 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>
+
+          <definition xsi:type="configure" id="gcs_properties" summary="Set properties
for GCS">
+            <type>core-site</type>
+            <set key="fs.gs.path.encoding" value="uri-path" if-type="core-site" if-key="fs.gs.path.encoding"
if-key-state="absent" />
+            <set key="fs.gs.working.dir" value="/" if-type="core-site" if-key="fs.gs.working.dir"
if-key-state="absent" />
+          </definition>
         </changes>
       </component>
     </service>
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 bde3665..9424706 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
@@ -307,6 +307,10 @@
         <task xsi:type="configure" id="hdfs_user_agent" />
       </execute-stage>
 
+      <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set properties for
GCS">
+        <task xsi:type="configure" id="gcs_properties" />
+      </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.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index 8824c74..296a041 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
@@ -699,6 +699,7 @@
       <component name="HDFS_CLIENT">
         <pre-upgrade>
           <task xsi:type="configure" id="hdfs_user_agent" />
+          <task xsi:type="configure" id="gcs_properties" />
         </pre-upgrade>
         <pre-downgrade />
         <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 cfe40c5..1bffdbe 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
@@ -285,6 +285,12 @@
             <set key="fs.gs.application.name.suffix" value=" (GPN:Hortonworks; version
1.0) HDP/{{version}}" if-type="core-site" if-key="fs.gs.application.name.suffix" 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>
+
+          <definition xsi:type="configure" id="gcs_properties" summary="Set properties
for GCS">
+            <type>core-site</type>
+            <set key="fs.gs.path.encoding" value="uri-path" if-type="core-site" if-key="fs.gs.path.encoding"
if-key-state="absent" />
+            <set key="fs.gs.working.dir" value="/" if-type="core-site" if-key="fs.gs.working.dir"
if-key-state="absent" />
+          </definition>
         </changes>
       </component>
     </service>
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 55de1c0..a411884 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
@@ -456,6 +456,10 @@
         <task xsi:type="configure" id="hdfs_user_agent" />
       </execute-stage>
 
+      <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set properties for
GCS">
+        <task xsi:type="configure" id="gcs_properties" />
+      </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.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml
index aa0b24b..24e96c8 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
@@ -704,6 +704,7 @@
       <component name="HDFS_CLIENT">
         <pre-upgrade>
           <task xsi:type="configure" id="hdfs_user_agent" />
+          <task xsi:type="configure" id="gcs_properties" />
         </pre-upgrade>
         <pre-downgrade />
         <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 ecbe956..064b9e6 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
@@ -304,6 +304,12 @@
             <set key="fs.gs.application.name.suffix" value=" (GPN:Hortonworks; version
1.0) HDP/{{version}}" if-type="core-site" if-key="fs.gs.application.name.suffix" 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>
+
+          <definition xsi:type="configure" id="gcs_properties" summary="Set properties
for GCS">
+            <type>core-site</type>
+            <set key="fs.gs.path.encoding" value="uri-path" if-type="core-site" if-key="fs.gs.path.encoding"
if-key-state="absent" />
+            <set key="fs.gs.working.dir" value="/" if-type="core-site" if-key="fs.gs.working.dir"
if-key-state="absent" />
+          </definition>
         </changes>
       </component>
     </service>
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 8b8d6f5..d26ea10 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
@@ -300,6 +300,10 @@
         <task xsi:type="configure" id="hdfs_user_agent" />
       </execute-stage>
 
+      <execute-stage service="HDFS" component="HDFS_CLIENT" title="Set properties for
GCS">
+        <task xsi:type="configure" id="gcs_properties" />
+      </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.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 22f5260..95d48ed 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
@@ -643,6 +643,7 @@
       <component name="HDFS_CLIENT">
         <pre-upgrade>
           <task xsi:type="configure" id="hdfs_user_agent" />
+          <task xsi:type="configure" id="gcs_properties" />
         </pre-upgrade>
         <pre-downgrade />
         <upgrade>


Mime
View raw message