Repository: ambari Updated Branches: refs/heads/branch-2.5 b09b2c8c2 -> c25187fa6
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/c25187fa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c25187fa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c25187fa Branch: refs/heads/branch-2.5 Commit: c25187fa6e78cb8ba5929cf805c75ad7775c0fab Parents: b09b2c8 Author: Swapan Shridhar <[email protected]> Authored: Tue Feb 7 12:58:40 2017 -0800 Committer: Swapan Shridhar <[email protected]> Committed: Tue Feb 7 15:05:52 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/c25187fa/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 ccb6b9e..8dd4e0a 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 @@ -649,16 +649,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) {
