Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-7482 Port HBASE-7442 HBase remote CopyTable not working when security enabled to trunk 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1455764 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Helmling 2013-03-13 00:38:19 +00:00
parent 39a02611b5
commit d45cbcac1a
14 changed files with 67 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -615,7 +615,7 @@ public class HConnectionManager {
// ProtobufRpcClientEngine is the main RpcClientEngine implementation,
// but we maintain access through an interface to allow overriding for tests
// RPC engine setup must follow obtaining the cluster ID for token authentication to work
this.rpcEngine = new ProtobufRpcClientEngine(this.conf);
this.rpcEngine = new ProtobufRpcClientEngine(this.conf, this.clusterId);
}
/**
@ -627,41 +627,35 @@ public class HConnectionManager {
}
private String clusterId = null;
public final void retrieveClusterId(){
if (conf.get(HConstants.CLUSTER_ID) != null){
if (clusterId != null) {
return;
}
// No synchronized here, worse case we will retrieve it twice, that's
// not an issue.
if (this.clusterId == null){
this.clusterId = conf.get(HConstants.CLUSTER_ID);
if (this.clusterId == null) {
ZooKeeperKeepAliveConnection zkw = null;
try {
zkw = getKeepAliveZooKeeperWatcher();
this.clusterId = ZKClusterId.readClusterIdZNode(zkw);
if (clusterId == null) {
LOG.info("ClusterId read in ZooKeeper is null");
}
} catch (KeeperException e) {
LOG.warn("Can't retrieve clusterId from Zookeeper", e);
} catch (IOException e) {
LOG.warn("Can't retrieve clusterId from Zookeeper", e);
} finally {
if (zkw != null) {
zkw.close();
}
}
if (this.clusterId == null) {
this.clusterId = "default";
}
LOG.info("ClusterId is " + clusterId);
ZooKeeperKeepAliveConnection zkw = null;
try {
zkw = getKeepAliveZooKeeperWatcher();
clusterId = ZKClusterId.readClusterIdZNode(zkw);
if (clusterId == null) {
LOG.info("ClusterId read in ZooKeeper is null");
}
} catch (KeeperException e) {
LOG.warn("Can't retrieve clusterId from Zookeeper", e);
} catch (IOException e) {
LOG.warn("Can't retrieve clusterId from Zookeeper", e);
} finally {
if (zkw != null) {
zkw.close();
}
}
if (clusterId == null) {
clusterId = HConstants.CLUSTER_ID_DEFAULT;
}
conf.set(HConstants.CLUSTER_ID, clusterId);
LOG.info("ClusterId is " + clusterId);
}
@Override

8
hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
View File

@ -1156,7 +1156,7 @@ public class HBaseClient {
* @param conf configuration
* @param factory socket factory
*/
public HBaseClient(Configuration conf, SocketFactory factory) {
public HBaseClient(Configuration conf, String clusterId, SocketFactory factory) {
this.maxIdleTime =
conf.getInt("hbase.ipc.client.connection.maxidletime", 10000); //10s
this.maxRetries = conf.getInt("hbase.ipc.client.connect.max.retries", 0);
@ -1169,7 +1169,7 @@ public class HBaseClient {
}
this.conf = conf;
this.socketFactory = factory;
this.clusterId = conf.get(HConstants.CLUSTER_ID, "default");
this.clusterId = clusterId != null ? clusterId : HConstants.CLUSTER_ID_DEFAULT;
this.connections = new PoolMap<ConnectionId, Connection>(
getPoolType(conf), getPoolSize(conf));
this.failedServers = new FailedServers(conf);
@ -1179,8 +1179,8 @@ public class HBaseClient {
* Construct an IPC client with the default SocketFactory
* @param conf configuration
*/
public HBaseClient(Configuration conf) {
this(conf, NetUtils.getDefaultSocketFactory(conf));
public HBaseClient(Configuration conf, String clusterId) {
this(conf, clusterId, NetUtils.getDefaultSocketFactory(conf));
}
/**

4
hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ProtobufRpcClientEngine.java
View File

@ -44,8 +44,8 @@ public class ProtobufRpcClientEngine implements RpcClientEngine {
protected HBaseClient client;
public ProtobufRpcClientEngine(Configuration conf) {
this.client = new HBaseClient(conf);
public ProtobufRpcClientEngine(Configuration conf, String clusterId) {
this.client = new HBaseClient(conf, clusterId);
}
@Override

4
hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
View File

@ -327,8 +327,8 @@ public final class HConstants {
/** name of the file for unique cluster ID */
public static final String CLUSTER_ID_FILE_NAME = "hbase.id";
/** Configuration key storing the cluster ID */
public static final String CLUSTER_ID = "hbase.cluster.id";
/** Default value for cluster ID */
public static final String CLUSTER_ID_DEFAULT = "default-cluster";
// Always store the location of the root table's HRegion.
// This HRegion is never split.

7
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
View File

@ -290,6 +290,13 @@ public class TableMapReduceUtil {
public static void initCredentials(Job job) throws IOException {
if (User.isHBaseSecurityEnabled(job.getConfiguration())) {
try {
// init credentials for remote cluster
String quorumAddress = job.getConfiguration().get(TableOutputFormat.QUORUM_ADDRESS);
if (quorumAddress != null) {
Configuration peerConf = HBaseConfiguration.create(job.getConfiguration());
ZKUtil.applyClusterKeyToConf(peerConf, quorumAddress);
User.getCurrent().obtainAuthTokenForJob(peerConf, job);
}
User.getCurrent().obtainAuthTokenForJob(job.getConfiguration(), job);
} catch (InterruptedException ie) {
LOG.info("Interrupted obtaining user authentication token");

7
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
View File

@ -182,14 +182,17 @@ implements Configurable {
@Override
public void setConf(Configuration otherConf) {
this.conf = HBaseConfiguration.create(otherConf);
String tableName = this.conf.get(OUTPUT_TABLE);
if(tableName == null || tableName.length() <= 0) {
throw new IllegalArgumentException("Must specify table name");
}
String address = this.conf.get(QUORUM_ADDRESS);
int zkClientPort = conf.getInt(QUORUM_PORT, 0);
int zkClientPort = this.conf.getInt(QUORUM_PORT, 0);
String serverClass = this.conf.get(REGION_SERVER_CLASS);
String serverImpl = this.conf.get(REGION_SERVER_IMPL);
try {
if (address != null) {
ZKUtil.applyClusterKeyToConf(this.conf, address);
@ -198,7 +201,7 @@ implements Configurable {
this.conf.set(HConstants.REGION_SERVER_IMPL, serverImpl);
}
if (zkClientPort != 0) {
conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, zkClientPort);
this.conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, zkClientPort);
}
this.table = new HTable(this.conf, tableName);
this.table.setAutoFlush(false);

12
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -405,6 +405,11 @@ public class HRegionServer implements ClientProtocol,
*/
private final long startcode;
/**
* Unique identifier for the cluster we are a part of.
*/
private String clusterId;
/**
* MX Bean for RegionServerInfo
*/
@ -540,7 +545,7 @@ public class HRegionServer implements ClientProtocol,
}
String getClusterId() {
return this.conf.get(HConstants.CLUSTER_ID);
return this.clusterId;
}
@Retention(RetentionPolicy.RUNTIME)
@ -759,11 +764,10 @@ public class HRegionServer implements ClientProtocol,
// Since cluster status is now up
// ID should have already been set by HMaster
try {
String clusterId = ZKClusterId.readClusterIdZNode(this.zooKeeper);
clusterId = ZKClusterId.readClusterIdZNode(this.zooKeeper);
if (clusterId == null) {
this.abort("Cluster ID has not been set");
}
this.conf.set(HConstants.CLUSTER_ID, clusterId);
LOG.info("ClusterId : "+clusterId);
} catch (KeeperException e) {
this.abort("Failed to retrieve Cluster ID",e);
@ -833,7 +837,7 @@ public class HRegionServer implements ClientProtocol,
movedRegionsCleaner = MovedRegionsCleaner.createAndStart(this);
// Setup RPC client for master communication
rpcClientEngine = new ProtobufRpcClientEngine(conf);
rpcClientEngine = new ProtobufRpcClientEngine(conf, clusterId);
}
/**

3
hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/RandomTimeoutRpcEngine.java
View File

@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.net.SocketFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.IpcProtocol;
import org.apache.hadoop.hbase.security.User;
@ -48,7 +49,7 @@ public class RandomTimeoutRpcEngine extends ProtobufRpcClientEngine {
private static AtomicInteger invokations = new AtomicInteger();
public RandomTimeoutRpcEngine(Configuration conf) {
super(conf);
super(conf, HConstants.CLUSTER_ID_DEFAULT);
}
@Override

10
hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java
View File

@ -30,6 +30,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.IpcProtocol;
import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.ipc.protobuf.generated.TestDelayedRpcProtos.TestArg;
@ -73,7 +74,8 @@ public class TestDelayedRpc {
isa.getHostName(), isa.getPort(), 1, 0, true, conf, 0);
rpcServer.start();
ProtobufRpcClientEngine clientEngine = new ProtobufRpcClientEngine(conf);
ProtobufRpcClientEngine clientEngine =
new ProtobufRpcClientEngine(conf, HConstants.CLUSTER_ID_DEFAULT);
try {
TestRpc client = clientEngine.getProxy(TestRpc.class,
rpcServer.getListenerAddress(), conf, 1000);
@ -142,7 +144,8 @@ public class TestDelayedRpc {
isa.getHostName(), isa.getPort(), 1, 0, true, conf, 0);
rpcServer.start();
ProtobufRpcClientEngine clientEngine = new ProtobufRpcClientEngine(conf);
ProtobufRpcClientEngine clientEngine =
new ProtobufRpcClientEngine(conf, HConstants.CLUSTER_ID_DEFAULT);
try {
TestRpc client = clientEngine.getProxy(TestRpc.class,
rpcServer.getListenerAddress(), conf, 1000);
@ -261,7 +264,8 @@ public class TestDelayedRpc {
isa.getHostName(), isa.getPort(), 1, 0, true, conf, 0);
rpcServer.start();
ProtobufRpcClientEngine clientEngine = new ProtobufRpcClientEngine(conf);
ProtobufRpcClientEngine clientEngine =
new ProtobufRpcClientEngine(conf, HConstants.CLUSTER_ID_DEFAULT);
try {
TestRpc client = clientEngine.getProxy(TestRpc.class,
rpcServer.getListenerAddress(), conf, 1000);

4
hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java
View File

@ -34,6 +34,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.IpcProtocol;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.monitoring.MonitoredRPCHandler;
@ -83,8 +84,7 @@ public class TestIPC {
rpcServer.start();
HBaseClient client = new HBaseClient(
conf,
spyFactory);
conf, HConstants.CLUSTER_ID_DEFAULT, spyFactory);
InetSocketAddress address = rpcServer.getListenerAddress();
try {

4
hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestProtoBufRpc.java
View File

@ -21,6 +21,7 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.IpcProtocol;
import org.apache.hadoop.hbase.ipc.protobuf.generated.TestProtos.EchoRequestProto;
@ -101,7 +102,8 @@ public class TestProtoBufRpc {
@Test
public void testProtoBufRpc() throws Exception {
ProtobufRpcClientEngine clientEngine = new ProtobufRpcClientEngine(conf);
ProtobufRpcClientEngine clientEngine =
new ProtobufRpcClientEngine(conf, HConstants.CLUSTER_ID_DEFAULT);
try {
TestRpcService client = clientEngine.getProxy(TestRpcService.class, addr, conf, 10000);
// Test ping method

3
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java
View File

@ -51,7 +51,8 @@ public class TestHMasterRPCException {
ServerName sm = hm.getServerName();
InetSocketAddress isa = new InetSocketAddress(sm.getHostname(), sm.getPort());
ProtobufRpcClientEngine engine = new ProtobufRpcClientEngine(conf);
ProtobufRpcClientEngine engine =
new ProtobufRpcClientEngine(conf, HConstants.CLUSTER_ID_DEFAULT);
try {
int i = 0;
//retry the RPC a few times; we have seen SocketTimeoutExceptions if we

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java
View File

@ -84,7 +84,7 @@ public class TestClusterId {
String clusterId = ZKClusterId.readClusterIdZNode(TEST_UTIL.getZooKeeperWatcher());
assertNotNull(clusterId);
assertEquals(clusterId, rst.getRegionServer().getConfiguration().get(HConstants.CLUSTER_ID));
assertEquals(clusterId, rst.getRegionServer().getClusterId());
}
}

3
hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
View File

@ -363,9 +363,8 @@ public class TestTokenAuthentication {
testuser.doAs(new PrivilegedExceptionAction<Object>() {
public Object run() throws Exception {
Configuration c = server.getConfiguration();
c.set(HConstants.CLUSTER_ID, clusterId.toString());
ProtobufRpcClientEngine rpcClient =
new ProtobufRpcClientEngine(c);
new ProtobufRpcClientEngine(c, clusterId.toString());
try {
AuthenticationProtos.AuthenticationService.BlockingInterface proxy =
HBaseClientRPC.waitForProxy(rpcClient, BlockingAuthenticationService.class,