Try Splunk Tests Again

Author: cgivre

contrib/storage-splunk/src/main/java/org/apache/drill/exec/store/splunk/SplunkBatchReader.java

@@ -142,14 +142,6 @@ public void close() {
       AutoCloseables.closeSilently(searchResults);
       searchResults = null;
     }
-    // Logout from Splunk service to properly cleanup session
-    if (splunkService != null) {
-      try {
-        splunkService.logout();
-      } catch (Exception e) {
-        logger.warn("Error logging out from Splunk service", e);
-      }
-    }
   }
 
   /**

contrib/storage-splunk/src/test/java/org/apache/drill/exec/store/splunk/SplunkTestSuite.java

@@ -89,39 +89,21 @@ public static void initSplunk() throws Exception {
 
         splunk.start();
 
-        // Clean up any existing dispatch files from previous runs
-        logger.info("Cleaning up Splunk dispatch directory...");
-        try {
-          splunk.execInContainer("sudo", "rm", "-rf", "/opt/splunk/var/run/splunk/dispatch/*");
-        } catch (Exception e) {
-          logger.warn("Could not clean dispatch directory (may not exist yet): " + e.getMessage());
-        }
-
-        // Configure Splunk to use minimal disk space for tests
-        logger.info("Configuring Splunk disk usage settings...");
-        splunk.execInContainer("sudo", "chmod", "a+w", "/opt/splunk/etc/system/local/server.conf");
-
-        // Remove any existing [diskUsage] section
-        splunk.execInContainer("sudo", "sed", "-i", "/\\[diskUsage\\]/,/^$/d", "/opt/splunk/etc/system/local/server.conf");
-
-        // Add new [diskUsage] section with minimal requirements
-        splunk.execInContainer("sudo", "sh", "-c",
+        // Disable disk usage monitoring in Splunk to prevent "minimum free disk space" errors in CI
+        logger.info("Configuring Splunk to disable disk usage monitoring...");
+        splunk.execInContainer("sh", "-c",
             "echo '' >> /opt/splunk/etc/system/local/server.conf && " +
-            "echo '# disk usage processor settings for testing' >> /opt/splunk/etc/system/local/server.conf && " +
             "echo '[diskUsage]' >> /opt/splunk/etc/system/local/server.conf && " +
             "echo 'minFreeSpace = 50' >> /opt/splunk/etc/system/local/server.conf && " +
-            "echo 'pollingFrequency = 100000' >> /opt/splunk/etc/system/local/server.conf && " +
-            "echo 'pollingTimerFrequency = 10' >> /opt/splunk/etc/system/local/server.conf");
-
-        splunk.execInContainer("sudo", "chmod", "600", "/opt/splunk/etc/system/local/server.conf");
+            "echo 'disabled = false' >> /opt/splunk/etc/system/local/server.conf");
 
-        // Restart Splunk to apply changes
-        logger.info("Restarting Splunk to apply disk usage settings...");
-        splunk.execInContainer("sudo", "/opt/splunk/bin/splunk", "restart");
+        // Restart Splunk to apply configuration
+        logger.info("Restarting Splunk with updated configuration...");
+        splunk.execInContainer("/opt/splunk/bin/splunk", "restart", "--accept-license", "--answer-yes", "--no-prompt");
 
-        // Wait for Splunk to fully restart
-        Thread.sleep(15000);
-        logger.info("Splunk restarted with minimal disk usage requirements");
+        // Wait for Splunk to fully restart and be ready
+        logger.info("Waiting for Splunk to be ready...");
+        Thread.sleep(45000);
 
         String hostname = splunk.getHost();
         Integer port = splunk.getFirstMappedPort();