Author: ddas
Date: Tue Mar 26 21:00:11 2013
New Revision: 1461314
URL: http://svn.apache.org/r1461314
Log:
HBASE-8081. Backport HBASE-7213 (separate hlog for meta tables) (Devaraj Das).
Added:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/MetaLogRoller.java
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
hbase/branches/0.94/src/main/resources/hbase-default.xml
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/MockRegionServerServices.java
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Tue Mar 26 21:00:11 2013
@@ -101,6 +101,7 @@ import org.apache.hadoop.hbase.monitorin
import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.monitoring.TaskMonitor;
import
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
+import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.replication.regionserver.Replication;
import org.apache.hadoop.hbase.snapshot.HSnapshotDescription;
import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;
@@ -210,6 +211,8 @@ Server {
// flag set after we complete assignRootAndMeta.
private volatile boolean serverShutdownHandlerEnabled = false;
+ // flag to indicate that we should be handling meta hlogs differently for
splitting
+ private volatile boolean shouldSplitMetaSeparately;
// Instance of the hbase executor service.
ExecutorService executorService;
@@ -333,6 +336,7 @@ Server {
if (isHealthCheckerConfigured()) {
healthCheckChore = new HealthCheckChore(sleepTime, this,
getConfiguration());
}
+ this.shouldSplitMetaSeparately =
conf.getBoolean(HLog.SEPARATE_HLOG_FOR_META, false);
}
/**
@@ -797,7 +801,12 @@ Server {
return;
}
LOG.info("Forcing splitLog and expire of " + sn);
- fileSystemManager.splitLog(sn);
+ if (this.shouldSplitMetaSeparately) {
+ fileSystemManager.splitMetaLog(sn);
+ fileSystemManager.splitLog(sn);
+ } else {
+ fileSystemManager.splitAllLogs(sn);
+ }
serverManager.expireServer(sn);
}
@@ -1736,6 +1745,10 @@ Server {
return this.serverShutdownHandlerEnabled;
}
+ public boolean shouldSplitMetaSeparately() {
+ return this.shouldSplitMetaSeparately;
+ }
+
@Override
@Deprecated
public void assign(final byte[] regionName, final boolean force)
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
Tue Mar 26 21:00:11 2013
@@ -33,6 +33,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
@@ -83,6 +84,18 @@ public class MasterFileSystem {
final SplitLogManager splitLogManager;
private final MasterServices services;
+ private final static PathFilter META_FILTER = new PathFilter() {
+ public boolean accept(Path p) {
+ return HLog.isMetaFile(p);
+ }
+ };
+
+ private final static PathFilter NON_META_FILTER = new PathFilter() {
+ public boolean accept(Path p) {
+ return !HLog.isMetaFile(p);
+ }
+ };
+
public MasterFileSystem(Server master, MasterServices services,
MasterMetrics metrics, boolean masterRecovery)
throws IOException {
@@ -238,7 +251,12 @@ public class MasterFileSystem {
+ " belongs to an existing region server");
}
}
- splitLog(serverNames);
+ if (services.shouldSplitMetaSeparately()) {
+ splitLog(serverNames, META_FILTER);
+ splitLog(serverNames, NON_META_FILTER);
+ } else {
+ splitAllLogs(serverNames);
+ }
retrySplitting = false;
} catch (IOException ioe) {
LOG.warn("Failed splitting of " + serverNames, ioe);
@@ -267,8 +285,36 @@ public class MasterFileSystem {
splitLog(serverNames);
}
- public void splitLog(final List<ServerName> serverNames) throws IOException {
+ public void splitAllLogs(final ServerName serverName) throws IOException {
+ List<ServerName> serverNames = new ArrayList<ServerName>();
+ serverNames.add(serverName);
+ splitAllLogs(serverNames);
+ }
+
+ /**
+ * Specialized method to handle the splitting for meta HLog
+ * @param serverName
+ * @throws IOException
+ */
+ public void splitMetaLog(final ServerName serverName) throws IOException {
long splitTime = 0, splitLogSize = 0;
+ List<ServerName> serverNames = new ArrayList<ServerName>();
+ serverNames.add(serverName);
+ List<Path> logDirs = getLogDirs(serverNames);
+ if (logDirs.isEmpty()) {
+ LOG.info("No meta logs to split");
+ return;
+ }
+ splitLogManager.handleDeadWorkers(serverNames);
+ splitTime = EnvironmentEdgeManager.currentTimeMillis();
+ splitLogSize = splitLogManager.splitLogDistributed(logDirs, META_FILTER);
+ splitTime = EnvironmentEdgeManager.currentTimeMillis() - splitTime;
+ if (this.metrics != null) {
+ this.metrics.addSplit(splitTime, splitLogSize);
+ }
+ }
+
+ private List<Path> getLogDirs(final List<ServerName> serverNames) throws
IOException {
List<Path> logDirs = new ArrayList<Path>();
for(ServerName serverName: serverNames){
Path logDir = new Path(this.rootdir,
@@ -287,6 +333,27 @@ public class MasterFileSystem {
}
logDirs.add(splitDir);
}
+ return logDirs;
+ }
+
+ public void splitLog(final List<ServerName> serverNames) throws IOException {
+ splitLog(serverNames, NON_META_FILTER);
+ }
+
+ public void splitAllLogs(final List<ServerName> serverNames) throws
IOException {
+ splitLog(serverNames, null); //no filter
+ }
+
+ /**
+ * This method is the base split method that splits HLog files matching a
filter.
+ * Callers should pass the appropriate filter for meta and non-meta HLogs.
+ * @param serverNames
+ * @param filter
+ * @throws IOException
+ */
+ public void splitLog(final List<ServerName> serverNames, PathFilter filter)
throws IOException {
+ long splitTime = 0, splitLogSize = 0;
+ List<Path> logDirs = getLogDirs(serverNames);
if (logDirs.isEmpty()) {
LOG.info("No logs to split");
@@ -296,7 +363,7 @@ public class MasterFileSystem {
if (distributedLogSplitting) {
splitLogManager.handleDeadWorkers(serverNames);
splitTime = EnvironmentEdgeManager.currentTimeMillis();
- splitLogSize = splitLogManager.splitLogDistributed(logDirs);
+ splitLogSize = splitLogManager.splitLogDistributed(logDirs,filter);
splitTime = EnvironmentEdgeManager.currentTimeMillis() - splitTime;
} else {
for(Path logDir: logDirs){
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
Tue Mar 26 21:00:11 2013
@@ -135,6 +135,11 @@ public interface MasterServices extends
* @return true if master enables ServerShutdownHandler;
*/
public boolean isServerShutdownHandlerEnabled();
+
+ /**
+ * @return true if master thinks that meta hlogs should be split separately
+ */
+ public boolean shouldSplitMetaSeparately();
/**
* @return returns the master coprocessor host
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
Tue Mar 26 21:00:11 2013
@@ -37,6 +37,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.hbase.Chore;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.Stoppable;
@@ -196,7 +197,7 @@ public class SplitLogManager extends Zoo
}
}
- private FileStatus[] getFileList(List<Path> logDirs) throws IOException {
+ private FileStatus[] getFileList(List<Path> logDirs, PathFilter filter)
throws IOException {
List<FileStatus> fileStatus = new ArrayList<FileStatus>();
for (Path hLogDir : logDirs) {
this.fs = hLogDir.getFileSystem(conf);
@@ -204,8 +205,7 @@ public class SplitLogManager extends Zoo
LOG.warn(hLogDir + " doesn't exist. Nothing to do!");
continue;
}
- // TODO filter filenames?
- FileStatus[] logfiles = FSUtils.listStatus(fs, hLogDir, null);
+ FileStatus[] logfiles = FSUtils.listStatus(fs, hLogDir, filter);
if (logfiles == null || logfiles.length == 0) {
LOG.info(hLogDir + " is empty dir, no logs to split");
} else {
@@ -230,6 +230,7 @@ public class SplitLogManager extends Zoo
logDirs.add(logDir);
return splitLogDistributed(logDirs);
}
+
/**
* The caller will block until all the log files of the given region server
* have been processed - successfully split or an error is encountered - by
an
@@ -242,9 +243,25 @@ public class SplitLogManager extends Zoo
* @return cumulative size of the logfiles split
*/
public long splitLogDistributed(final List<Path> logDirs) throws IOException
{
+ return splitLogDistributed(logDirs, null);
+ }
+
+ /**
+ * The caller will block until all the META log files of the given region
server
+ * have been processed - successfully split or an error is encountered - by
an
+ * available worker region server. This method must only be called after the
+ * region servers have been brought online.
+ *
+ * @param logDirs List of log dirs to split
+ * @param filter the Path filter to select specific files for considering
+ * @throws IOException If there was an error while splitting any log file
+ * @return cumulative size of the logfiles split
+ */
+ public long splitLogDistributed(final List<Path> logDirs, PathFilter filter)
+ throws IOException {
MonitoredTask status = TaskMonitor.get().createStatus(
"Doing distributed log split in " + logDirs);
- FileStatus[] logfiles = getFileList(logDirs);
+ FileStatus[] logfiles = getFileList(logDirs, filter);
status.setStatus("Checking directory contents...");
LOG.debug("Scheduling batch of logs to split");
tot_mgr_log_split_batch_start.incrementAndGet();
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/MetaServerShutdownHandler.java
Tue Mar 26 21:00:11 2013
@@ -19,10 +19,16 @@
*/
package org.apache.hadoop.hbase.master.handler;
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.master.DeadServer;
import org.apache.hadoop.hbase.master.MasterServices;
+import org.apache.zookeeper.KeeperException;
/**
* Shutdown handler for the server hosting <code>-ROOT-</code>,
@@ -31,7 +37,7 @@ import org.apache.hadoop.hbase.master.Ma
public class MetaServerShutdownHandler extends ServerShutdownHandler {
private final boolean carryingRoot;
private final boolean carryingMeta;
-
+ private static final Log LOG =
LogFactory.getLog(MetaServerShutdownHandler.class);
public MetaServerShutdownHandler(final Server server,
final MasterServices services,
final DeadServer deadServers, final ServerName serverName,
@@ -43,11 +49,123 @@ public class MetaServerShutdownHandler e
}
@Override
+ public void process() throws IOException {
+ try {
+ if (this.shouldSplitHlog) {
+ if (this.services.shouldSplitMetaSeparately()) {
+ LOG.info("Splitting META logs for " + serverName);
+ this.services.getMasterFileSystem().splitMetaLog(serverName);
+ } else {
+ LOG.info("Splitting all logs for " + serverName);
+ this.services.getMasterFileSystem().splitAllLogs(serverName);
+ }
+ }
+ } catch (IOException ioe) {
+ this.services.getExecutorService().submit(this);
+ this.deadServers.add(serverName);
+ throw new IOException("failed log splitting for " +
+ serverName + ", will retry", ioe);
+ }
+
+ // Assign root and meta if we were carrying them.
+ if (isCarryingRoot()) { // -ROOT-
+ // Check again: region may be assigned to other where because of RIT
+ // timeout
+ if (this.services.getAssignmentManager().isCarryingRoot(serverName)) {
+ LOG.info("Server " + serverName
+ + " was carrying ROOT. Trying to assign.");
+ this.services.getAssignmentManager().regionOffline(
+ HRegionInfo.ROOT_REGIONINFO);
+ verifyAndAssignRootWithRetries();
+ } else {
+ LOG.info("ROOT has been assigned to otherwhere, skip assigning.");
+ }
+ }
+
+ // Carrying meta?
+ if (isCarryingMeta()) {
+ // Check again: region may be assigned to other where because of RIT
+ // timeout
+ if (this.services.getAssignmentManager().isCarryingMeta(serverName)) {
+ LOG.info("Server " + serverName
+ + " was carrying META. Trying to assign.");
+ this.services.getAssignmentManager().regionOffline(
+ HRegionInfo.FIRST_META_REGIONINFO);
+ this.services.getAssignmentManager().assignMeta();
+ } else {
+ LOG.info("META has been assigned to otherwhere, skip assigning.");
+ }
+
+ }
+ super.process();
+ }
+ /**
+ * Before assign the ROOT region, ensure it haven't
+ * been assigned by other place
+ * <p>
+ * Under some scenarios, the ROOT region can be opened twice, so it seemed
online
+ * in two regionserver at the same time.
+ * If the ROOT region has been assigned, so the operation can be canceled.
+ * @throws InterruptedException
+ * @throws IOException
+ * @throws KeeperException
+ */
+ private void verifyAndAssignRoot()
+ throws InterruptedException, IOException, KeeperException {
+ long timeout = this.server.getConfiguration().
+ getLong("hbase.catalog.verification.timeout", 1000);
+ if (!this.server.getCatalogTracker().verifyRootRegionLocation(timeout)) {
+ this.services.getAssignmentManager().assignRoot();
+ } else if
(serverName.equals(server.getCatalogTracker().getRootLocation())) {
+ throw new IOException("-ROOT- is onlined on the dead server "
+ + serverName);
+ } else {
+ LOG.info("Skip assigning -ROOT-, because it is online on the "
+ + server.getCatalogTracker().getRootLocation());
+ }
+ }
+
+ /**
+ * Failed many times, shutdown processing
+ * @throws IOException
+ */
+ private void verifyAndAssignRootWithRetries() throws IOException {
+ int iTimes = this.server.getConfiguration().getInt(
+ "hbase.catalog.verification.retries", 10);
+
+ long waitTime = this.server.getConfiguration().getLong(
+ "hbase.catalog.verification.timeout", 1000);
+
+ int iFlag = 0;
+ while (true) {
+ try {
+ verifyAndAssignRoot();
+ break;
+ } catch (KeeperException e) {
+ this.server.abort("In server shutdown processing, assigning root", e);
+ throw new IOException("Aborting", e);
+ } catch (Exception e) {
+ if (iFlag >= iTimes) {
+ this.server.abort("verifyAndAssignRoot failed after" + iTimes
+ + " times retries, aborting", e);
+ throw new IOException("Aborting", e);
+ }
+ try {
+ Thread.sleep(waitTime);
+ } catch (InterruptedException e1) {
+ LOG.warn("Interrupted when is the thread sleep", e1);
+ Thread.currentThread().interrupt();
+ throw new IOException("Interrupted", e1);
+ }
+ iFlag++;
+ }
+ }
+ }
+
boolean isCarryingRoot() {
return this.carryingRoot;
}
- @Override
boolean isCarryingMeta() {
return this.carryingMeta;
}
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Tue Mar 26 21:00:11 2013
@@ -54,10 +54,10 @@ import org.apache.zookeeper.KeeperExcept
*/
public class ServerShutdownHandler extends EventHandler {
private static final Log LOG =
LogFactory.getLog(ServerShutdownHandler.class);
- private final ServerName serverName;
- private final MasterServices services;
- private final DeadServer deadServers;
- private final boolean shouldSplitHlog; // whether to split HLog or not
+ protected final ServerName serverName;
+ protected final MasterServices services;
+ protected final DeadServer deadServers;
+ protected final boolean shouldSplitHlog; // whether to split HLog or not
public ServerShutdownHandler(final Server server, final MasterServices
services,
final DeadServer deadServers, final ServerName serverName,
@@ -88,69 +88,6 @@ public class ServerShutdownHandler exten
return super.getInformativeName();
}
}
-
- /**
- * Before assign the ROOT region, ensure it haven't
- * been assigned by other place
- * <p>
- * Under some scenarios, the ROOT region can be opened twice, so it seemed
online
- * in two regionserver at the same time.
- * If the ROOT region has been assigned, so the operation can be canceled.
- * @throws InterruptedException
- * @throws IOException
- * @throws KeeperException
- */
- private void verifyAndAssignRoot()
- throws InterruptedException, IOException, KeeperException {
- long timeout = this.server.getConfiguration().
- getLong("hbase.catalog.verification.timeout", 1000);
- if (!this.server.getCatalogTracker().verifyRootRegionLocation(timeout)) {
- this.services.getAssignmentManager().assignRoot();
- } else if
(serverName.equals(server.getCatalogTracker().getRootLocation())) {
- throw new IOException("-ROOT- is onlined on the dead server "
- + serverName);
- } else {
- LOG.info("Skip assigning -ROOT-, because it is online on the "
- + server.getCatalogTracker().getRootLocation());
- }
- }
-
- /**
- * Failed many times, shutdown processing
- * @throws IOException
- */
- private void verifyAndAssignRootWithRetries() throws IOException {
- int iTimes = this.server.getConfiguration().getInt(
- "hbase.catalog.verification.retries", 10);
-
- long waitTime = this.server.getConfiguration().getLong(
- "hbase.catalog.verification.timeout", 1000);
-
- int iFlag = 0;
- while (true) {
- try {
- verifyAndAssignRoot();
- break;
- } catch (KeeperException e) {
- this.server.abort("In server shutdown processing, assigning root", e);
- throw new IOException("Aborting", e);
- } catch (Exception e) {
- if (iFlag >= iTimes) {
- this.server.abort("verifyAndAssignRoot failed after" + iTimes
- + " times retries, aborting", e);
- throw new IOException("Aborting", e);
- }
- try {
- Thread.sleep(waitTime);
- } catch (InterruptedException e1) {
- LOG.warn("Interrupted when is the thread sleep", e1);
- Thread.currentThread().interrupt();
- throw new IOException("Interrupted", e1);
- }
- iFlag++;
- }
- }
- }
/**
* @return True if the server we are processing was carrying
<code>-ROOT-</code>
@@ -187,42 +124,14 @@ public class ServerShutdownHandler exten
LOG.info("Skipping log splitting for " + serverName);
}
} catch (IOException ioe) {
- this.services.getExecutorService().submit(this);
+ //typecast to SSH so that we make sure that it is the SSH instance that
+ //gets submitted as opposed to MSSH or some other derived instance of
SSH
+ this.services.getExecutorService().submit((ServerShutdownHandler)this);
this.deadServers.add(serverName);
throw new IOException("failed log splitting for " +
serverName + ", will retry", ioe);
}
- // Assign root and meta if we were carrying them.
- if (isCarryingRoot()) { // -ROOT-
- // Check again: region may be assigned to other where because of RIT
- // timeout
- if (this.services.getAssignmentManager().isCarryingRoot(serverName)) {
- LOG.info("Server " + serverName
- + " was carrying ROOT. Trying to assign.");
- this.services.getAssignmentManager().regionOffline(
- HRegionInfo.ROOT_REGIONINFO);
- verifyAndAssignRootWithRetries();
- } else {
- LOG.info("ROOT has been assigned to otherwhere, skip assigning.");
- }
- }
-
- // Carrying meta?
- if (isCarryingMeta()) {
- // Check again: region may be assigned to other where because of RIT
- // timeout
- if (this.services.getAssignmentManager().isCarryingMeta(serverName)) {
- LOG.info("Server " + serverName
- + " was carrying META. Trying to assign.");
- this.services.getAssignmentManager().regionOffline(
- HRegionInfo.FIRST_META_REGIONINFO);
- this.services.getAssignmentManager().assignMeta();
- } else {
- LOG.info("META has been assigned to otherwhere, skip assigning.");
- }
- }
-
// We don't want worker thread in the MetaServerShutdownHandler
// executor pool to block by waiting availability of -ROOT-
// and .META. server. Otherwise, it could run into the following issue:
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Tue Mar 26 21:00:11 2013
@@ -31,6 +31,7 @@ import java.lang.reflect.Method;
import java.net.BindException;
import java.net.InetSocketAddress;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -249,6 +250,7 @@ public class HRegionServer implements HR
private HBaseServer server;
private final InetSocketAddress isa;
+ private UncaughtExceptionHandler uncaughtExceptionHandler;
// Leases
private Leases leases;
@@ -293,7 +295,14 @@ public class HRegionServer implements HR
// HLog and HLog roller. log is protected rather than private to avoid
// eclipse warning when accessed by inner classes
protected volatile HLog hlog;
+ // The meta updates are written to a different hlog. If this
+ // regionserver holds meta regions, then this field will be non-null.
+ protected volatile HLog hlogForMeta;
+
LogRoller hlogRoller;
+ LogRoller metaHLogRoller;
+
+ private final boolean separateHLogForMeta;
// flag set after we're done setting up server threads (used for testing)
protected volatile boolean isOnline;
@@ -401,6 +410,7 @@ public class HRegionServer implements HR
HConstants.HBASE_CHECKSUM_VERIFICATION, false);
// Config'ed params
+ this.separateHLogForMeta = conf.getBoolean(HLog.SEPARATE_HLOG_FOR_META,
false);
this.numRetries = conf.getInt("hbase.client.retries.number", 10);
this.threadWakeFrequency = conf.getInt(HConstants.THREAD_WAKE_FREQUENCY,
10 * 1000);
@@ -460,6 +470,11 @@ public class HRegionServer implements HR
"hbase.regionserver.kerberos.principal", this.isa.getHostName());
regionServerAccounting = new RegionServerAccounting();
cacheConfig = new CacheConfig(conf);
+ uncaughtExceptionHandler = new UncaughtExceptionHandler() {
+ public void uncaughtException(Thread t, Throwable e) {
+ abort("Uncaught exception in service thread " + t.getName(), e);
+ }
+ };
}
/** Handle all the snapshot requests to this server */
@@ -806,6 +821,7 @@ public class HRegionServer implements HR
if (this.cacheFlusher != null) this.cacheFlusher.interruptIfNecessary();
if (this.compactSplitThread != null)
this.compactSplitThread.interruptIfNecessary();
if (this.hlogRoller != null) this.hlogRoller.interruptIfNecessary();
+ if (this.metaHLogRoller != null)
this.metaHLogRoller.interruptIfNecessary();
if (this.compactionChecker != null)
this.compactionChecker.interrupt();
if (this.healthCheckChore != null) {
@@ -994,16 +1010,27 @@ public class HRegionServer implements HR
}
private void closeWAL(final boolean delete) {
- try {
- if (this.hlog != null) {
+ if (this.hlogForMeta != null) {
+ // All hlogs (meta and non-meta) are in the same directory. Don't call
+ // closeAndDelete here since that would delete all hlogs not just the
+ // meta ones. We will just 'close' the hlog for meta here, and leave
+ // the directory cleanup to the follow-on closeAndDelete call.
+ try { //Part of the patch from HBASE-7982 to do with exception handling
+ this.hlogForMeta.close();
+ } catch (Throwable e) {
+ LOG.error("Metalog close and delete failed",
RemoteExceptionHandler.checkThrowable(e));
+ }
+ }
+ if (this.hlog != null) {
+ try {
if (delete) {
hlog.closeAndDelete();
} else {
hlog.close();
}
+ } catch (Throwable e) {
+ LOG.error("Close and delete failed",
RemoteExceptionHandler.checkThrowable(e));
}
- } catch (Throwable e) {
- LOG.error("Close and delete failed",
RemoteExceptionHandler.checkThrowable(e));
}
}
@@ -1355,6 +1382,24 @@ public class HRegionServer implements HR
return instantiateHLog(logdir, oldLogDir);
}
+ // The method is synchronized to guarantee atomic update to hlogForMeta -
+ // It is possible that multiple calls could be made to this method almost
+ // at the same time, one for _ROOT_ and another for .META. (if they happen
+ // to be assigned to the same RS). Also, we want to use the same log for both
+ private synchronized HLog getMetaWAL() throws IOException {
+ if (this.hlogForMeta == null) {
+ final String logName
+ = HLog.getHLogDirectoryName(this.serverNameFromMasterPOV.toString());
+
+ Path logdir = new Path(rootDir, logName);
+ final Path oldLogDir = new Path(rootDir,
HConstants.HREGION_OLDLOGDIR_NAME);
+ if (LOG.isDebugEnabled()) LOG.debug("logdir=" + logdir);
+ this.hlogForMeta = new HLog(this.fs.getBackingFs(), logdir, oldLogDir,
this.conf,
+ getMetaWALActionListeners(), false,
this.serverNameFromMasterPOV.toString(), true);
+ }
+ return this.hlogForMeta;
+ }
+
/**
* Called by {@link #setupWALAndReplication()} creating WAL instance.
* @param logdir
@@ -1386,6 +1431,20 @@ public class HRegionServer implements HR
return listeners;
}
+ protected List<WALActionsListener> getMetaWALActionListeners() {
+ List<WALActionsListener> listeners = new ArrayList<WALActionsListener>();
+ // Using a tmp log roller to ensure metaLogRoller is alive once it is not
+ // null (addendum patch on HBASE-7213)
+ MetaLogRoller tmpLogRoller = new MetaLogRoller(this, this);
+ String n = Thread.currentThread().getName();
+ Threads.setDaemonThreadRunning(tmpLogRoller.getThread(),
+ n + "MetaLogRoller", uncaughtExceptionHandler);
+ this.metaHLogRoller = tmpLogRoller;
+ tmpLogRoller = null;
+ listeners.add(this.metaHLogRoller);
+ return listeners;
+ }
+
protected LogRoller getLogRoller() {
return hlogRoller;
}
@@ -1580,12 +1639,6 @@ public class HRegionServer implements HR
*/
private void startServiceThreads() throws IOException {
String n = Thread.currentThread().getName();
- UncaughtExceptionHandler handler = new UncaughtExceptionHandler() {
- public void uncaughtException(Thread t, Throwable e) {
- abort("Uncaught exception in service thread " + t.getName(), e);
- }
- };
-
// Start executor services
this.service = new ExecutorService(getServerName().toString());
this.service.startExecutorService(ExecutorType.RS_OPEN_REGION,
@@ -1601,14 +1654,15 @@ public class HRegionServer implements HR
this.service.startExecutorService(ExecutorType.RS_CLOSE_META,
conf.getInt("hbase.regionserver.executor.closemeta.threads", 1));
- Threads.setDaemonThreadRunning(this.hlogRoller.getThread(), n +
".logRoller", handler);
+ Threads.setDaemonThreadRunning(this.hlogRoller.getThread(), n +
".logRoller",
+ uncaughtExceptionHandler);
Threads.setDaemonThreadRunning(this.cacheFlusher.getThread(), n +
".cacheFlusher",
- handler);
+ uncaughtExceptionHandler);
Threads.setDaemonThreadRunning(this.compactionChecker.getThread(), n +
- ".compactionChecker", handler);
+ ".compactionChecker", uncaughtExceptionHandler);
if (this.healthCheckChore != null) {
Threads.setDaemonThreadRunning(this.healthCheckChore.getThread(), n +
".healthChecker",
- handler);
+ uncaughtExceptionHandler);
}
// Leases is not a Thread. Internally it runs a daemon thread. If it gets
@@ -1690,11 +1744,33 @@ public class HRegionServer implements HR
stop("One or more threads are no longer alive -- stop");
return false;
}
+ if (metaHLogRoller != null && !metaHLogRoller.isAlive()) {
+ stop("Meta HLog roller thread is no longer alive -- stop");
+ return false;
+ }
return true;
}
- @Override
public HLog getWAL() {
+ try {
+ return getWAL(null);
+ } catch (IOException e) {
+ LOG.warn("getWAL threw exception " + e);
+ return null;
+ }
+ }
+
+ @Override
+ public HLog getWAL(HRegionInfo regionInfo) throws IOException {
+ //TODO: at some point this should delegate to the HLogFactory
+ //currently, we don't care about the region as much as we care about the
+ //table.. (hence checking the tablename below)
+ //_ROOT_ and .META. regions have separate WAL.
+ if (this.separateHLogForMeta &&
+ regionInfo != null &&
+ regionInfo.isMetaTable()) {
+ return getMetaWAL();
+ }
return this.hlog;
}
@@ -1846,6 +1922,9 @@ public class HRegionServer implements HR
if (this.hlogRoller != null) {
Threads.shutdown(this.hlogRoller.getThread());
}
+ if (this.metaHLogRoller != null) {
+ Threads.shutdown(this.metaHLogRoller.getThread());
+ }
if (this.compactSplitThread != null) {
this.compactSplitThread.join();
}
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
Tue Mar 26 21:00:11 2013
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException;
+import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;
@@ -46,7 +47,7 @@ class LogRoller extends HasThread implem
private final ReentrantLock rollLock = new ReentrantLock();
private final AtomicBoolean rollLog = new AtomicBoolean(false);
private final Server server;
- private final RegionServerServices services;
+ protected final RegionServerServices services;
private volatile long lastrolltime = System.currentTimeMillis();
// Period to roll log.
private final long rollperiod;
@@ -91,7 +92,7 @@ class LogRoller extends HasThread implem
try {
this.lastrolltime = now;
// This is array of actual region names.
- byte [][] regionsToFlush =
this.services.getWAL().rollWriter(rollLog.get());
+ byte [][] regionsToFlush = getWAL().rollWriter(rollLog.get());
if (regionsToFlush != null) {
for (byte [] r: regionsToFlush) scheduleFlush(r);
}
@@ -155,6 +156,10 @@ class LogRoller extends HasThread implem
}
}
+ protected HLog getWAL() throws IOException {
+ return this.services.getWAL(null);
+ }
+
@Override
public void preLogRoll(Path oldPath, Path newPath) throws IOException {
// Not interested
Added:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/MetaLogRoller.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/MetaLogRoller.java?rev=1461314&view=auto
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/MetaLogRoller.java
(added)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/MetaLogRoller.java
Tue Mar 26 21:00:11 2013
@@ -0,0 +1,38 @@
+/**
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import java.io.IOException;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.Server;
+import org.apache.hadoop.hbase.regionserver.wal.HLog;
+
[email protected]
+class MetaLogRoller extends LogRoller {
+ public MetaLogRoller(Server server, RegionServerServices services) {
+ super(server, services);
+ }
+ @Override
+ protected HLog getWAL() throws IOException {
+ //The argument to getWAL below could either be
HRegionInfo.FIRST_META_REGIONINFO or
+ //HRegionInfo.ROOT_REGIONINFO. Both these share the same WAL.
+ return services.getWAL(HRegionInfo.FIRST_META_REGIONINFO);
+ }
+}
\ No newline at end of file
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java
Tue Mar 26 21:00:11 2013
@@ -20,7 +20,6 @@
package org.apache.hadoop.hbase.regionserver;
import java.io.IOException;
-import java.util.Map;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.HRegionInfo;
@@ -38,8 +37,9 @@ public interface RegionServerServices ex
*/
public boolean isStopping();
- /** @return the HLog */
- public HLog getWAL();
+ /** @return the HLog for a particular region. Pass null for getting the
+ * default (common) WAL */
+ public HLog getWAL(HRegionInfo regionInfo) throws IOException;
/**
* @return Implementation of {@link CompactionRequestor} or null.
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
Tue Mar 26 21:00:11 2013
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.executor.
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionServerAccounting;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
+import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.util.CancelableProgressable;
import org.apache.hadoop.hbase.zookeeper.ZKAssign;
import org.apache.zookeeper.KeeperException;
@@ -43,7 +44,7 @@ import org.apache.zookeeper.KeeperExcept
public class OpenRegionHandler extends EventHandler {
private static final Log LOG = LogFactory.getLog(OpenRegionHandler.class);
- private final RegionServerServices rsServices;
+ protected final RegionServerServices rsServices;
private final HRegionInfo regionInfo;
private final HTableDescriptor htd;
@@ -327,7 +328,8 @@ public class OpenRegionHandler extends E
// Instantiate the region. This also periodically tickles our zk OPENING
// state so master doesn't timeout this region in transition.
region = HRegion.openHRegion(this.regionInfo, this.htd,
- this.rsServices.getWAL(), this.server.getConfiguration(),
+ this.rsServices.getWAL(this.regionInfo),
+ this.server.getConfiguration(),
this.rsServices,
new CancelableProgressable() {
public boolean progress() {
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
Tue Mar 26 21:00:11 2013
@@ -119,6 +119,9 @@ public class HLog implements Syncable {
/** File Extension used while splitting an HLog into regions (HBASE-2312) */
public static final String SPLITTING_EXT = "-splitting";
public static final boolean SPLIT_SKIP_ERRORS_DEFAULT = false;
+ /** The META region's HLog filename extension */
+ public static final String META_HLOG_FILE_EXTN = ".meta";
+ public static final String SEPARATE_HLOG_FOR_META =
"hbase.regionserver.separate.hlog.for.meta";
/*
* Name of directory that holds recovered edits written by the wal log
@@ -200,6 +203,8 @@ public class HLog implements Syncable {
private final AtomicLong logSeqNum = new AtomicLong(0);
+ private boolean forMeta = false;
+
// The timestamp (in ms) when the log file was created.
private volatile long filenum = -1;
@@ -254,7 +259,8 @@ public class HLog implements Syncable {
/**
* Pattern used to validate a HLog file name
*/
- private static final Pattern pattern = Pattern.compile(".*\\.\\d*");
+ private static final Pattern pattern =
+ Pattern.compile(".*\\.\\d*("+HLog.META_HLOG_FILE_EXTN+")*");
static byte [] COMPLETE_CACHE_FLUSH;
static {
@@ -334,7 +340,7 @@ public class HLog implements Syncable {
public HLog(final FileSystem fs, final Path dir, final Path oldLogDir,
final Configuration conf)
throws IOException {
- this(fs, dir, oldLogDir, conf, null, true, null);
+ this(fs, dir, oldLogDir, conf, null, true, null, false);
}
/**
@@ -359,7 +365,7 @@ public class HLog implements Syncable {
public HLog(final FileSystem fs, final Path dir, final Path oldLogDir,
final Configuration conf, final List<WALActionsListener> listeners,
final String prefix) throws IOException {
- this(fs, dir, oldLogDir, conf, listeners, true, prefix);
+ this(fs, dir, oldLogDir, conf, listeners, true, prefix, false);
}
/**
@@ -380,11 +386,12 @@ public class HLog implements Syncable {
* @param prefix should always be hostname and port in distributed env and
* it will be URL encoded before being used.
* If prefix is null, "hlog" will be used
+ * @param forMeta if this hlog is meant for meta updates
* @throws IOException
*/
public HLog(final FileSystem fs, final Path dir, final Path oldLogDir,
final Configuration conf, final List<WALActionsListener> listeners,
- final boolean failIfLogDirExists, final String prefix)
+ final boolean failIfLogDirExists, final String prefix, boolean forMeta)
throws IOException {
super();
this.fs = fs;
@@ -402,10 +409,11 @@ public class HLog implements Syncable {
this.logrollsize = (long)(this.blocksize * multi);
this.optionalFlushInterval =
conf.getLong("hbase.regionserver.optionallogflushinterval", 1 * 1000);
- if (failIfLogDirExists && fs.exists(dir)) {
+ boolean dirExists = false;
+ if (failIfLogDirExists && (dirExists = this.fs.exists(dir))) {
throw new IOException("Target HLog directory already exists: " + dir);
}
- if (!fs.mkdirs(dir)) {
+ if (!dirExists && !fs.mkdirs(dir)) {
throw new IOException("Unable to mkdir " + dir);
}
this.oldLogDir = oldLogDir;
@@ -414,6 +422,7 @@ public class HLog implements Syncable {
throw new IOException("Unable to mkdir " + this.oldLogDir);
}
}
+ this.forMeta = forMeta;
this.maxLogs = conf.getInt("hbase.regionserver.maxlogs", 32);
this.minTolerableReplication = conf.getInt(
"hbase.regionserver.hlog.tolerable.lowreplication",
@@ -623,6 +632,7 @@ public class HLog implements Syncable {
long currentFilenum = this.filenum;
Path oldPath = null;
if (currentFilenum > 0) {
+ //computeFilename will take care of meta hlog filename
oldPath = computeFilename(currentFilenum);
}
this.filenum = System.currentTimeMillis();
@@ -698,6 +708,9 @@ public class HLog implements Syncable {
*/
protected Writer createWriterInstance(final FileSystem fs, final Path path,
final Configuration conf) throws IOException {
+ if (forMeta) {
+ //TODO: set a higher replication for the hlog files (HBASE-6773)
+ }
return createWriter(fs, path, conf);
}
@@ -947,7 +960,18 @@ public class HLog implements Syncable {
if (filenum < 0) {
throw new RuntimeException("hlog file number can't be < 0");
}
- return new Path(dir, prefix + "." + filenum);
+ String child = prefix + "." + filenum;
+ if (forMeta) {
+ child += HLog.META_HLOG_FILE_EXTN;
+ }
+ return new Path(dir, child);
+ }
+
+ public static boolean isMetaFile(Path p) {
+ if (p.getName().endsWith(HLog.META_HLOG_FILE_EXTN)) {
+ return true;
+ }
+ return false;
}
/**
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
(original)
+++
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
Tue Mar 26 21:00:11 2013
@@ -41,6 +41,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.RemoteExceptionHandler;
@@ -279,6 +280,11 @@ public class HLogSplitter {
+ ": " + logPath + ", length=" + logLength);
Reader in;
try {
+ //actually, for meta-only hlogs, we don't need to go thru the process
+ //of parsing and segregating by regions since all the logs are for
+ //meta only. However, there is a sequence number that can be obtained
+ //only by parsing.. so we parse for all files currently
+ //TODO: optimize this part somehow
in = getReader(fs, log, conf, skipErrors);
if (in != null) {
parseHLog(in, logPath, entryBuffers, fs, conf, skipErrors);
Modified: hbase/branches/0.94/src/main/resources/hbase-default.xml
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/resources/hbase-default.xml?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/resources/hbase-default.xml (original)
+++ hbase/branches/0.94/src/main/resources/hbase-default.xml Tue Mar 26
21:00:11 2013
@@ -232,6 +232,10 @@
<description>The HLog file writer implementation.</description>
</property>
<property>
+ <name>hbase.regionserver.separate.hlog.for.meta</name>
+ <value>false</value>
+ </property>
+ <property>
<name>hbase.regionserver.nbreservationblocks</name>
<value>4</value>
<description>The number of resevoir blocks of memory release on
Modified:
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
(original)
+++
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
Tue Mar 26 21:00:11 2013
@@ -308,6 +308,11 @@ public class TestCatalogJanitor {
@Override
public void deleteColumn(byte[] tableName, byte[] columnName) throws
IOException {
}
+
+ @Override
+ public boolean shouldSplitMetaSeparately() {
+ return false;
+ }
}
@Test
Modified:
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/MockRegionServerServices.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/MockRegionServerServices.java?rev=1461314&r1=1461313&r2=1461314&view=diff
==============================================================================
---
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/MockRegionServerServices.java
(original)
+++
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/MockRegionServerServices.java
Tue Mar 26 21:00:11 2013
@@ -82,7 +82,7 @@ public class MockRegionServerServices im
}
@Override
- public HLog getWAL() {
+ public HLog getWAL(HRegionInfo regionInfo) throws IOException {
return null;
}
