You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/01/17 12:23:06 UTC

[08/43] ignite git commit: ignite-7412 Fixed race in WAL manager with mmap enabled

ignite-7412 Fixed race in WAL manager with mmap enabled


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

Branch: refs/heads/ignite-7274
Commit: db69d90d63f28bed1918518435a6d7cac86a5b97
Parents: 8b5d12b
Author: Andrey Gura <ag...@apache.org>
Authored: Mon Jan 15 13:38:36 2018 +0300
Committer: Andrey Gura <ag...@apache.org>
Committed: Tue Jan 16 15:40:03 2018 +0300

----------------------------------------------------------------------
 .../wal/FileWriteAheadLogManager.java           | 31 ++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/db69d90d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
index b39ee40..8c27af0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
@@ -46,6 +46,7 @@ import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
@@ -206,6 +207,10 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
     /** Use mapped byte buffer. */
     private static boolean mmap = IgniteSystemProperties.getBoolean(IGNITE_WAL_MMAP, true);
 
+    /** {@link FileWriteHandle#written} atomic field updater. */
+    private static final AtomicLongFieldUpdater<FileWriteHandle> WRITTEN_UPD =
+        AtomicLongFieldUpdater.newUpdater(FileWriteHandle.class, "written");
+
     /** Interrupted flag. */
     private final ThreadLocal<Boolean> interrupted = new ThreadLocal<Boolean>() {
         @Override protected Boolean initialValue() {
@@ -2214,7 +2219,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
          * Position in current file after the end of last written record (incremented after file channel write
          * operation)
          */
-        private volatile long written;
+        volatile long written;
 
         /** */
         private volatile long lastFsyncPos;
@@ -2324,8 +2329,20 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
 
                         fillBuffer(buf, rec);
 
-                        if (mmap)
-                            written = seg.position();
+                        if (mmap) {
+                            // written field must grow only, but segment with greater position can be serialized
+                            // earlier than segment with smaller position.
+                            while (true) {
+                                long written0 = written;
+
+                                if (seg.position() > written0) {
+                                    if (WRITTEN_UPD.compareAndSet(this, written0, seg.position()))
+                                        break;
+                                }
+                                else
+                                    break;
+                            }
+                        }
 
                         return ptr;
                     }
@@ -2441,8 +2458,12 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
                 if (this.stop.get())
                     return;
 
-                if (lastFsyncPos != written) {
-                    assert lastFsyncPos < written; // Fsync position must be behind.
+                long lastFsyncPos0 = lastFsyncPos;
+                long written0 = written;
+
+                if (lastFsyncPos0 != written0) {
+                    // Fsync position must be behind.
+                    assert lastFsyncPos0 < written0 : "lastFsyncPos=" + lastFsyncPos0 + ", written=" + written0;
 
                     boolean metricsEnabled = metrics.metricsEnabled();