diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java index 1665e5d..ab2ab19 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -2450,7 +2450,7 @@ public class HConnectionManager { c.getInt("hbase.client.serverside.retries.multiplier", 10); int retries = hcRetries * serversideMultiplier; c.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, retries); - log.debug("Set serverside HConnection retries=" + retries); + log.debug("HConnection retries=" + retries); } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java index b6c315f..119907d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java @@ -62,8 +62,8 @@ public class HBaseRpcMetrics implements Updater { metricsRecord.setTag("port", port); - LOG.info("Initializing RPC Metrics with hostName=" - + hostName + ", port=" + port); + LOG.info("Initializing RPC Metrics for className=" + + hostName + " on port=" + port); context.registerUpdater(this); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java index 0bb1f8a..8f0cef1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java @@ -525,6 +525,7 @@ public abstract class HBaseServer implements RpcServer { readers[i] = reader; readPool.execute(reader); } + LOG.info("Started " + readThreads + " reader(s) in Listener."); // Register accepts on the server socket with the selector. acceptChannel.register(selector, SelectionKey.OP_ACCEPT); @@ -541,7 +542,6 @@ public abstract class HBaseServer implements RpcServer { this.readSelector = Selector.open(); } public void run() { - LOG.info("Starting " + getName()); try { doRunLoop(); } finally { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java index 7c7cb25..6803855 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcEngine.java @@ -20,14 +20,12 @@ package org.apache.hadoop.hbase.ipc; import java.io.IOException; import java.net.InetSocketAddress; + import javax.net.SocketFactory; -import org.apache.hadoop.hbase.ipc.VersionedProtocol; -import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; - -import com.google.protobuf.ServiceException; +import org.apache.hadoop.hbase.security.User; /** An RPC implementation. */ @InterfaceAudience.Private diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java index 025dd3f..062f7df 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java @@ -145,10 +145,11 @@ class ActiveMasterManager extends ZooKeeperListener { this.watcher.getMasterAddressZNode(), this.sn)) { // If we were a backup master before, delete our ZNode from the backup - // master directory since we are the active now - LOG.info("Deleting ZNode for " + backupZNode + " from backup master directory"); - ZKUtil.deleteNodeFailSilent(this.watcher, backupZNode); - + // master directory since we are the active now) + if (ZKUtil.checkExists(this.watcher, backupZNode) != -1) { + LOG.info("Deleting ZNode for " + backupZNode + " from backup master directory"); + ZKUtil.deleteNodeFailSilent(this.watcher, backupZNode); + } // Save the znode in a file, this will allow to check if we crash in the launch scripts ZNodeClearer.writeMyEphemeralNodeOnDisk(this.sn.toString()); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 6ca99a9..a108552 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -30,11 +30,8 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; -import java.util.SortedMap; import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -61,7 +58,6 @@ import org.apache.hadoop.hbase.MasterMonitorProtocol; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.NotAllMetaRegionsOnlineException; import org.apache.hadoop.hbase.PleaseHoldException; -import org.apache.hadoop.hbase.RegionLoad; import org.apache.hadoop.hbase.RegionServerStatusProtocol; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerLoad; @@ -166,9 +162,11 @@ import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.Repor import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse; import org.apache.hadoop.hbase.replication.regionserver.Replication; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.trace.SpanReceiverHost; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.CompressionTest; import org.apache.hadoop.hbase.util.FSTableDescriptors; +import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HFileArchiveUtil; import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.hbase.util.InfoServer; @@ -188,7 +186,6 @@ import org.apache.hadoop.metrics.util.MBeanUtil; import org.apache.hadoop.net.DNS; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.Watcher; -import org.apache.hadoop.hbase.trace.SpanReceiverHost; import com.google.protobuf.RpcController; import com.google.protobuf.ServiceException; @@ -328,6 +325,8 @@ Server { public HMaster(final Configuration conf) throws IOException, KeeperException, InterruptedException { this.conf = new Configuration(conf); + LOG.info("hbase.rootdir=" + FSUtils.getRootDir(this.conf) + + ", hbase.cluster.distributed=" + this.conf.getBoolean("hbase.cluster.distributed", false)); // Disable the block cache on the master this.conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f); // Set how many times to retry talking to another server over HConnection. @@ -337,7 +336,7 @@ Server { conf.get("hbase.master.dns.interface", "default"), conf.get("hbase.master.dns.nameserver", "default"))); int port = conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_MASTER_PORT); - // Creation of a HSA will force a resolve. + // Creation of a ISA will force a resolve. InetSocketAddress initialIsa = new InetSocketAddress(hostname, port); if (initialIsa.getAddress() == null) { throw new IllegalArgumentException("Failed resolve of " + initialIsa); @@ -2293,7 +2292,7 @@ Server { * @see org.apache.hadoop.hbase.master.HMasterCommandLine */ public static void main(String [] args) throws Exception { - VersionInfo.logVersion(); + VersionInfo.logVersion(); new HMasterCommandLine(HMaster.class).doMain(args); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java index 2b71860..c740689 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java @@ -134,12 +134,11 @@ public class RecoverableZooKeeper { switch (e.code()) { case NONODE: if (isRetry) { - LOG.info("Node " + path + " already deleted. Assuming that a " + + LOG.info("Node " + path + " already deleted. Assuming a " + "previous attempt succeeded."); return; } - LOG.warn("Node " + path + " already deleted, and this is not a " + - "retry"); + LOG.warn("Node " + path + " already deleted, retry=" + isRetry); throw e; case CONNECTIONLOSS: