Repository: hadoop Updated Branches: refs/heads/YARN-7402 1ca57be32 -> e1017a676 (forced update)
MAPREDUCE-7156. NullPointerException when reaching max shuffle connections. Contributed by Peter Bacsko Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba1f9d66 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba1f9d66 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba1f9d66 Branch: refs/heads/YARN-7402 Commit: ba1f9d66d94ed0b85084d7c40c09a87478b3a05a Parents: 08d69d9 Author: Jason Lowe <jl...@apache.org> Authored: Tue Nov 6 17:55:51 2018 -0600 Committer: Jason Lowe <jl...@apache.org> Committed: Tue Nov 6 17:55:51 2018 -0600 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba1f9d66/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java index aeda9cc..c222685 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java @@ -910,6 +910,8 @@ public class ShuffleHandler extends AuxiliaryService { @Override public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent evt) throws Exception { + super.channelOpen(ctx, evt); + if ((maxShuffleConnections > 0) && (accepted.size() >= maxShuffleConnections)) { LOG.info(String.format("Current number of shuffle connections (%d) is " + "greater than or equal to the max allowed shuffle connections (%d)", @@ -925,8 +927,6 @@ public class ShuffleHandler extends AuxiliaryService { return; } accepted.add(evt.getChannel()); - super.channelOpen(ctx, evt); - } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org