hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-12607 Addendum fixes compilation
Date Tue, 30 Dec 2014 17:40:44 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 c1fcb8fe3 -> e88d74d6e


HBASE-12607 Addendum fixes compilation


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e88d74d6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e88d74d6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e88d74d6

Branch: refs/heads/0.98
Commit: e88d74d6e98e0da438333e7c22f96f17ac595a71
Parents: c1fcb8f
Author: tedyu <yuzhihong@gmail.com>
Authored: Tue Dec 30 09:40:36 2014 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Dec 30 09:40:36 2014 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e88d74d6/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 283a7ce..c01864c 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
@@ -320,7 +320,7 @@ public class HBaseFsck extends Configured {
    * @throws IOException
    */
   private FSDataOutputStream checkAndMarkRunningHbck() throws IOException {
-    long start = EnvironmentEdgeManager.currentTime();
+    long start = EnvironmentEdgeManager.currentTimeMillis();
     try {
       FileSystem fs = FSUtils.getCurrentFileSystem(getConf());
       FsPermission defaultPerms = FSUtils.getFilePermissions(fs, getConf(),
@@ -339,7 +339,7 @@ public class HBaseFsck extends Configured {
         throw e;
       }
     } finally {
-      long duration = EnvironmentEdgeManager.currentTime() - start;
+      long duration = EnvironmentEdgeManager.currentTimeMillis() - start;
       if (duration > 30000) {
         LOG.warn("Took " + duration + " milliseconds to obtain lock");
         // took too long to obtain lock


Mime
View raw message