Author: xuefu Date: Wed Dec 24 05:06:08 2014 New Revision: 1647730 URL: http://svn.apache.org/r1647730 Log: HIVE-9207: Add more log information for debug RSC[Spark Branch] (Chengxiang via Xuefu)
Modified: hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/rpc/RpcDispatcher.java Modified: hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java URL: http://svn.apache.org/viewvc/hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java?rev=1647730&r1=1647729&r2=1647730&view=diff ============================================================================== --- hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java (original) +++ hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/RemoteDriver.java Wed Dec 24 05:06:08 2014 @@ -17,6 +17,7 @@ package org.apache.hive.spark.client; +import com.google.common.base.Throwables; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.nio.NioEventLoopGroup; @@ -224,20 +225,24 @@ public class RemoteDriver { private class DriverProtocol extends BaseProtocol { void sendError(Throwable error) { + LOG.debug("Send error to Client: {}", Throwables.getStackTraceAsString(error)); clientRpc.call(new Error(error)); } <T extends Serializable> void jobFinished(String jobId, T result, Throwable error, SparkCounters counters) { + LOG.debug("Send job({}) result to Client.", jobId); clientRpc.call(new JobResult(jobId, result, error, counters)); } void jobSubmitted(String jobId, int sparkJobId) { + LOG.debug("Send job({}/{}) submitted to Client.", jobId, sparkJobId); clientRpc.call(new JobSubmitted(jobId, sparkJobId)); } - void sendMetrics(String clientId, int jobId, int stageId, long taskId, Metrics metrics) { - clientRpc.call(new JobMetrics(clientId, jobId, stageId, taskId, metrics)); + void sendMetrics(String jobId, int sparkJobId, int stageId, long taskId, Metrics metrics) { + LOG.debug("Send task({}/{}/{}/{}) metric to Client.", jobId, sparkJobId, stageId, taskId); + clientRpc.call(new JobMetrics(jobId, sparkJobId, stageId, taskId, metrics)); } private void handle(ChannelHandlerContext ctx, CancelJob msg) { Modified: hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java URL: http://svn.apache.org/viewvc/hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java?rev=1647730&r1=1647729&r2=1647730&view=diff ============================================================================== --- hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java (original) +++ hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java Wed Dec 24 05:06:08 2014 @@ -346,6 +346,7 @@ class SparkClientImpl implements SparkCl jobs.put(jobId, handle); final io.netty.util.concurrent.Future<Void> rpc = driverRpc.call(new JobRequest(jobId, job)); + LOG.debug("Send JobRequest[{}].", jobId); // Link the RPC and the promise so that events from one are propagated to the other as // needed. Modified: hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/rpc/RpcDispatcher.java URL: http://svn.apache.org/viewvc/hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/rpc/RpcDispatcher.java?rev=1647730&r1=1647729&r2=1647730&view=diff ============================================================================== --- hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/rpc/RpcDispatcher.java (original) +++ hive/branches/spark/spark-client/src/main/java/org/apache/hive/spark/client/rpc/RpcDispatcher.java Wed Dec 24 05:06:08 2014 @@ -139,6 +139,7 @@ public abstract class RpcDispatcher exte private void handleError(ChannelHandlerContext ctx, Object msg, OutstandingRpc rpc) throws Exception { if (msg instanceof String) { + LOG.warn("Received error message:{}.", msg); rpc.future.setFailure(new RpcException((String) msg)); } else { String error = String.format("Received error with unexpected payload (%s).",