From 317e2e76a42d45c606362069a98956a1da6c8264 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 6 Oct 2022 19:12:24 +0300 Subject: [PATCH 1/3] WIP --- .../internal/processors/cache/transactions/IgniteTxHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index 77bf58fa8696b..f44fdf78b408a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -2330,6 +2330,8 @@ public void applyPartitionsUpdatesCounters( topVer, rollbackOnPrimary); } } + else + assert updated; } else invalid = true; From 5b7ef4a95e2c7477d09eba034c0802576f9dec5c Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Thu, 6 Oct 2022 19:20:16 +0300 Subject: [PATCH 2/3] WIP --- .../processors/cache/transactions/IgniteTxHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index f44fdf78b408a..54f2ee75a0d0e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -2314,6 +2314,8 @@ public void applyPartitionsUpdatesCounters( boolean updated = part.updateCounter(start, delta); + assert updated || rollback; + // Need to log rolled back range for logical recovery. if (updated && rollback) { CacheGroupContext grpCtx = part.group(); @@ -2330,8 +2332,6 @@ public void applyPartitionsUpdatesCounters( topVer, rollbackOnPrimary); } } - else - assert updated; } else invalid = true; From 10274dd247200222d7e0aa6b2a78d0539eba90f0 Mon Sep 17 00:00:00 2001 From: Anton Vinogradov Date: Fri, 7 Oct 2022 15:00:49 +0300 Subject: [PATCH 3/3] WIP --- .../processors/cache/transactions/IgniteTxHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index 54f2ee75a0d0e..4d0d9bd9696d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -2314,12 +2314,15 @@ public void applyPartitionsUpdatesCounters( boolean updated = part.updateCounter(start, delta); - assert updated || rollback; + CacheGroupContext grpCtx = part.group(); + + assert updated || + rollback || + !grpCtx.persistenceEnabled() || + grpCtx.hasAtomicCaches(); // Need to log rolled back range for logical recovery. if (updated && rollback) { - CacheGroupContext grpCtx = part.group(); - if (grpCtx.persistenceEnabled() && grpCtx.walEnabled() && !grpCtx.mvccEnabled()) { RollbackRecord rec = new RollbackRecord(grpCtx.groupId(), part.id(), start, delta);