hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecl...@apache.org
Subject hbase git commit: HBASE-15319 clearJmxCache does not take effect actually
Date Thu, 25 Feb 2016 00:31:38 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 f502f4ac9 -> 4710463d2


HBASE-15319 clearJmxCache does not take effect actually


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

Branch: refs/heads/branch-1.2
Commit: 4710463d2d7191425cc54ebe4d62e3f4ea6672dd
Parents: f502f4a
Author: Elliott Clark <eclark@apache.org>
Authored: Wed Feb 24 09:02:06 2016 -0800
Committer: Elliott Clark <eclark@apache.org>
Committed: Wed Feb 24 16:29:22 2016 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/4710463d/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
index 95734ba..8fcf623 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
@@ -52,7 +52,7 @@ public class JmxCacheBuster {
   public static void clearJmxCache() {
     //If there are more then 100 ms before the executor will run then everything should be
merged.
     ScheduledFuture future = fut.get();
-    if ((future == null || (!future.isDone() && future.getDelay(TimeUnit.MILLISECONDS)
> 100))) {
+    if ((future != null && (!future.isDone() && future.getDelay(TimeUnit.MILLISECONDS)
> 100))) {
       // BAIL OUT
       return;
     }


Mime
View raw message