You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/12/30 18:34:05 UTC
hbase git commit: HBASE-12607 TestHBaseFsck#testParallelHbck fails
running against hadoop 2.6.0
Repository: hbase
Updated Branches:
refs/heads/master 7310fa2ba -> 57b1efaab
HBASE-12607 TestHBaseFsck#testParallelHbck fails running against hadoop 2.6.0
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/57b1efaa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/57b1efaa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/57b1efaa
Branch: refs/heads/master
Commit: 57b1efaabed195c8dfed9823dcca80260cfea946
Parents: 7310fa2
Author: tedyu <yu...@gmail.com>
Authored: Tue Dec 30 09:33:54 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Dec 30 09:33:54 2014 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/HBaseFsck.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/57b1efaa/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index 6176229..1b362af 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -129,6 +129,7 @@ import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
import org.apache.zookeeper.KeeperException;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -321,7 +322,7 @@ public class HBaseFsck extends Configured {
errors = getErrorReporter(getConf());
this.executor = exec;
}
-
+
/**
* This method maintains a lock using a file. If the creation fails we return null
*
@@ -329,6 +330,7 @@ public class HBaseFsck extends Configured {
* @throws IOException
*/
private FSDataOutputStream checkAndMarkRunningHbck() throws IOException {
+ long start = EnvironmentEdgeManager.currentTime();
try {
FileSystem fs = FSUtils.getCurrentFileSystem(getConf());
FsPermission defaultPerms = FSUtils.getFilePermissions(fs, getConf(),
@@ -346,6 +348,13 @@ public class HBaseFsck extends Configured {
} else {
throw e;
}
+ } finally {
+ long duration = EnvironmentEdgeManager.currentTime() - start;
+ if (duration > 30000) {
+ LOG.warn("Took " + duration + " milliseconds to obtain lock");
+ // took too long to obtain lock
+ return null;
+ }
}
}