ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-21943. LLAP: Daemon is hung when task is killed in the middle of orc tail reads (org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager.allocSlot).
Date Wed, 13 Sep 2017 22:54:49 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 519223db6 -> 70debd47f


AMBARI-21943. LLAP: Daemon is hung when task is killed in the middle of orc tail reads (org.apache.hadoop.hdfs.shortcircuit.DfsClientShmManager.allocSlot).


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70debd47
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70debd47
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70debd47

Branch: refs/heads/branch-2.6
Commit: 70debd47f6615cc3e703b9e3d08923173e24ebf5
Parents: 519223d
Author: Swapan Shridhar <sshridhar@hortonworks.com>
Authored: Tue Sep 12 16:52:11 2017 -0700
Committer: Swapan Shridhar <sshridhar@hortonworks.com>
Committed: Wed Sep 13 15:54:33 2017 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml        |  6 ++++++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml       |  5 +++++
 .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../HIVE/configuration/hive-interactive-site.xml      | 14 ++++++++++++++
 4 files changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/70debd47/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
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 4d1e004..75a8782 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
@@ -540,6 +540,12 @@
             <set key="tez.runtime.shuffle.parallel.copies" value="8"/>
           </definition>
 
+          <definition xsi:type="configure" id="hdp_2_6_maint_llap_config" summary="Updating
LLAP configuration">
+            <type>hive-interactive-site</type>
+            <set key="dfs.short.circuit.shared.memory.watcher.interrupt.check.ms" value="0"
/>
+            <set key="dfs.client.mmap.enabled" value="false" />
+          </definition>
+
         </changes>
 
       </component>

http://git-wip-us.apache.org/repos/asf/ambari/blob/70debd47/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
----------------------------------------------------------------------
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 8bd3fc8..850f725 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
@@ -635,6 +635,11 @@
           <summary>Updating hive atlas application properties</summary>
         </task>
       </execute-stage>
+
+      <execute-stage service="HIVE" component="HIVE_SERVER_INTERACTIVE" title="Updating
DFS related LLAP configurations">
+        <task xsi:type="configure" id="hdp_2_6_maint_llap_config"/>
+      </execute-stage>
+
       <!-- SPARK -->
       <execute-stage service="SPARK" component="LIVY_SERVER" title="Apply config changes
for Livy Server">
         <task xsi:type="configure" id="hdp_2_5_0_0_rename_spark_livy_configs"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/70debd47/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
----------------------------------------------------------------------
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 d89001e..ea58559 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
@@ -860,6 +860,7 @@
           <task xsi:type="configure" id="llap_update_shuffle_parallel_copies"/>
           <task xsi:type="configure" id="llap_update_settings"/>
           <task xsi:type="configure" id="llap_update_tez_settings"/>
+          <task xsi:type="configure" id="hdp_2_6_maint_llap_config"/>
         </pre-upgrade>
         
         <pre-downgrade />

http://git-wip-us.apache.org/repos/asf/ambari/blob/70debd47/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
index cb4f947..aae2efa 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/hive-interactive-site.xml
@@ -110,4 +110,18 @@ limitations under the License.
     <on-ambari-upgrade add="false"/>
   </property>
 
+  <property>
+    <name>dfs.client.mmap.enabled</name>
+    <value>false</value>
+    <description>Disable HDFS caching fo LLAP</description>
+    <on-ambari-upgrade add="false"/>
+  </property>
+
+  <property>
+    <name>dfs.short.circuit.shared.memory.watcher.interrupt.check.ms</name>
+    <value>0</value>
+    <description>Disable HDFS caching fo LLAP</description>
+    <on-ambari-upgrade add="false"/>
+  </property>
+
 </configuration>


Mime
View raw message