You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2012/10/06 17:13:19 UTC
svn commit: r1395093 - in /hbase/branches/0.94:
security/src/main/java/org/apache/hadoop/hbase/ipc/
src/main/java/org/apache/hadoop/hbase/ipc/
src/test/java/org/apache/hadoop/hbase/client/
src/test/java/org/apache/hadoop/hbase/ipc/
Author: larsh
Date: Sat Oct 6 15:13:19 2012
New Revision: 1395093
URL: http://svn.apache.org/viewvc?rev=1395093&view=rev
Log:
HBASE-6920 Addendum2. Remove test code which does not work for the Secure build
Removed:
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/ipc/RandomTimeoutRpcEngine.java
Modified:
hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java
Modified: hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java?rev=1395093&r1=1395092&r2=1395093&view=diff
==============================================================================
--- hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java (original)
+++ hbase/branches/0.94/security/src/main/java/org/apache/hadoop/hbase/ipc/SecureRpcEngine.java Sat Oct 6 15:13:19 2012
@@ -196,7 +196,7 @@ public class SecureRpcEngine implements
public VersionedProtocol getProxy(
Class<? extends VersionedProtocol> protocol, long clientVersion,
InetSocketAddress addr, User ticket,
- Configuration conf, SocketFactory factory, int rpcTimeout, InvocationHandler handler)
+ Configuration conf, SocketFactory factory, int rpcTimeout)
throws IOException {
if (User.isSecurityEnabled()) {
HBaseSaslRpcServer.init(conf);
@@ -204,7 +204,7 @@ public class SecureRpcEngine implements
VersionedProtocol proxy =
(VersionedProtocol) Proxy.newProxyInstance(
protocol.getClassLoader(), new Class[] { protocol },
- handler);
+ new Invoker(protocol, addr, ticket, conf, factory, rpcTimeout));
long serverVersion = proxy.getProtocolVersion(protocol.getName(),
clientVersion);
if (serverVersion != clientVersion) {
@@ -214,14 +214,6 @@ public class SecureRpcEngine implements
return proxy;
}
- public VersionedProtocol getProxy(Class<? extends VersionedProtocol> protocol,
- long clientVersion, InetSocketAddress addr,
- User ticket, Configuration conf,
- SocketFactory factory, int rpcTimeout) throws IOException {
- return getProxy(protocol, clientVersion, addr, ticket, conf, factory, rpcTimeout,
- new Invoker(protocol, addr, ticket, conf, factory, rpcTimeout));
- }
-
/**
* Stop this proxy and release its invoker's resource
* @param proxy the proxy to be stopped
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java?rev=1395093&r1=1395092&r2=1395093&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java Sat Oct 6 15:13:19 2012
@@ -129,7 +129,7 @@ public class HBaseRPC {
}
// return the RpcEngine that handles a proxy object
- static synchronized RpcEngine getProxyEngine(Object proxy) {
+ private static synchronized RpcEngine getProxyEngine(Object proxy) {
return PROXY_ENGINES.get(proxy.getClass());
}
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java?rev=1395093&r1=1395092&r2=1395093&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java Sat Oct 6 15:13:19 2012
@@ -19,7 +19,6 @@
*/
package org.apache.hadoop.hbase.ipc;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -38,13 +37,6 @@ interface RpcEngine {
User ticket, Configuration conf,
SocketFactory factory, int rpcTimeout) throws IOException;
- /** Construct a client-side proxy object, specifying an InvocationHandler for testing purposes */
- VersionedProtocol getProxy(Class<? extends VersionedProtocol> protocol,
- long clientVersion, InetSocketAddress addr,
- User ticket, Configuration conf,
- SocketFactory factory, int rpcTimeout, InvocationHandler handler)
- throws IOException;
-
/** Stop this proxy. */
void stopProxy(VersionedProtocol proxy);
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java?rev=1395093&r1=1395092&r2=1395093&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java Sat Oct 6 15:13:19 2012
@@ -121,7 +121,7 @@ class WritableRpcEngine implements RpcEn
protected final static ClientCache CLIENTS = new ClientCache();
- static class Invoker implements InvocationHandler {
+ private static class Invoker implements InvocationHandler {
private Class<? extends VersionedProtocol> protocol;
private InetSocketAddress address;
private User ticket;
@@ -172,12 +172,13 @@ class WritableRpcEngine implements RpcEn
public VersionedProtocol getProxy(
Class<? extends VersionedProtocol> protocol, long clientVersion,
InetSocketAddress addr, User ticket,
- Configuration conf, SocketFactory factory, int rpcTimeout, InvocationHandler handler)
+ Configuration conf, SocketFactory factory, int rpcTimeout)
throws IOException {
VersionedProtocol proxy =
(VersionedProtocol) Proxy.newProxyInstance(
- protocol.getClassLoader(), new Class[] { protocol }, handler);
+ protocol.getClassLoader(), new Class[] { protocol },
+ new Invoker(protocol, addr, ticket, conf, factory, rpcTimeout));
if (proxy instanceof VersionedProtocol) {
long serverVersion = ((VersionedProtocol)proxy)
.getProtocolVersion(protocol.getName(), clientVersion);
@@ -189,14 +190,6 @@ class WritableRpcEngine implements RpcEn
return proxy;
}
- public VersionedProtocol getProxy(Class<? extends VersionedProtocol> protocol,
- long clientVersion, InetSocketAddress addr,
- User ticket, Configuration conf,
- SocketFactory factory, int rpcTimeout) throws IOException {
- return getProxy(protocol, clientVersion, addr, ticket, conf, factory, rpcTimeout,
- new Invoker(protocol, addr, ticket, conf, factory, rpcTimeout));
- }
-
/**
* Stop this proxy and release its invoker's resource
* @param proxy the proxy to be stopped