IGNITE-8114 Additional fix for Add fail recovery mechanism to trackin…

…g pages
apache · Apr 9, 2018 · 961fc35 · 961fc35
1 parent abfa0f5
commit 961fc35
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/.../java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIO.java b/.../java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIO.java
@@ -86,9 +86,11 @@ protected TrackingPageIO(int ver) {
      * @param pageId Page id.
      * @param nextSnapshotTag Tag of next snapshot.
      * @param pageSize Page size.
+     *
+     * @return <code>-1</code> if everything is ok, otherwise last saved tag.
      */
-    public void markChanged(ByteBuffer buf, long pageId, long nextSnapshotTag, long lastSuccessfulSnapshotTag, int pageSize) {
-        validateSnapshotTag(buf, nextSnapshotTag, lastSuccessfulSnapshotTag, pageSize);
+    public long markChanged(ByteBuffer buf, long pageId, long nextSnapshotTag, long lastSuccessfulSnapshotTag, int pageSize) {
+        long tag = validateSnapshotTag(buf, nextSnapshotTag, lastSuccessfulSnapshotTag, pageSize);
 
         int cntOfPage = countOfPageToTrack(pageSize);
 
@@ -105,7 +107,7 @@ public void markChanged(ByteBuffer buf, long pageId, long nextSnapshotTag, long
         byte newVal =  (byte) (byteToUpdate | updateTemplate);
 
         if (byteToUpdate == newVal)
-            return;
+            return tag;
 
         buf.put(idx, newVal);
 
@@ -114,6 +116,8 @@ public void markChanged(ByteBuffer buf, long pageId, long nextSnapshotTag, long
         buf.putShort(sizeOff, newSize);
 
         assert newSize == countOfChangedPage(buf, nextSnapshotTag, pageSize);
+
+        return tag;
     }
 
     /**