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 2014/05/29 08:20:14 UTC
git commit: HBASE-11218 Data loss in HBase standalone mode; REVERT
Repository: hbase
Updated Branches:
refs/heads/0.98 86ab435b8 -> 111ebaaea
HBASE-11218 Data loss in HBase standalone mode; REVERT
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/111ebaae
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/111ebaae
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/111ebaae
Branch: refs/heads/0.98
Commit: 111ebaaea3bc70888ac27c09d0c8433f66df13e0
Parents: 86ab435
Author: Michael Stack <st...@duboce.net>
Authored: Wed May 28 23:20:04 2014 -0700
Committer: Michael Stack <st...@duboce.net>
Committed: Wed May 28 23:20:04 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/fs/HFileSystem.java | 7 -------
.../hadoop/hbase/master/HMasterCommandLine.java | 2 --
.../hadoop/hbase/zookeeper/MiniZooKeeperCluster.java | 13 ++++++++-----
.../org/apache/hadoop/hbase/HBaseTestingUtility.java | 14 --------------
.../hbase/util/hbck/TestOfflineMetaRebuildBase.java | 4 ++--
.../hbase/util/hbck/TestOfflineMetaRebuildHole.java | 3 ++-
.../util/hbck/TestOfflineMetaRebuildOverlap.java | 3 ++-
7 files changed, 14 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/111ebaae/hbase-server/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java
index f8cf7b3..8178787 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/fs/HFileSystem.java
@@ -81,13 +81,6 @@ public class HFileSystem extends FilterFileSystem {
this.useHBaseChecksum = useHBaseChecksum;
fs.initialize(getDefaultUri(conf), conf);
-
- // disable checksum verification for local fileSystem, see HBASE-11218
- if (fs instanceof LocalFileSystem) {
- fs.setWriteChecksum(false);
- fs.setVerifyChecksum(false);
- }
-
addLocationsOrderInterceptor(conf);
// If hbase checksum verification is switched on, then create a new
http://git-wip-us.apache.org/repos/asf/hbase/blob/111ebaae/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
index e56ab6f..886fde6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
@@ -30,7 +30,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.MasterNotRunningException;
import org.apache.hadoop.hbase.ZNodeClearer;
import org.apache.hadoop.hbase.HConstants;
@@ -173,7 +172,6 @@ public class HMasterCommandLine extends ServerCommandLine {
}
conf.set(HConstants.ZOOKEEPER_CLIENT_PORT,
Integer.toString(clientPort));
- conf.setInt(HConstants.ZK_SESSION_TIMEOUT, 10 *1000);
// Need to have the zk cluster shutdown when master is shutdown.
// Run a subclass that does the zk cluster shutdown on its way out.
LocalHBaseCluster cluster = new LocalHBaseCluster(conf, conf.getInt("hbase.masters", 1),
http://git-wip-us.apache.org/repos/asf/hbase/blob/111ebaae/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
index 69a7cba..3a42ea0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java
@@ -152,7 +152,7 @@ public class MiniZooKeeperCluster {
// running all the ZK servers
for (int i = 0; i < numZooKeeperServers; i++) {
File dir = new File(baseDir, "zookeeper_"+i).getAbsoluteFile();
- createDir(dir);
+ recreateDir(dir);
int tickTimeToUse;
if (this.tickTime > 0) {
tickTimeToUse = this.tickTime;
@@ -202,11 +202,14 @@ public class MiniZooKeeperCluster {
return clientPort;
}
- private void createDir(File dir) throws IOException {
- try {
- if (!dir.exists()) {
- dir.mkdirs();
+ private void recreateDir(File dir) throws IOException {
+ if (dir.exists()) {
+ if(!FileUtil.fullyDelete(dir)) {
+ throw new IOException("Could not delete zk base directory: " + dir);
}
+ }
+ try {
+ dir.mkdirs();
} catch (SecurityException e) {
throw new IOException("creating dir: " + dir, e);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/111ebaae/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 6e7a5ee..2984fe3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -952,20 +952,6 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
miniClusterRunning = false;
LOG.info("Minicluster is down");
}
-
- /**
- * @return True if we removed the test dirs
- * @throws IOException
- */
- @Override
- public boolean cleanupTestDir() throws IOException {
- boolean ret = super.cleanupTestDir();
- if (deleteDir(this.clusterTestDir)) {
- this.clusterTestDir = null;
- return ret & true;
- }
- return false;
- }
/**
* Shutdown HBase mini cluster. Does not shutdown zk or dfs if running.
http://git-wip-us.apache.org/repos/asf/hbase/blob/111ebaae/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
index 7a075a6..1a85bc5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
@@ -65,9 +65,9 @@ public class TestOfflineMetaRebuildBase extends OfflineMetaRebuildTestCore {
assertTrue(fsck.rebuildMeta(false));
// bring up the minicluster
- TEST_UTIL.startMiniZKCluster();
+ TEST_UTIL.startMiniZKCluster(); // tables seem enabled by default
TEST_UTIL.restartHBaseCluster(3);
- TEST_UTIL.getHBaseAdmin().enableTable(table);
+
ZooKeeperWatcher zkw = HBaseTestingUtility.getZooKeeperWatcher(TEST_UTIL);
LOG.info("Waiting for no more RIT");
http://git-wip-us.apache.org/repos/asf/hbase/blob/111ebaae/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
index a3225bd..9cf8516 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
@@ -96,7 +96,8 @@ public class TestOfflineMetaRebuildHole extends OfflineMetaRebuildTestCore {
assertErrors(doFsck(conf, false), new ERROR_CODE[] {
ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
- ERROR_CODE.NOT_IN_META_OR_DEPLOYED});
+ ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
+ ERROR_CODE.HOLE_IN_REGION_CHAIN});
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/111ebaae/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
index 9a17948..34098ba 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
@@ -107,7 +107,8 @@ public class TestOfflineMetaRebuildOverlap extends OfflineMetaRebuildTestCore {
ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
- ERROR_CODE.NOT_IN_META_OR_DEPLOYED});
+ ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
+ ERROR_CODE.HOLE_IN_REGION_CHAIN});
}
}