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

HBASE-1462 hclient still seems to depend on master 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@781468 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2009-06-03 16:46:28 +00:00
parent 384e39f999
commit 42af3c756c
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -304,6 +304,7 @@ Release 0.20.0 - Unreleased
in master and regionserver UIs in master and regionserver UIs
HBASE-1448 Add a node in ZK to tell all masters to shutdown HBASE-1448 Add a node in ZK to tell all masters to shutdown
HBASE-1478 Remove hbase master options from shell (Nitay Joffe via Stack) HBASE-1478 Remove hbase master options from shell (Nitay Joffe via Stack)
HBASE-1462 hclient still seems to depend on master
OPTIMIZATIONS OPTIMIZATIONS
HBASE-1412 Change values for delete column and column family in KeyValue HBASE-1412 Change values for delete column and column family in KeyValue

11
src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -328,7 +328,6 @@ public class HConnectionManager implements HConstants {
public HRegionLocation getRegionLocation(final byte [] name, public HRegionLocation getRegionLocation(final byte [] name,
final byte [] row, boolean reload) final byte [] row, boolean reload)
throws IOException { throws IOException {
getMaster();
return reload? relocateRegion(name, row): locateRegion(name, row); return reload? relocateRegion(name, row): locateRegion(name, row);
} }
@ -476,14 +475,12 @@ public class HConnectionManager implements HConstants {
public HRegionLocation locateRegion(final byte [] tableName, public HRegionLocation locateRegion(final byte [] tableName,
final byte [] row) final byte [] row)
throws IOException{ throws IOException{
getMaster();
return locateRegion(tableName, row, true); return locateRegion(tableName, row, true);
} }
public HRegionLocation relocateRegion(final byte [] tableName, public HRegionLocation relocateRegion(final byte [] tableName,
final byte [] row) final byte [] row)
throws IOException{ throws IOException{
getMaster();
return locateRegion(tableName, row, false); return locateRegion(tableName, row, false);
} }
@ -795,7 +792,7 @@ public class HConnectionManager implements HConstants {
public HRegionInterface getHRegionConnection( public HRegionInterface getHRegionConnection(
HServerAddress regionServer) HServerAddress regionServer)
throws IOException { throws IOException {
return getHRegionConnection(regionServer, true); return getHRegionConnection(regionServer, false);
} }
public synchronized ZooKeeperWrapper getZooKeeperWrapper() throws IOException { public synchronized ZooKeeperWrapper getZooKeeperWrapper() throws IOException {
@ -806,7 +803,7 @@ public class HConnectionManager implements HConstants {
} }
/* /*
* Repeatedly try to find the root region by asking the master for where it is * Repeatedly try to find the root region in ZK
* @return HRegionLocation for root region if found * @return HRegionLocation for root region if found
* @throws NoServerForRegionException - if the root region can not be * @throws NoServerForRegionException - if the root region can not be
* located after retrying * located after retrying
@ -814,7 +811,6 @@ public class HConnectionManager implements HConstants {
*/ */
private HRegionLocation locateRootRegion() private HRegionLocation locateRootRegion()
throws IOException { throws IOException {
getMaster();
// We lazily instantiate the ZooKeeper object because we don't want to // We lazily instantiate the ZooKeeper object because we don't want to
// make the constructor have to throw IOException or handle it itself. // make the constructor have to throw IOException or handle it itself.
@ -901,7 +897,6 @@ public class HConnectionManager implements HConstants {
public <T> T getRegionServerWithRetries(ServerCallable<T> callable) public <T> T getRegionServerWithRetries(ServerCallable<T> callable)
throws IOException, RuntimeException { throws IOException, RuntimeException {
getMaster();
List<Throwable> exceptions = new ArrayList<Throwable>(); List<Throwable> exceptions = new ArrayList<Throwable>();
for(int tries = 0; tries < numRetries; tries++) { for(int tries = 0; tries < numRetries; tries++) {
try { try {
@ -934,7 +929,6 @@ public class HConnectionManager implements HConstants {
public <T> T getRegionServerForWithoutRetries(ServerCallable<T> callable) public <T> T getRegionServerForWithoutRetries(ServerCallable<T> callable)
throws IOException, RuntimeException { throws IOException, RuntimeException {
getMaster();
try { try {
callable.instantiateServer(false); callable.instantiateServer(false);
return callable.call(); return callable.call();
@ -957,7 +951,6 @@ public class HConnectionManager implements HConstants {
boolean reload) boolean reload)
throws IOException { throws IOException {
boolean reloadFlag = reload; boolean reloadFlag = reload;
getMaster();
List<Throwable> exceptions = new ArrayList<Throwable>(); List<Throwable> exceptions = new ArrayList<Throwable>();
HRegionLocation location = null; HRegionLocation location = null;
int tries = 0; int tries = 0;