You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/10/28 09:02:40 UTC
svn commit: r1190178 - in /hbase/branches/0.92: ./
src/main/java/org/apache/hadoop/hbase/
src/main/java/org/apache/hadoop/hbase/master/
src/main/java/org/apache/hadoop/hbase/util/
src/test/java/org/apache/hadoop/hbase/ src/test/java/org/apache/hadoop/h...
Author: stack
Date: Fri Oct 28 07:02:39 2011
New Revision: 1190178
URL: http://svn.apache.org/viewvc?rev=1190178&view=rev
Log:
HBASE-4692 HBASE-4300 broke the build
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ServerName.java
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Addressing.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestServerName.java
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1190178&r1=1190177&r2=1190178&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Oct 28 07:02:39 2011
@@ -385,6 +385,7 @@ Release 0.92.0 - Unreleased
hanging around
HBASE-4679 Thrift null mutation error
HBASE-4304 requestsPerSecond counter stuck at 0 (Li Pi)
+ HBASE-4692 HBASE-4300 broke the build
TESTS
HBASE-4492 TestRollingRestart fails intermittently
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ServerName.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ServerName.java?rev=1190178&r1=1190177&r2=1190178&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ServerName.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/ServerName.java Fri Oct 28 07:02:39 2011
@@ -65,7 +65,7 @@ public class ServerName implements Compa
public static final String SERVERNAME_SEPARATOR = ",";
public static Pattern SERVERNAME_PATTERN =
- Pattern.compile(Addressing.VALID_HOSTNAME_REGEX_PREFIX +
+ Pattern.compile("[^" + SERVERNAME_SEPARATOR + "]+" +
SERVERNAME_SEPARATOR + Addressing.VALID_PORT_REGEX +
SERVERNAME_SEPARATOR + Addressing.VALID_PORT_REGEX + "$");
@@ -286,4 +286,4 @@ public class ServerName implements Compa
return SERVERNAME_PATTERN.matcher(str).matches()? new ServerName(str):
new ServerName(str, NON_STARTCODE);
}
-}
+}
\ No newline at end of file
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java?rev=1190178&r1=1190177&r2=1190178&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java Fri Oct 28 07:02:39 2011
@@ -42,7 +42,7 @@ import org.apache.zookeeper.KeeperExcept
* for the active master to fail.
*
* <p>This class is instantiated in the HMaster constructor and the method
- * {@link #blockUntilBecomingActiveMaster()} is called to wait until becoming
+ * #blockUntilBecomingActiveMaster() is called to wait until becoming
* the active master of the cluster.
*/
class ActiveMasterManager extends ZooKeeperListener {
@@ -128,10 +128,11 @@ class ActiveMasterManager extends ZooKee
boolean blockUntilBecomingActiveMaster(MonitoredTask startupStatus) {
startupStatus.setStatus("Trying to register in ZK as active master");
boolean cleanSetOfActiveMaster = true;
- // Try to become the active master, watch if there is another master
+ // Try to become the active master, watch if there is another master.
+ // Write out our ServerName as versioned bytes.
try {
if (ZKUtil.createEphemeralNodeAndWatch(this.watcher,
- this.watcher.masterAddressZNode, Bytes.toBytes(this.sn.toString()))) {
+ this.watcher.masterAddressZNode, sn.getVersionedBytes())) {
// We are the master, return
startupStatus.setStatus("Successfully registered as active master.");
this.clusterHasActiveMaster.set(true);
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Addressing.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Addressing.java?rev=1190178&r1=1190177&r2=1190178&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Addressing.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/Addressing.java Fri Oct 28 07:02:39 2011
@@ -25,20 +25,6 @@ import java.net.InetSocketAddress;
* Utility for network addresses, resolving and naming.
*/
public class Addressing {
- /**
- * Regex for RFC952 hostname matching. Does not have a '$" on the end. Can
- * be used as prefix on a larger regex.
- * @see http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address
- */
- public static final String VALID_HOSTNAME_REGEX_PREFIX =
- "^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\\-]*[A-Za-z0-9])";
- /**
- * Regex for RFC952 hostname matching.
- * @see http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address
- */
- public static final String VALID_HOSTNAME_REGEX =
- VALID_HOSTNAME_REGEX_PREFIX + "$";
-
public static final String VALID_PORT_REGEX = "[\\d]+";
public static final String HOSTNAME_PORT_SEPARATOR = ":";
Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestServerName.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestServerName.java?rev=1190178&r1=1190177&r2=1190178&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestServerName.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestServerName.java Fri Oct 28 07:02:39 2011
@@ -33,10 +33,11 @@ public class TestServerName {
public void testRegexPatterns() {
assertTrue(Pattern.matches(Addressing.VALID_PORT_REGEX, "123"));
assertFalse(Pattern.matches(Addressing.VALID_PORT_REGEX, ""));
- assertTrue(Pattern.matches(Addressing.VALID_HOSTNAME_REGEX, "example.org"));
- assertTrue(Pattern.matches(Addressing.VALID_HOSTNAME_REGEX,
- "www1.example.org"));
assertTrue(ServerName.SERVERNAME_PATTERN.matcher("www1.example.org,1234,567").matches());
+ ServerName.parseServerName("a.b.c,58102,1319771740322");
+ ServerName.parseServerName("192.168.1.199,58102,1319771740322");
+ ServerName.parseServerName("a.b.c:58102");
+ ServerName.parseServerName("192.168.1.199:58102");
}
@Test public void testParseOfBytes() {
Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java?rev=1190178&r1=1190177&r2=1190178&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java Fri Oct 28 07:02:39 2011
@@ -187,7 +187,7 @@ public class TestActiveMasterManager {
ServerName expectedAddress)
throws KeeperException {
ServerName readAddress =
- new ServerName(Bytes.toString(ZKUtil.getData(zk, zk.masterAddressZNode)));
+ ServerName.parseVersionedServerName(ZKUtil.getData(zk, zk.masterAddressZNode));
assertNotNull(readAddress);
assertTrue(expectedAddress.equals(readAddress));
}