You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/02/07 22:55:52 UTC

ambari git commit: AMBARI-19903. In UpgradeCatalog250.java, (1). Fix value for config "hive.llap.daemon.rpc.port" to be updated as "0" and (2). Remove update for config 'hive.llap.execution.mode'.

Repository: ambari
Updated Branches:
  refs/heads/trunk 01c497618 -> 14738859c


AMBARI-19903. In UpgradeCatalog250.java, (1). Fix value for config "hive.llap.daemon.rpc.port" to be updated as "0" and (2). Remove update for config 'hive.llap.execution.mode'.


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

Branch: refs/heads/trunk
Commit: 14738859ccdffa64ba5d66a5cdf3757723826736
Parents: 01c4976
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Tue Feb 7 12:58:40 2017 -0800
Committer: Swapan Shridhar <ss...@hortonworks.com>
Committed: Tue Feb 7 14:21:07 2017 -0800

----------------------------------------------------------------------
 .../org/apache/ambari/server/upgrade/UpgradeCatalog250.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/14738859/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 18e9744..8f0d218 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -654,16 +654,13 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog {
 
             updateConfigurationProperties(HIVE_INTERACTIVE_SITE, Collections.singletonMap("hive.auto.convert.join.noconditionaltask.size",
                 "1000000000"), true, true);
-            updateConfigurationProperties(HIVE_INTERACTIVE_SITE,
-                Collections.singletonMap("hive.llap.execution.mode", "only"),
-                true, true);
             String llapRpcPortString = hiveInteractiveSite.getProperties().get("hive.llap.daemon.rpc.port");
             if (StringUtils.isNotBlank(llapRpcPortString)) {
               try {
                 int llapRpcPort = Integer.parseInt(llapRpcPortString);
                 if (llapRpcPort == 15001) {
                   updateConfigurationProperties(HIVE_INTERACTIVE_SITE,
-                      Collections.singletonMap("hive.llap.daemon.rpc.port", "only"),
+                      Collections.singletonMap("hive.llap.daemon.rpc.port", "0"),
                       true, true);
                 }
               } catch (NumberFormatException e) {