From d60bf2fb8b595ee43a9482eae5ffcfc4e4b7b3e4 Mon Sep 17 00:00:00 2001 From: Joshua Au Date: Fri, 8 Dec 2023 19:02:24 -0500 Subject: [PATCH] Switched to basing off seconds Signed-off-by: Joshua Au --- .../transform/TransformSearchService.kt | 11 +++++------ .../transform/settings/TransformSettings.kt | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/TransformSearchService.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/TransformSearchService.kt index 5981bf445..bd791978a 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/TransformSearchService.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/TransformSearchService.kt @@ -48,7 +48,7 @@ import org.opensearch.indexmanagement.util.IndexUtils.Companion.LUCENE_MAX_CLAUS import org.opensearch.indexmanagement.util.IndexUtils.Companion.ODFE_MAGIC_NULL import org.opensearch.indexmanagement.util.IndexUtils.Companion.hashToFixedSize import org.opensearch.core.rest.RestStatus -import org.opensearch.indexmanagement.transform.settings.TransformSettings.Companion.MINIMUM_CANCEL_AFTER_TIME_INTERVAL_MINUTES +import org.opensearch.indexmanagement.transform.settings.TransformSettings.Companion.MINIMUM_CANCEL_AFTER_TIME_INTERVAL_SECONDS import org.opensearch.search.aggregations.Aggregation import org.opensearch.search.aggregations.bucket.composite.CompositeAggregation import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder @@ -201,8 +201,7 @@ class TransformSearchService( var searchRequestTimeoutInSeconds = transformContext.getMaxRequestTimeoutInSeconds() if (searchRequestTimeoutInSeconds == null) { - val timeIntervalMinutes = TimeValue.timeValueMinutes(getCancelAfterTimeInterval(cancelAfterTimeInterval.minutes)) - searchRequestTimeoutInSeconds = timeIntervalMinutes.seconds + searchRequestTimeoutInSeconds = getCancelAfterTimeIntervalSeconds(cancelAfterTimeInterval.seconds) } client.suspendUntil { listener: ActionListener -> @@ -240,14 +239,14 @@ class TransformSearchService( } } - private fun getCancelAfterTimeInterval(givenIntervalMinutes: Long): Long { + private fun getCancelAfterTimeIntervalSeconds(givenIntervalSeconds: Long): Long { // The default value for the cancelAfterTimeInterval is -1 and so, in this case // we should ignore processing on the value - if (givenIntervalMinutes == -1L) { + if (givenIntervalSeconds == -1L) { return -1 } - return max(givenIntervalMinutes, MINIMUM_CANCEL_AFTER_TIME_INTERVAL_MINUTES) + return max(givenIntervalSeconds, MINIMUM_CANCEL_AFTER_TIME_INTERVAL_SECONDS) } companion object { diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/settings/TransformSettings.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/settings/TransformSettings.kt index 21ebd5927..abfdc1b1f 100644 --- a/src/main/kotlin/org/opensearch/indexmanagement/transform/settings/TransformSettings.kt +++ b/src/main/kotlin/org/opensearch/indexmanagement/transform/settings/TransformSettings.kt @@ -14,7 +14,7 @@ class TransformSettings { companion object { const val DEFAULT_RENEW_LOCK_RETRY_COUNT = 3 const val DEFAULT_RENEW_LOCK_RETRY_DELAY = 1000L - const val MINIMUM_CANCEL_AFTER_TIME_INTERVAL_MINUTES = 10L + const val MINIMUM_CANCEL_AFTER_TIME_INTERVAL_SECONDS = 600L val TRANSFORM_JOB_SEARCH_BACKOFF_COUNT: Setting = Setting.intSetting( "plugins.transform.internal.search.backoff_count",