Repository: incubator-distributedlog Updated Branches: refs/heads/master 0711bc2fd -> 32a52a9f7
DL-140: Fix distributedlog-core findbug inconsistent synchronization warings Author: xieliang <xieliang...@gmail.com> Reviewers: Leigh Stewart <lstew...@apache.org> Closes #71 from xieliang/DL-140 Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/32a52a9f Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/32a52a9f Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/32a52a9f Branch: refs/heads/master Commit: 32a52a9f71cc86efeb5fa73576c20d8f392e0ce5 Parents: 0711bc2 Author: xieliang <xieliang...@gmail.com> Authored: Wed Jan 4 00:41:56 2017 -0800 Committer: Sijie Guo <si...@apache.org> Committed: Wed Jan 4 00:41:56 2017 -0800 ---------------------------------------------------------------------- .../java/com/twitter/distributedlog/BKAbstractLogWriter.java | 4 ++-- .../main/java/com/twitter/distributedlog/BKLogSegmentWriter.java | 2 +- .../java/com/twitter/distributedlog/EnvelopedEntryWriter.java | 2 +- .../src/main/java/com/twitter/distributedlog/MaxTxId.java | 2 +- .../java/com/twitter/distributedlog/lock/ZKDistributedLock.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/32a52a9f/distributedlog-core/src/main/java/com/twitter/distributedlog/BKAbstractLogWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/java/com/twitter/distributedlog/BKAbstractLogWriter.java b/distributedlog-core/src/main/java/com/twitter/distributedlog/BKAbstractLogWriter.java index b0cea24..d1c28d7 100644 --- a/distributedlog-core/src/main/java/com/twitter/distributedlog/BKAbstractLogWriter.java +++ b/distributedlog-core/src/main/java/com/twitter/distributedlog/BKAbstractLogWriter.java @@ -54,7 +54,7 @@ abstract class BKAbstractLogWriter implements Closeable, AsyncCloseable, Abortab // States private Promise<Void> closePromise = null; - private boolean forceRolling = false; + private volatile boolean forceRolling = false; private boolean forceRecovery = false; // Truncation Related @@ -531,7 +531,7 @@ abstract class BKAbstractLogWriter implements Closeable, AsyncCloseable, Abortab } @VisibleForTesting - public synchronized void setForceRolling(boolean forceRolling) { + public void setForceRolling(boolean forceRolling) { this.forceRolling = forceRolling; } http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/32a52a9f/distributedlog-core/src/main/java/com/twitter/distributedlog/BKLogSegmentWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/java/com/twitter/distributedlog/BKLogSegmentWriter.java b/distributedlog-core/src/main/java/com/twitter/distributedlog/BKLogSegmentWriter.java index 8029f89..df64505 100644 --- a/distributedlog-core/src/main/java/com/twitter/distributedlog/BKLogSegmentWriter.java +++ b/distributedlog-core/src/main/java/com/twitter/distributedlog/BKLogSegmentWriter.java @@ -420,7 +420,7 @@ class BKLogSegmentWriter implements LogSegmentWriter, AddCallback, Runnable, Siz * * @return position-within-logsegment of the last written log record. */ - int getPositionWithinLogSegment() { + synchronized int getPositionWithinLogSegment() { return positionWithinLogSegment; } http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/32a52a9f/distributedlog-core/src/main/java/com/twitter/distributedlog/EnvelopedEntryWriter.java ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/java/com/twitter/distributedlog/EnvelopedEntryWriter.java b/distributedlog-core/src/main/java/com/twitter/distributedlog/EnvelopedEntryWriter.java index df56288..01a91ab 100644 --- a/distributedlog-core/src/main/java/com/twitter/distributedlog/EnvelopedEntryWriter.java +++ b/distributedlog-core/src/main/java/com/twitter/distributedlog/EnvelopedEntryWriter.java @@ -176,7 +176,7 @@ class EnvelopedEntryWriter implements Writer { } @Override - public DLSN finalizeTransmit(long lssn, long entryId) { + public synchronized DLSN finalizeTransmit(long lssn, long entryId) { return new DLSN(lssn, entryId, count - 1); } http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/32a52a9f/distributedlog-core/src/main/java/com/twitter/distributedlog/MaxTxId.java ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/java/com/twitter/distributedlog/MaxTxId.java b/distributedlog-core/src/main/java/com/twitter/distributedlog/MaxTxId.java index c3948df..8eabf88 100644 --- a/distributedlog-core/src/main/java/com/twitter/distributedlog/MaxTxId.java +++ b/distributedlog-core/src/main/java/com/twitter/distributedlog/MaxTxId.java @@ -65,7 +65,7 @@ class MaxTxId { return currentMax; } - public Versioned<Long> getVersionedData(long txId) { + public synchronized Versioned<Long> getVersionedData(long txId) { return new Versioned<Long>(Math.max(txId, get()), version); } http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/32a52a9f/distributedlog-core/src/main/java/com/twitter/distributedlog/lock/ZKDistributedLock.java ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/java/com/twitter/distributedlog/lock/ZKDistributedLock.java b/distributedlog-core/src/main/java/com/twitter/distributedlog/lock/ZKDistributedLock.java index 7e9f35b..4d0de7f 100644 --- a/distributedlog-core/src/main/java/com/twitter/distributedlog/lock/ZKDistributedLock.java +++ b/distributedlog-core/src/main/java/com/twitter/distributedlog/lock/ZKDistributedLock.java @@ -336,12 +336,12 @@ public class ZKDistributedLock implements LockListener, DistributedLock { } @VisibleForTesting - Future<ZKDistributedLock> getLockReacquireFuture() { + synchronized Future<ZKDistributedLock> getLockReacquireFuture() { return lockReacquireFuture; } @VisibleForTesting - Future<ZKDistributedLock> getLockAcquireFuture() { + synchronized Future<ZKDistributedLock> getLockAcquireFuture() { return lockAcquireFuture; }
