HBASE-4400 rename metaRegion to region in HBaseTestingUtility.createAndForceNodeToOpenedState()
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1172066 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3cc7e62571
commit
034215f247
|
@ -1564,7 +1564,7 @@ public class HBaseTestingUtility {
|
||||||
/**
|
/**
|
||||||
* Creates an znode with OPENED state.
|
* Creates an znode with OPENED state.
|
||||||
* @param TEST_UTIL
|
* @param TEST_UTIL
|
||||||
* @param metaRegion
|
* @param region
|
||||||
* @param regionServer
|
* @param regionServer
|
||||||
* @return
|
* @return
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
|
@ -1573,7 +1573,7 @@ public class HBaseTestingUtility {
|
||||||
* @throws NodeExistsException
|
* @throws NodeExistsException
|
||||||
*/
|
*/
|
||||||
public static ZooKeeperWatcher createAndForceNodeToOpenedState(
|
public static ZooKeeperWatcher createAndForceNodeToOpenedState(
|
||||||
HBaseTestingUtility TEST_UTIL, HRegion metaRegion,
|
HBaseTestingUtility TEST_UTIL, HRegion region,
|
||||||
HRegionServer regionServer) throws ZooKeeperConnectionException,
|
HRegionServer regionServer) throws ZooKeeperConnectionException,
|
||||||
IOException, KeeperException, NodeExistsException {
|
IOException, KeeperException, NodeExistsException {
|
||||||
ZooKeeperWatcher zkw = new ZooKeeperWatcher(TEST_UTIL.getConfiguration(),
|
ZooKeeperWatcher zkw = new ZooKeeperWatcher(TEST_UTIL.getConfiguration(),
|
||||||
|
@ -1584,11 +1584,11 @@ public class HBaseTestingUtility {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ZKAssign.createNodeOffline(zkw, metaRegion.getRegionInfo(), regionServer
|
ZKAssign.createNodeOffline(zkw, region.getRegionInfo(), regionServer
|
||||||
.getServerName());
|
.getServerName());
|
||||||
int version = ZKAssign.transitionNodeOpening(zkw, metaRegion
|
int version = ZKAssign.transitionNodeOpening(zkw, region
|
||||||
.getRegionInfo(), regionServer.getServerName());
|
.getRegionInfo(), regionServer.getServerName());
|
||||||
ZKAssign.transitionNodeOpened(zkw, metaRegion.getRegionInfo(), regionServer
|
ZKAssign.transitionNodeOpened(zkw, region.getRegionInfo(), regionServer
|
||||||
.getServerName(), version);
|
.getServerName(), version);
|
||||||
return zkw;
|
return zkw;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue