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

Needed to change the zk port elsewhere too to make default 21818 rather than 21810; and still further places 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1022300 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-10-13 21:36:51 +00:00
parent 1973b02b94
commit b15d5425b9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -634,6 +634,8 @@ public class HConnectionManager {
try { try {
// locate the root or meta region // locate the root or meta region
metaLocation = locateRegion(parentTable, metaKey); metaLocation = locateRegion(parentTable, metaKey);
// If null still, go around again.
if (metaLocation == null) continue;
HRegionInterface server = HRegionInterface server =
getHRegionConnection(metaLocation.getServerAddress()); getHRegionConnection(metaLocation.getServerAddress());

8
src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
View File

@ -44,13 +44,14 @@ import static org.junit.Assert.*;
*/ */
public class TestHQuorumPeer { public class TestHQuorumPeer {
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static int PORT_NO = 21818;
private Path dataDir; private Path dataDir;
@Before public void setup() throws IOException { @Before public void setup() throws IOException {
// Set it to a non-standard port. // Set it to a non-standard port.
TEST_UTIL.getConfiguration().setInt("hbase.zookeeper.property.clientPort", TEST_UTIL.getConfiguration().setInt("hbase.zookeeper.property.clientPort",
21818); PORT_NO);
this.dataDir = HBaseTestingUtility.getTestDir(this.getClass().getName()); this.dataDir = HBaseTestingUtility.getTestDir(this.getClass().getName());
FileSystem fs = FileSystem.get(TEST_UTIL.getConfiguration()); FileSystem fs = FileSystem.get(TEST_UTIL.getConfiguration());
if (fs.exists(this.dataDir)) { if (fs.exists(this.dataDir)) {
@ -68,7 +69,7 @@ public class TestHQuorumPeer {
conf.set("hbase.zookeeper.property.dataDir", this.dataDir.toString()); conf.set("hbase.zookeeper.property.dataDir", this.dataDir.toString());
Properties properties = ZKConfig.makeZKProps(conf); Properties properties = ZKConfig.makeZKProps(conf);
assertEquals(dataDir.toString(), (String)properties.get("dataDir")); assertEquals(dataDir.toString(), (String)properties.get("dataDir"));
assertEquals(Integer.valueOf(21810), assertEquals(Integer.valueOf(PORT_NO),
Integer.valueOf(properties.getProperty("clientPort"))); Integer.valueOf(properties.getProperty("clientPort")));
assertEquals("localhost:2888:3888", properties.get("server.0")); assertEquals("localhost:2888:3888", properties.get("server.0"));
assertEquals(null, properties.get("server.1")); assertEquals(null, properties.get("server.1"));
@ -77,7 +78,8 @@ public class TestHQuorumPeer {
conf.set(HConstants.ZOOKEEPER_QUORUM, "a.foo.bar,b.foo.bar,c.foo.bar"); conf.set(HConstants.ZOOKEEPER_QUORUM, "a.foo.bar,b.foo.bar,c.foo.bar");
properties = ZKConfig.makeZKProps(conf); properties = ZKConfig.makeZKProps(conf);
assertEquals(dataDir.toString(), properties.get("dataDir")); assertEquals(dataDir.toString(), properties.get("dataDir"));
assertEquals(Integer.valueOf(21810), Integer.valueOf(properties.getProperty("clientPort"))); assertEquals(Integer.valueOf(PORT_NO),
Integer.valueOf(properties.getProperty("clientPort")));
assertEquals("a.foo.bar:2888:3888", properties.get("server.0")); assertEquals("a.foo.bar:2888:3888", properties.get("server.0"));
assertEquals("b.foo.bar:2888:3888", properties.get("server.1")); assertEquals("b.foo.bar:2888:3888", properties.get("server.1"));
assertEquals("c.foo.bar:2888:3888", properties.get("server.2")); assertEquals("c.foo.bar:2888:3888", properties.get("server.2"));