Optimize scheduler interval conf (#3049) (#3082)

opensearch-project · Oct 22, 2024 · 0d2a4aa · 0d2a4aa
1 parent 9d51e8b
commit 0d2a4aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...ain/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposer.java b/...ain/java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposer.java
@@ -9,6 +9,7 @@
 import static org.opensearch.sql.spark.data.constants.SparkConstants.FLINT_JOB_EXTERNAL_SCHEDULER_INTERVAL;
 
 import lombok.RequiredArgsConstructor;
+import org.opensearch.core.common.Strings;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext;
 import org.opensearch.sql.spark.dispatcher.model.DispatchQueryRequest;
@@ -30,7 +31,11 @@ public void compose(
         settings.getSettingValue(Settings.Key.ASYNC_QUERY_EXTERNAL_SCHEDULER_INTERVAL);
     sparkSubmitParameters.setConfigItem(
         FLINT_JOB_EXTERNAL_SCHEDULER_ENABLED, String.valueOf(externalSchedulerEnabled));
-    sparkSubmitParameters.setConfigItem(
-        FLINT_JOB_EXTERNAL_SCHEDULER_INTERVAL, externalSchedulerInterval);
+    if (!Strings.isNullOrEmpty(externalSchedulerInterval)) {
+      externalSchedulerInterval =
+          "\"" + externalSchedulerInterval + "\""; // Wrap the value with double quotes
+      sparkSubmitParameters.setConfigItem(
+          FLINT_JOB_EXTERNAL_SCHEDULER_INTERVAL, externalSchedulerInterval);
+    }
   }
 }
diff --git a/...java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposerTest.java b/...java/org/opensearch/sql/spark/config/OpenSearchAsyncQuerySchedulerConfigComposerTest.java
@@ -1,5 +1,6 @@
 package org.opensearch.sql.spark.config;
 
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -40,7 +41,7 @@ public void testCompose() {
     verify(sparkSubmitParameters)
         .setConfigItem("spark.flint.job.externalScheduler.enabled", "true");
     verify(sparkSubmitParameters)
-        .setConfigItem("spark.flint.job.externalScheduler.interval", "10 minutes");
+        .setConfigItem("spark.flint.job.externalScheduler.interval", "\"10 minutes\"");
   }
 
   @Test
@@ -63,6 +64,6 @@ public void testComposeWithMissingInterval() {
 
     composer.compose(sparkSubmitParameters, dispatchQueryRequest, context);
 
-    verify(sparkSubmitParameters).setConfigItem("spark.flint.job.externalScheduler.interval", "");
+    assertNull(sparkSubmitParameters.getConfigItem("spark.flint.job.externalScheduler.interval"));
   }
 }