HBASE-14977 ChoreService.shutdown may result in ConcurrentModificationException - ADDENDUM to fix extra concurrency issues
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/95a13b51 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/95a13b51 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/95a13b51 Branch: refs/heads/hbase-12439 Commit: 95a13b51ee052eb73882682e8f009bfa1e914866 Parents: 6e2c5d2 Author: Enis Soztutar <e...@apache.org> Authored: Tue Dec 22 02:04:09 2015 -0800 Committer: Enis Soztutar <e...@apache.org> Committed: Tue Dec 22 02:04:09 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/ScheduledChore.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/95a13b51/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java index 538b390..dd98d26 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java @@ -228,7 +228,7 @@ public abstract class ScheduledChore implements Runnable { && getTimeBetweenRuns() > getMaximumAllowedTimeBetweenRuns(); } - private synchronized double getMaximumAllowedTimeBetweenRuns() { + private double getMaximumAllowedTimeBetweenRuns() { // Threshold used to determine if the Chore's current run started too late return 1.5 * period; } @@ -268,23 +268,23 @@ public abstract class ScheduledChore implements Runnable { choreServicer = null; } - public synchronized String getName() { + public String getName() { return name; } - public synchronized Stoppable getStopper() { + public Stoppable getStopper() { return stopper; } - public synchronized int getPeriod() { + public int getPeriod() { return period; } - public synchronized long getInitialDelay() { + public long getInitialDelay() { return initialDelay; } - public final synchronized TimeUnit getTimeUnit() { + public TimeUnit getTimeUnit() { return timeUnit; }
