Repository: incubator-apex-core Updated Branches: refs/heads/release-3.1 525604ce6 -> 77a86ac2d
APEX-149 #comment Fixed the property name used to lookup RM webapp address in non-HA mode Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/508f6dee Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/508f6dee Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/508f6dee Branch: refs/heads/release-3.1 Commit: 508f6dee1c844748632032a7b82035fda1c82523 Parents: 9d03e25 Author: Pramod Immaneni <[email protected]> Authored: Thu Sep 24 02:09:03 2015 -0700 Committer: Pramod Immaneni <[email protected]> Committed: Thu Sep 24 02:09:03 2015 -0700 ---------------------------------------------------------------------- .../stram/security/StramWSFilter.java | 5 +++++ .../stram/security/StramWSFilterInitializer.java | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/508f6dee/engine/src/main/java/com/datatorrent/stram/security/StramWSFilter.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/security/StramWSFilter.java b/engine/src/main/java/com/datatorrent/stram/security/StramWSFilter.java index 1540c99..556f29d 100644 --- a/engine/src/main/java/com/datatorrent/stram/security/StramWSFilter.java +++ b/engine/src/main/java/com/datatorrent/stram/security/StramWSFilter.java @@ -99,6 +99,7 @@ public class StramWSFilter implements Filter proxyAddresses = new HashSet<String>(); for (String proxyHost : proxyHosts) { try { + logger.debug("resolving proxy hostname {}", proxyHost); for (InetAddress add : InetAddress.getAllByName(proxyHost)) { logger.debug("proxy address is: {}", add.getHostAddress()); proxyAddresses.add(add.getHostAddress()); @@ -153,6 +154,7 @@ public class StramWSFilter implements Filter authenticate = false; } if (authenticate) { + logger.debug("Authenticating"); Cookie cookie = null; if (httpReq.getCookies() != null) { for (Cookie c : httpReq.getCookies()) { @@ -168,8 +170,11 @@ public class StramWSFilter implements Filter user = verifyClientToken(cookie.getValue()); valid = true; logger.debug("Token valid"); + } else { + logger.debug("Cookie not found"); } if (!valid) { + logger.debug("Auth failure {}", HttpServletResponse.SC_UNAUTHORIZED); httpResp.sendError(HttpServletResponse.SC_UNAUTHORIZED); return; } http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/508f6dee/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java b/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java index 6a49f44..e901cb9 100644 --- a/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java +++ b/engine/src/main/java/com/datatorrent/stram/security/StramWSFilterInitializer.java @@ -23,6 +23,9 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.http.FilterContainer; @@ -40,12 +43,15 @@ import com.datatorrent.stram.util.ConfigUtils; */ public class StramWSFilterInitializer extends FilterInitializer { + private static final Logger logger = LoggerFactory.getLogger(StramWSFilterInitializer.class); + private static final String FILTER_NAME = "AM_PROXY_FILTER"; private static final String FILTER_CLASS = StramWSFilter.class.getCanonicalName(); @Override public void initFilter(FilterContainer container, Configuration conf) { + logger.debug("Conf {}", conf); Map<String, String> params = new HashMap<String, String>(); Collection<String> proxies = new ArrayList<String>(); if (ConfigUtils.isRMHAEnabled(conf)) { @@ -77,6 +83,8 @@ public class StramWSFilterInitializer extends FilterInitializer public String getProxyHostAndPort(Configuration conf) { String addr = conf.get(YarnConfiguration.PROXY_ADDRESS); + logger.info("proxy address setting {}", addr); + logger.debug("proxy setting sources {}", conf.getPropertySources(YarnConfiguration.PROXY_ADDRESS)); if (addr == null || addr.isEmpty()) { addr = getResolvedRMWebAppURLWithoutScheme(conf, null); } @@ -93,27 +101,29 @@ public class StramWSFilterInitializer extends FilterInitializer boolean sslEnabled = conf.getBoolean( CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_KEY, CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_DEFAULT); - return getResolvedRMWebAppURLWithoutScheme(conf, sslEnabled, (rmId != null) ? "." + rmId : null); + return getResolvedRMWebAppURLWithoutScheme(conf, sslEnabled, (rmId != null) ? "." + rmId : ""); } /* From org.apache.hadoop.yarn.webapp.util.WebAppUtils Modified for HA support */ - public String getResolvedRMWebAppURLWithoutScheme(Configuration conf, boolean sslEnabled, String rmId) + public String getResolvedRMWebAppURLWithoutScheme(Configuration conf, boolean sslEnabled, String rmPrpKey) { InetSocketAddress address = null; if (sslEnabled) { address = - conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + rmId, + conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + rmPrpKey, YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_PORT); } else { address = - conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_ADDRESS + rmId, + conf.getSocketAddr(YarnConfiguration.RM_WEBAPP_ADDRESS + rmPrpKey, YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_PORT); } + logger.info("rm webapp address setting {}", address); + logger.debug("rm setting sources {}", conf.getPropertySources(YarnConfiguration.RM_WEBAPP_ADDRESS)); address = NetUtils.getConnectAddress(address); StringBuffer sb = new StringBuffer(); InetAddress resolved = address.getAddress(); @@ -130,6 +140,7 @@ public class StramWSFilterInitializer extends FilterInitializer sb.append(address.getHostName()); } sb.append(":").append(address.getPort()); + logger.info("rm webapp resolved hostname {}", sb.toString()); return sb.toString(); }
