This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
     new 64b8d6b9ad Allow hint delivery during schema mismatch
64b8d6b9ad is described below

commit 64b8d6b9add607b80752cd1a8fbce51839af9ec4
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Tue Jan 7 13:50:39 2025 -0600

    Allow hint delivery during schema mismatch
    
    Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-20188
---
 CHANGES.txt                                                   |  1 +
 src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7eb0068d79..1ef6a902e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0.16
+ * Allow hint delivery during schema mismatch (CASSANDRA-20188)
  * Fix gossip issue with gossip-only and bootstrapping nodes missing 
DC/Rack/Host ID endpoint state (CASSANDRA-19983)
  * IndexOutOfBoundsException when accessing partition where the column was 
deleted (CASSANDRA-20108)
 
diff --git a/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java 
b/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java
index ca38c0c319..fbaeaebcb8 100644
--- a/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java
+++ b/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java
@@ -19,20 +19,13 @@ package org.apache.cassandra.hints;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.cassandra.gms.ApplicationState;
-import org.apache.cassandra.gms.Gossiper;
-import org.apache.cassandra.schema.Schema;
-
-import static 
org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort;
-
 /**
  * A simple dispatch trigger that's being run every 10 seconds.
  *
  * Goes through all hint stores and schedules for dispatch all the hints for 
hosts that are:
  * 1. Not currently scheduled for dispatch, and
  * 2. Either have some hint files, or an active hint writer, and
- * 3. Are live, and
- * 4. Have matching schema versions
+ * 3. Are live
  *
  * What does triggering a hints store for dispatch mean?
  * - If there are existing hint files, it means submitting them for dispatch;
@@ -65,7 +58,6 @@ final class HintsDispatchTrigger implements Runnable
                .filter(store -> !isScheduled(store))
                .filter(HintsStore::isLive)
                .filter(store -> store.isWriting() || store.hasFiles())
-               .filter(store -> 
Schema.instance.isSameVersion(Gossiper.instance.getSchemaVersion(store.address())))
                .forEach(this::schedule);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to