You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by vi...@apache.org on 2013/05/03 00:45:31 UTC
svn commit: r1478595 -
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java
Author: vinodkv
Date: Thu May 2 22:45:30 2013
New Revision: 1478595
URL: http://svn.apache.org/r1478595
Log:
YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1478594 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java?rev=1478595&r1=1478594&r2=1478595&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java Thu May 2 22:45:30 2013
@@ -98,7 +98,7 @@ import org.apache.hadoop.security.proto.
import org.apache.hadoop.security.proto.SecurityProtos.GetDelegationTokenRequestProto;
import org.apache.hadoop.security.proto.SecurityProtos.RenewDelegationTokenRequestProto;
import org.apache.hadoop.yarn.exceptions.YarnRemoteException;
-import org.apache.hadoop.yarn.exceptions.impl.pb.YarnRemoteExceptionPBImpl;
+import org.apache.hadoop.yarn.ipc.RPCUtil;
import com.google.protobuf.ServiceException;
@@ -133,7 +133,7 @@ public class MRClientProtocolPBClientImp
try {
return new GetJobReportResponsePBImpl(proxy.getJobReport(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -144,7 +144,7 @@ public class MRClientProtocolPBClientImp
try {
return new GetTaskReportResponsePBImpl(proxy.getTaskReport(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -155,7 +155,7 @@ public class MRClientProtocolPBClientImp
try {
return new GetTaskAttemptReportResponsePBImpl(proxy.getTaskAttemptReport(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -166,7 +166,7 @@ public class MRClientProtocolPBClientImp
try {
return new GetCountersResponsePBImpl(proxy.getCounters(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -177,7 +177,7 @@ public class MRClientProtocolPBClientImp
try {
return new GetTaskAttemptCompletionEventsResponsePBImpl(proxy.getTaskAttemptCompletionEvents(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -188,7 +188,7 @@ public class MRClientProtocolPBClientImp
try {
return new GetTaskReportsResponsePBImpl(proxy.getTaskReports(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -199,7 +199,7 @@ public class MRClientProtocolPBClientImp
try {
return new GetDiagnosticsResponsePBImpl(proxy.getDiagnostics(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -212,7 +212,7 @@ public class MRClientProtocolPBClientImp
return new GetDelegationTokenResponsePBImpl(proxy.getDelegationToken(
null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -223,7 +223,7 @@ public class MRClientProtocolPBClientImp
try {
return new KillJobResponsePBImpl(proxy.killJob(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -234,7 +234,7 @@ public class MRClientProtocolPBClientImp
try {
return new KillTaskResponsePBImpl(proxy.killTask(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -245,7 +245,7 @@ public class MRClientProtocolPBClientImp
try {
return new KillTaskAttemptResponsePBImpl(proxy.killTaskAttempt(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -256,7 +256,7 @@ public class MRClientProtocolPBClientImp
try {
return new FailTaskAttemptResponsePBImpl(proxy.failTaskAttempt(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -269,7 +269,7 @@ public class MRClientProtocolPBClientImp
return new RenewDelegationTokenResponsePBImpl(proxy.renewDelegationToken(
null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
@@ -283,7 +283,7 @@ public class MRClientProtocolPBClientImp
proxy.cancelDelegationToken(null, requestProto));
} catch (ServiceException e) {
- throw YarnRemoteExceptionPBImpl.unwrapAndThrowException(e);
+ throw RPCUtil.unwrapAndThrowException(e);
}
}
}