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

HBASE-4300 Start of new-version master fails if old master's znode is hanging around 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1190068 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-10-27 22:20:02 +00:00
parent 1a78bd8828
commit bf0f06c569
19 changed files with 151 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -412,6 +412,8 @@ Release 0.92.0 - Unreleased
HBASE-4388 Second start after migration from 90 to trunk crashes
HBASE-4685 TestDistributedLogSplitting.testOrphanLogCreation failing because
of ArithmeticException: / by zero.
HBASE-4300 Start of new-version master fails if old master's znode is
hanging around
TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected

11
src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
View File

@ -32,6 +32,7 @@ import java.util.Map;
import java.util.TreeMap;
import org.apache.hadoop.hbase.master.AssignmentManager.RegionState;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.VersionedWritable;
/**
@ -223,12 +224,12 @@ public class ClusterStatus extends VersionedWritable {
out.writeUTF(hbaseVersion);
out.writeInt(getServersSize());
for (Map.Entry<ServerName, HServerLoad> e: this.liveServers.entrySet()) {
out.writeUTF(e.getKey().toString());
Bytes.writeByteArray(out, e.getKey().getVersionedBytes());
e.getValue().write(out);
}
out.writeInt(deadServers.size());
for (ServerName server: deadServers) {
out.writeUTF(server.toString());
Bytes.writeByteArray(out, server.getVersionedBytes());
}
out.writeInt(this.intransition.size());
for (Map.Entry<String, RegionState> e: this.intransition.entrySet()) {
@ -248,15 +249,15 @@ public class ClusterStatus extends VersionedWritable {
int count = in.readInt();
this.liveServers = new HashMap<ServerName, HServerLoad>(count);
for (int i = 0; i < count; i++) {
String str = in.readUTF();
byte [] versionedBytes = Bytes.readByteArray(in);
HServerLoad hsl = new HServerLoad();
hsl.readFields(in);
this.liveServers.put(new ServerName(str), hsl);
this.liveServers.put(ServerName.parseVersionedServerName(versionedBytes), hsl);
}
count = in.readInt();
deadServers = new ArrayList<ServerName>(count);
for (int i = 0; i < count; i++) {
deadServers.add(new ServerName(in.readUTF()));
deadServers.add(ServerName.parseVersionedServerName(Bytes.readByteArray(in)));
}
count = in.readInt();
this.intransition = new TreeMap<String, RegionState>();

10
src/main/java/org/apache/hadoop/hbase/MasterAddressTracker.java
View File

@ -58,8 +58,7 @@ public class MasterAddressTracker extends ZooKeeperNodeTracker {
* @return Server name or null if timed out.
*/
public ServerName getMasterAddress() {
byte [] data = super.getData(false);
return data == null ? null : new ServerName(Bytes.toString(data));
return bytesToServerName(super.getData(false));
}
/**
@ -70,4 +69,11 @@ public class MasterAddressTracker extends ZooKeeperNodeTracker {
return super.getData(false) != null;
}
/**
* @param bytes Byte array of {@link ServerName#toString()}
* @return A {@link ServerName} instance.
*/
private ServerName bytesToServerName(final byte [] bytes) {
return bytes == null ? null: ServerName.parseVersionedServerName(bytes);
}
}

70
src/main/java/org/apache/hadoop/hbase/ServerName.java
View File

@ -20,6 +20,7 @@
package org.apache.hadoop.hbase;
import java.util.Collection;
import java.util.regex.Pattern;
import org.apache.hadoop.hbase.util.Addressing;
import org.apache.hadoop.hbase.util.Bytes;
@ -37,19 +38,45 @@ import org.apache.hadoop.hbase.util.Bytes;
* and the startcode for the regionserver is <code>1212121212</code>, then
* the {@link #toString()} would be <code>example.org,1234,1212121212</code>.
*
* <p>You can obtain a versioned serialized form of this class by calling
* {@link #getVersionedBytes()}. To deserialize, call {@link #parseVersionedServerName(byte[])}
*
* <p>Immutable.
*/
public class ServerName implements Comparable<ServerName> {
/**
* Version for this class.
* Its a short rather than a byte so I can for sure distinguish between this
* version of this class and the version previous to this which did not have
* a version.
*/
private static final short VERSION = 0;
static final byte [] VERSION_BYTES = Bytes.toBytes(VERSION);
/**
* What to use if no startcode supplied.
*/
public static final int NON_STARTCODE = -1;
/**
* This character is used as separator between server hostname, port and
* startcode.
*/
public static final String SERVERNAME_SEPARATOR = ",";
public static Pattern SERVERNAME_PATTERN =
Pattern.compile(Addressing.VALID_HOSTNAME_REGEX_PREFIX +
SERVERNAME_SEPARATOR + Addressing.VALID_PORT_REGEX +
SERVERNAME_SEPARATOR + Addressing.VALID_PORT_REGEX + "$");
private final String servername;
private final String hostname;
private final int port;
private final long startcode;
/**
* Cached bytes of this ServerName instance.
*/
private byte [] bytes;
public ServerName(final String hostname, final int port, final long startcode) {
@ -64,10 +91,6 @@ public class ServerName implements Comparable<ServerName> {
parseStartcode(serverName));
}
public ServerName(final byte [] bytes) {
this(Bytes.toString(bytes));
}
public ServerName(final String hostAndPort, final long startCode) {
this(Addressing.parseHostname(hostAndPort),
Addressing.parsePort(hostAndPort), startCode);
@ -97,10 +120,13 @@ public class ServerName implements Comparable<ServerName> {
}
/**
* @return {@link #getServerName()} as bytes
* @return {@link #getServerName()} as bytes with a short-sized prefix with
* the {@link ServerName#VERSION} of this class.
*/
public synchronized byte [] getBytes() {
if (this.bytes == null) this.bytes = Bytes.toBytes(getServerName());
public synchronized byte [] getVersionedBytes() {
if (this.bytes == null) {
this.bytes = Bytes.add(VERSION_BYTES, Bytes.toBytes(getServerName()));
}
return this.bytes;
}
@ -230,4 +256,34 @@ public class ServerName implements Comparable<ServerName> {
return left.getHostname().equals(right.getHostname()) &&
left.getPort() == right.getPort();
}
/**
* Use this method instantiating a {@link ServerName} from bytes
* gotten from a call to {@link #getVersionedBytes()}. Will take care of the
* case where bytes were written by an earlier version of hbase.
* @param versionedBytes Pass bytes gotten from a call to {@link #getVersionedBytes()}
* @return A ServerName instance.
* @see #getVersionedBytes()
*/
public static ServerName parseVersionedServerName(final byte [] versionedBytes) {
// Version is a short.
short version = Bytes.toShort(versionedBytes);
if (version == VERSION) {
int length = versionedBytes.length - Bytes.SIZEOF_SHORT;
return new ServerName(Bytes.toString(versionedBytes, Bytes.SIZEOF_SHORT, length));
}
// Presume the bytes were written with an old version of hbase and that the
// bytes are actually a String of the form "'<hostname>' ':' '<port>'".
return new ServerName(Bytes.toString(versionedBytes), NON_STARTCODE);
}
/**
* @param str Either an instance of {@link ServerName#toString()} or a
* "'<hostname>' ':' '<port>'".
* @return A ServerName instance.
*/
public static ServerName parseServerName(final String str) {
return SERVERNAME_PATTERN.matcher(str).matches()? new ServerName(str):
new ServerName(str, NON_STARTCODE);
}
}

7
src/main/java/org/apache/hadoop/hbase/executor/RegionTransitionData.java
View File

@ -187,7 +187,8 @@ public class RegionTransitionData implements Writable {
// remaining fields are optional so prefixed with boolean
// the name of the regionserver sending the data
if (in.readBoolean()) {
this.origin = new ServerName(in.readUTF());
byte [] versionedBytes = Bytes.readByteArray(in);
this.origin = ServerName.parseVersionedServerName(versionedBytes);
}
if (in.readBoolean()) {
this.payload = Bytes.readByteArray(in);
@ -201,8 +202,8 @@ public class RegionTransitionData implements Writable {
Bytes.writeByteArray(out, regionName);
// remaining fields are optional so prefixed with boolean
out.writeBoolean(this.origin != null);
if(this.origin != null) {
out.writeUTF(this.origin.toString());
if (this.origin != null) {
Bytes.writeByteArray(out, this.origin.getVersionedBytes());
}
out.writeBoolean(this.payload != null);
if (this.payload != null) {

4
src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java
View File

@ -55,7 +55,7 @@ public interface HMasterRegionInterface extends VersionedProtocol {
throws IOException;
/**
* @param sn {@link ServerName#getBytes()}
* @param sn {@link ServerName#getVersionedBytes()}
* @param hsl Server load.
* @throws IOException
*/
@ -65,7 +65,7 @@ public interface HMasterRegionInterface extends VersionedProtocol {
/**
* Called by a region server to report a fatal error that is causing
* it to abort.
* @param sn {@link ServerName#getBytes()}
* @param sn {@link ServerName#getVersionedBytes()}
* @param errorMessage informative text to expose in the master logs and UI
*/
public void reportRSFatalError(byte [] sn, String errorMessage);

2
src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
View File

@ -145,7 +145,7 @@ class ActiveMasterManager extends ZooKeeperListener {
this.clusterHasActiveMaster.set(true);
byte [] bytes =
ZKUtil.getDataAndWatch(this.watcher, this.watcher.masterAddressZNode);
ServerName currentMaster = new ServerName(Bytes.toString(bytes));
ServerName currentMaster = ServerName.parseVersionedServerName(bytes);
if (ServerName.isSameHostnameAndPort(currentMaster, this.sn)) {
String msg = ("Current master has this master's address, " + currentMaster +
"; master was restarted? Waiting on znode to expire...");

8
src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -70,6 +70,7 @@ import org.apache.hadoop.hbase.master.handler.TableAddFamilyHandler;
import org.apache.hadoop.hbase.master.handler.TableDeleteFamilyHandler;
import org.apache.hadoop.hbase.master.handler.TableModifyFamilyHandler;
import org.apache.hadoop.hbase.master.metrics.MasterMetrics;
import org.apache.hadoop.hbase.master.RegionPlan;
import org.apache.hadoop.hbase.monitoring.MemoryBoundedLogMessageBuffer;
import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.monitoring.TaskMonitor;
@ -723,7 +724,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
@Override
public void regionServerReport(final byte [] sn, final HServerLoad hsl)
throws IOException {
this.serverManager.regionServerReport(new ServerName(sn), hsl);
this.serverManager.regionServerReport(ServerName.parseVersionedServerName(sn), hsl);
if (hsl != null && this.metrics != null) {
// Up our metrics.
this.metrics.incrementRequests(hsl.getTotalNumberOfRequests());
@ -732,9 +733,8 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
@Override
public void reportRSFatalError(byte [] sn, String errorText) {
ServerName serverName = new ServerName(sn);
String msg = "Region server " + serverName + " reported a fatal error:\n"
+ errorText;
String msg = "Region server " + Bytes.toString(sn) +
" reported a fatal error:\n" + errorText;
LOG.error(msg);
rsFatals.add(msg);
}

6
src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
View File

@ -203,7 +203,11 @@ public class MasterFileSystem {
}
List<ServerName> serverNames = new ArrayList<ServerName>();
for (FileStatus status : logFolders) {
ServerName serverName = new ServerName(status.getPath().getName());
String sn = status.getPath().getName();
// Is this old or new style servername? If old style, it will be
// hostname, colon, and port. If new style, it will be formatted as
// ServerName.toString.
ServerName serverName = ServerName.parseServerName(sn);
if (!onlineServers.contains(serverName)) {
LOG.info("Log folder " + status.getPath() + " doesn't belong " +
"to a known region server, splitting");

2
src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
View File

@ -248,7 +248,7 @@ public class ServerManager {
* @deprecated Use {@link #getLoad(HServerAddress)}
*/
public HServerLoad getLoad(final HServerAddress address) {
ServerName sn = new ServerName(address.toString(), -1);
ServerName sn = new ServerName(address.toString(), ServerName.NON_STARTCODE);
ServerName actual =
ServerName.findServerWithSameHostnamePort(this.getOnlineServersList(), sn);
return actual == null? null: getLoad(actual);

4
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -784,7 +784,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
// Why we do this?
this.requestCount.set(0);
try {
this.hbaseMaster.regionServerReport(this.serverNameFromMasterPOV.getBytes(), hsl);
this.hbaseMaster.regionServerReport(this.serverNameFromMasterPOV.getVersionedBytes(), hsl);
} catch (IOException ioe) {
if (ioe instanceof RemoteException) {
ioe = ((RemoteException)ioe).unwrapRemoteException();
@ -1613,7 +1613,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
}
if (hbaseMaster != null) {
hbaseMaster.reportRSFatalError(
this.serverNameFromMasterPOV.getBytes(), msg);
this.serverNameFromMasterPOV.getVersionedBytes(), msg);
}
} catch (Throwable t) {
LOG.warn("Unable to report fatal error to master", t);

2
src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java
View File

@ -282,7 +282,7 @@ public class ReplicationZookeeper {
}
List<ServerName> addresses = new ArrayList<ServerName>(children.size());
for (String child : children) {
addresses.add(new ServerName(child));
addresses.add(ServerName.parseServerName(child));
}
return addresses;
}

2
src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
View File

@ -946,7 +946,7 @@ public class ThriftServer {
value = startRowResult.getValue(HConstants.CATALOG_FAMILY,
HConstants.SERVER_QUALIFIER);
if (value != null && value.length > 0) {
ServerName sn = new ServerName(value);
ServerName sn = new ServerName(Bytes.toString(value), -1/*Any value works here for startcode*/);
region.setServerName(Bytes.toBytes(sn.getHostname()));
region.port = sn.getPort();
}

15
src/main/java/org/apache/hadoop/hbase/util/Addressing.java
View File

@ -25,6 +25,21 @@ 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 = ":";
/**

6
src/main/java/org/apache/hadoop/hbase/zookeeper/RegionServerTracker.java
View File

@ -74,7 +74,7 @@ public class RegionServerTracker extends ZooKeeperListener {
synchronized(this.regionServers) {
this.regionServers.clear();
for (String n: servers) {
ServerName sn = new ServerName(ZKUtil.getNodeName(n));
ServerName sn = ServerName.parseServerName(ZKUtil.getNodeName(n));
this.regionServers.add(sn);
}
}
@ -92,7 +92,7 @@ public class RegionServerTracker extends ZooKeeperListener {
String serverName = ZKUtil.getNodeName(path);
LOG.info("RegionServer ephemeral node deleted, processing expiration [" +
serverName + "]");
ServerName sn = new ServerName(serverName);
ServerName sn = ServerName.parseServerName(serverName);
if (!serverManager.isServerOnline(sn)) {
LOG.info(serverName.toString() + " is not online");
return;
@ -126,4 +126,4 @@ public class RegionServerTracker extends ZooKeeperListener {
return new ArrayList<ServerName>(this.regionServers);
}
}
}
}

2
src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java
View File

@ -97,7 +97,7 @@ public class RootRegionTracker extends ZooKeeperNodeTracker {
int index = str.indexOf(ServerName.SERVERNAME_SEPARATOR);
if (index != -1) {
// Presume its ServerName.toString() format.
return new ServerName(str);
return ServerName.parseServerName(str);
}
// Presume it a hostname:port format.
String hostname = Addressing.parseHostname(str);

35
src/test/java/org/apache/hadoop/hbase/TestServerName.java
View File

@ -1,6 +1,4 @@
/**
* Copyright 2011 The Apache Software Foundation
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@ -19,14 +17,41 @@
*/
package org.apache.hadoop.hbase;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
import org.apache.hadoop.hbase.util.Addressing;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
public class TestServerName {
@Test
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());
}
@Test public void testParseOfBytes() {
final String snStr = "www.example.org,1234,5678";
ServerName sn = new ServerName(snStr);
byte [] versionedBytes = sn.getVersionedBytes();
assertEquals(snStr, ServerName.parseVersionedServerName(versionedBytes).toString());
final String hostnamePortStr = "www.example.org:1234";
byte [] bytes = Bytes.toBytes(hostnamePortStr);
String expecting =
hostnamePortStr.replace(":", ServerName.SERVERNAME_SEPARATOR) +
ServerName.SERVERNAME_SEPARATOR + ServerName.NON_STARTCODE;
assertEquals(expecting, ServerName.parseVersionedServerName(bytes).toString());
}
@Test
public void testServerName() {
ServerName sn = new ServerName("www.example.org", 1234, 5678);

2
src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
View File

@ -77,7 +77,7 @@ public class TestMasterAddressManager {
int port = 1234;
ServerName sn = new ServerName(host, port, System.currentTimeMillis());
LOG.info("Creating master node");
ZKUtil.createEphemeralNodeAndWatch(zk, zk.masterAddressZNode, sn.getBytes());
ZKUtil.createEphemeralNodeAndWatch(zk, zk.masterAddressZNode, sn.getVersionedBytes());
// Wait for the node to be created
LOG.info("Waiting for master address manager to be notified");

2
src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
View File

@ -405,7 +405,7 @@ public class TestSplitTransactionOnCluster {
HRegionServer hrs = getOtherRegionServer(cluster, metaRegionServer);
LOG.info("Moving " + hri.getRegionNameAsString() + " to " +
hrs.getServerName() + "; metaServerIndex=" + metaServerIndex);
admin.move(hri.getEncodedNameAsBytes(), hrs.getServerName().getBytes());
admin.move(hri.getEncodedNameAsBytes(), hrs.getServerName().getVersionedBytes());
}
// Wait till table region is up on the server that is NOT carrying .META..
while (true) {