Revert "HBASE-1422 Delayed flush doesn't work causing flush storms; addendum by Lars Hofhansl" Revert because pushed with wrong JIRA number
This reverts commit b1462679e17f9b5827720f3c57eaeff946cfea0e. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9fb53d07 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9fb53d07 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9fb53d07 Branch: refs/heads/hbase-12439 Commit: 9fb53d07c418002c8a03be1e7e664e094f304ba5 Parents: b146267 Author: stack <st...@apache.org> Authored: Sat Dec 5 14:30:05 2015 -0800 Committer: stack <st...@apache.org> Committed: Sat Dec 5 14:30:05 2015 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9fb53d07/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java index 7e7239e..ca15286 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/JitterScheduledThreadPoolExecutorImpl.java @@ -81,8 +81,7 @@ public class JitterScheduledThreadPoolExecutorImpl extends ScheduledThreadPoolEx public long getDelay(TimeUnit unit) { long baseDelay = wrapped.getDelay(unit); long spreadTime = (long) (baseDelay * spread); - long delay = spreadTime <= 0 ? baseDelay - : baseDelay + ThreadLocalRandom.current().nextLong(-spreadTime, spreadTime); + long delay = baseDelay + ThreadLocalRandom.current().nextLong(-spreadTime, spreadTime); // Ensure that we don't roll over for nanoseconds. return (delay < 0) ? baseDelay : delay; }