MAPREDUCE-7156. NullPointerException when reaching max shuffle connections. Contributed by Peter Bacsko
(cherry picked from commit ba1f9d66d94ed0b85084d7c40c09a87478b3a05a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b86c6512 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b86c6512 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b86c6512 Branch: refs/heads/branch-2-jhung-test Commit: b86c651202fa1fa15e29919ba34264b510073928 Parents: ba89181 Author: Jason Lowe <[email protected]> Authored: Tue Nov 6 17:55:51 2018 -0600 Committer: Jonathan Hung <[email protected]> Committed: Fri Dec 14 16:03:56 2018 -0800 ---------------------------------------------------------------------- .../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/b86c6512/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 0bab750..51cfa54 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 @@ -911,6 +911,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)", @@ -926,8 +928,6 @@ public class ShuffleHandler extends AuxiliaryService { return; } accepted.add(evt.getChannel()); - super.channelOpen(ctx, evt); - } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
