forked from mapr/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MapR [SPARK-434] Move absent commits from 2.3.2 branch (apache#425)
* MapR [SPARK-352] Spark shell fails with "NoClassDefFoundError: org/apache/hadoop/fs/FSDataInputStream" if java is not available in PATH * MapR [SPARK-350] Deprecate Spark Kafka-09 package * MapR [SPARK-326] Investigate possibility of writing Java example for the MapRDB OJAI connector * [SPARK-356] Merge mapr changes from kafka-09 package into the kafka-10 * SPARK-319 Fix for sparkR version check * MapR [SPARK-349] Update OJAI client to v3 for Spark MapR-DB JSON connector * MapR [SPARK-367] Move absent commits from 2.3.1 branch * MapR [SPARK-137] Analyze the warning during compilation of OJAI connector * MapR [SPARK-369] Spark 2.3.2 fails with error related to zookeeper * [MAPR-26258] hbasecontext.HBaseDistributedScanExample fails * [SPARK-24355] Spark external shuffle server improvement to better handle block fetch requests * MapR [SPARK-374] Spark Hive example fails when we submit job from another(simple) cluster user * MapR [SPARK-434] Move absent commits from 2.3.2 branch * MapR [SPARK-434] Move absent commits from 2.3.2 branch * MapR [SPARK-373] Unexpected behavior during job running in standalone cluster mode * MapR [SPARK-419] Update hive-maprdb-json-handler jar for spark 2.3.2.0 and spark 2.2.1 * MapR [SPARK-396] Interface change of sendToKafka * MapR [SPARK-357] consumer groups are prepeneded with a "service_" prefix * MapR [SPARK-429] Changes in maprdb connector are the cause of broken backward compatibility * MapR [SPARK-427] Update kafka in Spark-2.4.0 to the 1.1.1-mapr * MapR [SPARK-434] Move absent commits from 2.3.2 branch * Move absent commits from 2.3.2 branch * MapR [SPARK-434] Move absent commits from 2.3.2 branch * Move absent commits from 2.3.2 branch * Move absent commits from 2.3.2 branch
- Loading branch information
1 parent
cee169b
commit a00fdca
Showing
93 changed files
with
1,619 additions
and
842 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [ ! "$(command -v java)" ]; then | ||
| echo "JAVA_HOME is not set" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| SPARK_HOME=$(readlink -f "/usr/local/spark") | ||
| java -cp $SPARK_HOME'/jars/*' org.apache.spark.classpath.ClasspathFilter $(mapr classpath) $SPARK_HOME'/conf/dep-blacklist.txt' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 135 additions & 0 deletions
135
...etwork-common/src/main/java/org/apache/spark/network/server/ChunkFetchRequestHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.network.server; | ||
|
|
||
| import java.net.SocketAddress; | ||
|
|
||
| import com.google.common.base.Throwables; | ||
| import io.netty.channel.Channel; | ||
| import io.netty.channel.ChannelFuture; | ||
| import io.netty.channel.ChannelFutureListener; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import io.netty.channel.SimpleChannelInboundHandler; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import org.apache.spark.network.buffer.ManagedBuffer; | ||
| import org.apache.spark.network.client.TransportClient; | ||
| import org.apache.spark.network.protocol.ChunkFetchFailure; | ||
| import org.apache.spark.network.protocol.ChunkFetchRequest; | ||
| import org.apache.spark.network.protocol.ChunkFetchSuccess; | ||
| import org.apache.spark.network.protocol.Encodable; | ||
|
|
||
| import static org.apache.spark.network.util.NettyUtils.*; | ||
|
|
||
| /** | ||
| * A dedicated ChannelHandler for processing ChunkFetchRequest messages. When sending response | ||
| * of ChunkFetchRequest messages to the clients, the thread performing the I/O on the underlying | ||
| * channel could potentially be blocked due to disk contentions. If several hundreds of clients | ||
| * send ChunkFetchRequest to the server at the same time, it could potentially occupying all | ||
| * threads from TransportServer's default EventLoopGroup for waiting for disk reads before it | ||
| * can send the block data back to the client as part of the ChunkFetchSuccess messages. As a | ||
| * result, it would leave no threads left to process other RPC messages, which takes much less | ||
| * time to process, and could lead to client timing out on either performing SASL authentication, | ||
| * registering executors, or waiting for response for an OpenBlocks messages. | ||
| */ | ||
| public class ChunkFetchRequestHandler extends SimpleChannelInboundHandler<ChunkFetchRequest> { | ||
| private static final Logger logger = LoggerFactory.getLogger(ChunkFetchRequestHandler.class); | ||
|
|
||
| private final TransportClient client; | ||
| private final StreamManager streamManager; | ||
| /** The max number of chunks being transferred and not finished yet. */ | ||
| private final long maxChunksBeingTransferred; | ||
|
|
||
| public ChunkFetchRequestHandler( | ||
| TransportClient client, | ||
| StreamManager streamManager, | ||
| Long maxChunksBeingTransferred) { | ||
| this.client = client; | ||
| this.streamManager = streamManager; | ||
| this.maxChunksBeingTransferred = maxChunksBeingTransferred; | ||
| } | ||
|
|
||
| @Override | ||
| public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { | ||
| logger.warn("Exception in connection from " + getRemoteAddress(ctx.channel()), cause); | ||
| ctx.close(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void channelRead0( | ||
| ChannelHandlerContext ctx, | ||
| final ChunkFetchRequest msg) throws Exception { | ||
| Channel channel = ctx.channel(); | ||
| if (logger.isTraceEnabled()) { | ||
| logger.trace("Received req from {} to fetch block {}", getRemoteAddress(channel), | ||
| msg.streamChunkId); | ||
| } | ||
| long chunksBeingTransferred = streamManager.chunksBeingTransferred(); | ||
| if (chunksBeingTransferred >= maxChunksBeingTransferred) { | ||
| logger.warn("The number of chunks being transferred {} is above {}, close the connection.", | ||
| chunksBeingTransferred, maxChunksBeingTransferred); | ||
| channel.close(); | ||
| return; | ||
| } | ||
| ManagedBuffer buf; | ||
| try { | ||
| streamManager.checkAuthorization(client, msg.streamChunkId.streamId); | ||
| streamManager.registerChannel(channel, msg.streamChunkId.streamId); | ||
| buf = streamManager.getChunk(msg.streamChunkId.streamId, msg.streamChunkId.chunkIndex); | ||
| } catch (Exception e) { | ||
| logger.error(String.format("Error opening block %s for request from %s", | ||
| msg.streamChunkId, getRemoteAddress(channel)), e); | ||
| respond(channel, new ChunkFetchFailure(msg.streamChunkId, | ||
| Throwables.getStackTraceAsString(e))); | ||
| return; | ||
| } | ||
|
|
||
| streamManager.chunkBeingSent(msg.streamChunkId.streamId); | ||
| respond(channel, new ChunkFetchSuccess(msg.streamChunkId, buf)).addListener( | ||
| (ChannelFutureListener) future -> streamManager.chunkSent(msg.streamChunkId.streamId)); | ||
| } | ||
|
|
||
| /** | ||
| * The invocation to channel.writeAndFlush is async, and the actual I/O on the | ||
| * channel will be handled by the EventLoop the channel is registered to. So even | ||
| * though we are processing the ChunkFetchRequest in a separate thread pool, the actual I/O, | ||
| * which is the potentially blocking call that could deplete server handler threads, is still | ||
| * being processed by TransportServer's default EventLoopGroup. In order to throttle the max | ||
| * number of threads that channel I/O for sending response to ChunkFetchRequest, the thread | ||
| * calling channel.writeAndFlush will wait for the completion of sending response back to | ||
| * client by invoking await(). This will throttle the rate at which threads from | ||
| * ChunkFetchRequest dedicated EventLoopGroup submit channel I/O requests to TransportServer's | ||
| * default EventLoopGroup, thus making sure that we can reserve some threads in | ||
| * TransportServer's default EventLoopGroup for handling other RPC messages. | ||
| */ | ||
| private ChannelFuture respond( | ||
| final Channel channel, | ||
| final Encodable result) throws InterruptedException { | ||
| final SocketAddress remoteAddress = channel.remoteAddress(); | ||
| return channel.writeAndFlush(result).await().addListener((ChannelFutureListener) future -> { | ||
| if (future.isSuccess()) { | ||
| logger.trace("Sent result {} to client {}", result, remoteAddress); | ||
| } else { | ||
| logger.error(String.format("Error sending result %s to %s; closing connection", | ||
| result, remoteAddress), future.cause()); | ||
| channel.close(); | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.