You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/03/27 05:38:38 UTC
svn commit: r1305723 - in
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: ./
src/main/java/org/apache/hadoop/ha/ src/main/java/org/apache/hadoop/ipc/
src/test/java/org/apache/hadoop/ipc/
Author: suresh
Date: Tue Mar 27 03:38:37 2012
New Revision: 1305723
URL: http://svn.apache.org/viewvc?rev=1305723&view=rev
Log:
HDFS-8202. Merging change 1305704 from trunk to 0.23.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1305723&r1=1305722&r2=1305723&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Tue Mar 27 03:38:37 2012
@@ -178,6 +178,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8204. TestHealthMonitor fails occasionally (todd)
+ HADOOP-8202. RPC stopProxy() does not close the proxy correctly.
+ (Hari Mankude via suresh)
+
BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java?rev=1305723&r1=1305722&r2=1305723&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HealthMonitor.java Tue Mar 27 03:38:37 2012
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.ha;
+import java.io.Closeable;
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedList;
@@ -194,7 +195,9 @@ class HealthMonitor {
} catch (Throwable t) {
LOG.warn("Transport-level exception trying to monitor health of " +
targetToMonitor + ": " + t.getLocalizedMessage());
- RPC.stopProxy(proxy);
+ if (proxy instanceof Closeable) {
+ RPC.stopProxy(proxy);
+ }
proxy = null;
enterState(State.SERVICE_NOT_RESPONDING);
Thread.sleep(sleepAfterDisconnectMillis);
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java?rev=1305723&r1=1305722&r2=1305723&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java Tue Mar 27 03:38:37 2012
@@ -39,6 +39,7 @@ import javax.net.SocketFactory;
import org.apache.commons.logging.*;
+import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.io.*;
import org.apache.hadoop.ipc.Client.ConnectionId;
import org.apache.hadoop.ipc.RpcPayloadHeader.RpcKind;
@@ -572,38 +573,41 @@ public class RPC {
}
/**
- * Stop this proxy and release its invoker's resource by getting the
- * invocation handler for the given proxy object and calling
- * {@link Closeable#close} if that invocation handler implements
- * {@link Closeable}.
+ * Stop the proxy. Proxy must either implement {@link Closeable} or must have
+ * associated {@link RpcInvocationHandler}.
*
- * @param proxy the RPC proxy object to be stopped
+ * @param proxy
+ * the RPC proxy object to be stopped
+ * @throws HadoopIllegalArgumentException
+ * if the proxy does not implement {@link Closeable} interface or
+ * does not have closeable {@link InvocationHandler}
*/
public static void stopProxy(Object proxy) {
- if (proxy instanceof ProtocolTranslator) {
- RPC.stopProxy(((ProtocolTranslator)proxy)
- .getUnderlyingProxyObject());
- return;
+ if (proxy == null) {
+ throw new HadoopIllegalArgumentException(
+ "Cannot close proxy since it is null");
}
-
- InvocationHandler invocationHandler = null;
try {
- invocationHandler = Proxy.getInvocationHandler(proxy);
- } catch (IllegalArgumentException e) {
- LOG.error("Tried to call RPC.stopProxy on an object that is not a proxy.", e);
- }
- if (proxy != null && invocationHandler != null &&
- invocationHandler instanceof Closeable) {
- try {
- ((Closeable)invocationHandler).close();
- } catch (IOException e) {
- LOG.error("Stopping RPC invocation handler caused exception", e);
+ if (proxy instanceof Closeable) {
+ ((Closeable) proxy).close();
+ return;
+ } else {
+ InvocationHandler handler = Proxy.getInvocationHandler(proxy);
+ if (handler instanceof Closeable) {
+ ((Closeable) handler).close();
+ return;
+ }
}
- } else {
- LOG.error("Could not get invocation handler " + invocationHandler +
- " for proxy class " + (proxy == null ? null : proxy.getClass()) +
- ", or invocation handler is not closeable.");
+ } catch (IOException e) {
+ LOG.error("Closing proxy or invocation handler caused exception", e);
+ } catch (IllegalArgumentException e) {
+ LOG.error("RPC.stopProxy called on non proxy.", e);
}
+
+ throw new HadoopIllegalArgumentException(
+ "Cannot close proxy - is not Closeable or "
+ + "does not provide closeable invocation handler "
+ + proxy.getClass());
}
/**
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java?rev=1305723&r1=1305722&r2=1305723&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java Tue Mar 27 03:38:37 2012
@@ -33,6 +33,7 @@ import java.util.Arrays;
import javax.net.SocketFactory;
import org.apache.commons.logging.*;
+import org.apache.hadoop.HadoopIllegalArgumentException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.io.UTF8;
@@ -584,9 +585,10 @@ public class TestRPC {
* Test stopping a non-registered proxy
* @throws Exception
*/
- @Test
+ @Test(expected=HadoopIllegalArgumentException.class)
public void testStopNonRegisteredProxy() throws Exception {
RPC.stopProxy(mock(TestProtocol.class));
+ RPC.stopProxy(null);
}
@Test