STAR-1065: add commit log position to truncation notification (apache…

…#322) (cherry picked from commit 5f2c6ef)
jacek-lewandowski · Mar 7, 2022 · 20b1bd8 · 20b1bd8
1 parent c6e4fa2
commit 20b1bd8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2486,7 +2486,7 @@ public void run()
                 // stream in data that is actually supposed to have been deleted
                 ActiveRepairService.instance.abort((prs) -> prs.getTableIds().contains(metadata.id),
                                                    "Stopping parent sessions {} due to truncation of tableId="+metadata.id);
-                data.notifyTruncated(truncatedAt);
+                data.notifyTruncated(replayAfter, truncatedAt);
 
             if (!noSnapshot && DatabaseDescriptor.isAutoSnapshot())
                 snapshot(Keyspace.getTimestampedSnapshotNameWithPrefix(name, SNAPSHOT_TRUNCATE_PREFIX));

diff --git a/src/java/org/apache/cassandra/db/lifecycle/Tracker.java b/src/java/org/apache/cassandra/db/lifecycle/Tracker.java
@@ -520,9 +520,9 @@ public void notifyDeleting(SSTableReader deleting)
             subscriber.handleNotification(notification, this);
     }
 
-    public void notifyTruncated(long truncatedAt)
+    public void notifyTruncated(CommitLogPosition replayAfter, long truncatedAt)
     {
-        INotification notification = new TruncationNotification(truncatedAt);
+        INotification notification = new TruncationNotification(replayAfter, truncatedAt);
         for (INotificationConsumer subscriber : subscribers)
             subscriber.handleNotification(notification, this);
     }

diff --git a/src/java/org/apache/cassandra/notifications/TruncationNotification.java b/src/java/org/apache/cassandra/notifications/TruncationNotification.java
@@ -17,16 +17,20 @@
  */
 package org.apache.cassandra.notifications;
 
+import org.apache.cassandra.db.commitlog.CommitLogPosition;
+
 /**
  * Fired during truncate, after the memtable has been flushed but before any
  * snapshot is taken and SSTables are discarded
  */
 public class TruncationNotification implements INotification
 {
+    public final CommitLogPosition replayAfter;
     public final long truncatedAt;
 
-    public TruncationNotification(long truncatedAt)
+    public TruncationNotification(CommitLogPosition replayAfter, long truncatedAt)
     {
+        this.replayAfter = replayAfter;
         this.truncatedAt = truncatedAt;
     }
 }