From 44a62e2c974403d1d9a59af920d8d4136d631e90 Mon Sep 17 00:00:00 2001 From: Richard Antal Date: Wed, 28 Apr 2021 15:28:49 +0200 Subject: [PATCH] PHOENIX-6351 PhoenixMRJobUtil getActiveResourceManagerAddress logic fails on pseudodistributed cluster Change-Id: Id6c2382a6bac888c65900e8f0327d07c8a9e6fd0 --- .../org/apache/phoenix/util/PhoenixMRJobUtil.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixMRJobUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixMRJobUtil.java index dc6a15a779d..1f156036028 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixMRJobUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixMRJobUtil.java @@ -91,13 +91,6 @@ public static String getRMWebAddress(Configuration config, String Rmid){ public static String getActiveResourceManagerAddress(Configuration config, String zkQuorum) throws IOException, InterruptedException, KeeperException, InvalidProtocolBufferException, ZooKeeperConnectionException { - // In case of yarn HA is NOT enabled - String resourceManager = PhoenixMRJobUtil.getRMWebAddress(config); - - LOGGER.info("ResourceManagerAddress from config = " + resourceManager); - if(!resourceManager.equals(YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS)){ - return resourceManager; - } // In case of yarn HA is enabled ZKWatcher zkw = null; ZooKeeper zk = null; @@ -130,6 +123,11 @@ public static String getActiveResourceManagerAddress(Configuration config, Strin if (zkw != null) zkw.close(); if (zk != null) zk.close(); } + // In case of yarn HA is NOT enabled + if (activeRMHost == null) { + activeRMHost = PhoenixMRJobUtil.getRMWebAddress(config); + LOGGER.info("ResourceManagerAddress from config = " + activeRMHost); + } return activeRMHost; }