From common-commits-return-77916-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Wed Jan 24 20:17:41 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 05963180630 for ; Wed, 24 Jan 2018 20:17:41 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EA928160C3C; Wed, 24 Jan 2018 19:17:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3D773160C39 for ; Wed, 24 Jan 2018 20:17:40 +0100 (CET) Received: (qmail 65336 invoked by uid 500); 24 Jan 2018 19:17:39 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 65327 invoked by uid 99); 24 Jan 2018 19:17:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jan 2018 19:17:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3482ED499; Wed, 24 Jan 2018 19:17:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianhe@apache.org To: common-commits@hadoop.apache.org Message-Id: <514e785cd46246f4ad5f584444bc2240@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7801. AmFilterInitializer should addFilter after fill all parameters. Contributed by Wangda Tan Date: Wed, 24 Jan 2018 19:17:37 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 97607617c -> 55c32776b YARN-7801. AmFilterInitializer should addFilter after fill all parameters. Contributed by Wangda Tan Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55c32776 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55c32776 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55c32776 Branch: refs/heads/trunk Commit: 55c32776b1f130c6b81ef7aff5fc1562180f4601 Parents: 9760761 Author: Jian He Authored: Wed Jan 24 11:16:54 2018 -0800 Committer: Jian He Committed: Wed Jan 24 11:17:12 2018 -0800 ---------------------------------------------------------------------- .../hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/55c32776/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java index c3ddc54..27742e4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java @@ -59,7 +59,6 @@ public class AmFilterInitializer extends FilterInitializer { } sb.setLength(sb.length() - 1); params.put(AmIpFilter.PROXY_URI_BASES, sb.toString()); - container.addFilter(FILTER_NAME, FILTER_CLASS, params); // Handle RM HA urls // Include yarn-site.xml in the classpath @@ -75,6 +74,8 @@ public class AmFilterInitializer extends FilterInitializer { params.put(RM_HA_URLS, StringUtils.join(",", urls)); } } + + container.addFilter(FILTER_NAME, FILTER_CLASS, params); } private Collection getRmIds(Configuration conf) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org