Merge branch 'cassandra-4.0' into cassandra-4.1

* cassandra-4.0: ninja-fix FullQueryLoggerTest, requires allow_nodetool_archive_command false to begin with CASSANDRA-18550
apache · May 26, 2023 · 22d74c7 · 22d74c7
2 parents cbe8b39 + 4555b94
commit 22d74c7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java b/test/unit/org/apache/cassandra/fql/FullQueryLoggerTest.java
@@ -680,6 +680,7 @@ public void testJMXArchiveCommand()
 
         try
         {
+            DatabaseDescriptor.getFullQueryLogOptions().allow_nodetool_archive_command = false;
             StorageService.instance.enableFullQueryLogger(options.log_dir, options.roll_cycle, false, 1000, 1000, "/xyz/not/null", 0);
             fail("not allowed");
         }
@@ -688,6 +689,7 @@ public void testJMXArchiveCommand()
             assertTrue(e.getMessage().contains("Can't enable full query log archiving via nodetool"));
         }
 
+        options.allow_nodetool_archive_command = true;
         options.archive_command = "/xyz/not/null";
         options.log_dir = "/tmp/abc";
         DatabaseDescriptor.setFullQueryLogOptions(options);