Test fixes

datastax · Oct 10, 2024 · 1da1be1 · 1da1be1 · cassci-bot · Oct 10, 2024
1 parent 3d9b815
commit 1da1be1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -1042,10 +1042,11 @@ private void debugLogCompactionSummaryInfo(UUID taskId,
         StringBuilder newSSTableNames = new StringBuilder(newSStables.size() * 100);
         for (SSTableReader reader : newSStables)
             newSSTableNames.append(reader.descriptor.baseFileUri()).append(",");
-        logger.debug("Compacted ({}) {} sstables to [{}] to level={}. {} to {} (~{}% of original) in {}ms. " +
+        logger.debug("Compacted ({}{}) {} sstables to [{}] to level={}. {} to {} (~{}% of original) in {}ms. " +
                      "Read Throughput = {}, Write Throughput = {}, Row Throughput = ~{}/s, Partition Throughput = ~{}/s." +
                      " {} total partitions merged to {}. Partition merge counts were {}.",
                      taskId,
+                     tokenRange() != null ? " range " + tokenRange() : "",
                      transaction.originals().size(),
                      newSSTableNames.toString(),
                      getLevel(),
@@ -1066,7 +1067,10 @@ private void debugLogCompactingMessage(UUID taskId)
     {
         Set<SSTableReader> originals = transaction.originals();
         StringBuilder ssTableLoggerMsg = new StringBuilder(originals.size() * 100);
-        ssTableLoggerMsg.append("Compacting (").append(taskId).append(')').append(" [");
+        ssTableLoggerMsg.append("Compacting (").append(taskId);
+        if (tokenRange() != null)
+            ssTableLoggerMsg.append(" range ").append(tokenRange());
+        ssTableLoggerMsg.append(") [");
         for (SSTableReader sstr : originals)
         {
             ssTableLoggerMsg.append(sstr.getFilename())

diff --git a/src/java/org/apache/cassandra/db/lifecycle/PartialLifecycleTransaction.java b/src/java/org/apache/cassandra/db/lifecycle/PartialLifecycleTransaction.java
@@ -55,7 +55,10 @@ private RuntimeException earlyOpenUnsupported()
 
     public void update(SSTableReader reader, boolean original)
     {
-        earlyOpenUnsupported();
+        if (original)
+            throw earlyOpenUnsupported();
+
+        mainTransaction.update(reader, original);
     }
 
     public void update(Collection<SSTableReader> readers, boolean original)