Added minimum timeout for transforms search of 10 minutes (opensearch…

…-project#1033) (opensearch-project#1057) * Added minimum timeout for transforms search of 10 minutes * Extracted cancel minimum code to function * Fixed transform code to use cluster setting * Removed log statements * Changed timeout logic * Switched to basing off seconds * [Feature] Support Transform as an ISM action (opensearch-project#760) * Initial impl * fix style * end to end functional * ISM transform unit tests & integ tests * Fix after core #8157 (opensearch-project#857) * Upgrade the backport workflow (opensearch-project#862) * Added 2.9 release notes. (opensearch-project#851) * Added 2.9 release notes. * Added 2.9 release notes. * Added 2.9 release notes. --------- * Handle NPE in isRollupIndex (opensearch-project#855) * Handle NPE in isRollupIndex `metadata.index()` can return `null`, so handle that case by returning `false`. * unit test --------- * Fix core XcontentType refactor (opensearch-project#873) * fix for max & min aggregations when no metric property exist (opensearch-project#870) * core refactor change (opensearch-project#884) * update backport branch name (opensearch-project#885) * core refactor change (opensearch-project#887) * Fix breaking change by core refactor (opensearch-project#888) * fix core breaking (opensearch-project#906) * Support copy alias in rollover (opensearch-project#907) * Support copy alias in rollover * 2.10 --------- * Set preference to _primary when searching control-center index (opensearch-project#911) * Set preference to _primary when searching control-center index * Use _primary_first instead --------- * Add primary first preference to all search requests (opensearch-project#912) * fix intelliJ IDEA gradle sync error (opensearch-project#916) * make control center index as system index (opensearch-project#919) * Updates demo certs used in integ tests (opensearch-project#921) * Added 2.10 release notes (opensearch-project#925) * Bump bwc version (opensearch-project#930) * fix integ tests; upgrade mappings versions * Fix DCO * Addressed pr comments; Add integ test case for re-execute the same transform action * Addressed detekt error * Added ISMTransform writeable test * Addressed comments; Moved updateTransformStartTime to IndexManagementRestTestCase --------- * [Test] increase the wait time after transform job triggered (opensearch-project#999) * Drafted 2.11 release notes. (opensearch-project#1004) * Drafted 2.11 release notes. * Drafted 2.11 release notes. --------- * Refactor change policy API and the policy in managed index to be non-null (opensearch-project#967) * Refactor the policy to be non null in managed index config * Update * fix bug --------- * Add more error notification at fail points (opensearch-project#1000) * Add more error notification at fail points * Handle exception gracefully * small fix --------- * fix the race condition in test reset action start time (opensearch-project#1007) * Bump bwc version after 2.11 release (opensearch-project#1015) * added type check for pipeline aggregator types in Transform initialization (opensearch-project#1014) * Improve security plugin enabling check (opensearch-project#1017) * Onboard jenkins prod docker images to github actions (opensearch-project#1025) * Onboard jenkins prod docker images to github actions * Add more * Add more --------- * Support switch aliases in shrink action. (opensearch-project#987) * Transform pipeline aggr test (opensearch-project#1027) * tester code: pipeline aggr. transform job * made test case for pipeline aggregator in transform job * removed unnec. test lines * re-added method call on Transform obj --------- * Added unit test for switchAliases method. (opensearch-project#1035) * Added unit test for switchAliases method. * Added unit test for switchAliases method checking the flow when switchAliases is disabled. --------- * Interval schedule should take start time from the request, should not set it to the current time of request execution. (opensearch-project#1036) * Added minimum for search.cancel_after_time_interval setting for rollups (opensearch-project#1026) * Added minimum for search.cancel_after_time_interval setting for rollups * Added constant for cancel_after_time_interval for rollup search * Handled case of default value for cancel interval * Added comment explanation for default rollup cancel after time interval * Fixed github workflow checks --------- * Update 2.11.1 release note (opensearch-project#1042) * Interval schedule should take start time from the request, should not… (opensearch-project#1040) * Interval schedule should take start time from the request, should not set it to the current time of request execution. * Changed the "delayed continuous execution test" to be more expressive about what it should test. * fixed the NPE if schedule.startTime is NULL * fixed the NPE if schedule.startTime is NULL * fixed styling * - removed null checks from RollUp and Transforms - fixed comments in the "delayed execution" test --------- * Removed unused imports --------- (cherry picked from commit 60a8513) Signed-off-by: Joshua Au <[email protected]> Signed-off-by: Tanqiu Liu <[email protected]> Signed-off-by: bowenlan-amzn <[email protected]> Signed-off-by: Ashish Agrawal <[email protected]> Signed-off-by: AWSHurneyt <[email protected]> Signed-off-by: Bryce Lampe <[email protected]> Signed-off-by: Hailong Cui <[email protected]> Signed-off-by: Subhobrata Dey <[email protected]> Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: n-dohrmann <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Oleg Kravchuk <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Tanqiu Liu <[email protected]> Co-authored-by: bowenlan-amzn <[email protected]> Co-authored-by: Ashish Agrawal <[email protected]> Co-authored-by: AWSHurneyt <[email protected]> Co-authored-by: Bryce Lampe <[email protected]> Co-authored-by: Hailong Cui <[email protected]> Co-authored-by: Subhobrata Dey <[email protected]> Co-authored-by: gaobinlong <[email protected]> Co-authored-by: Darshit Chanpura <[email protected]> Co-authored-by: n-dohrmann <[email protected]> Co-authored-by: Joanne Wang <[email protected]> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: Oleg Kravchuk <[email protected]> Co-authored-by: ikibo <[email protected]>
reta · Dec 12, 2023 · e5997e8 · e5997e8
1 parent 55e689a
commit e5997e8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/TransformSearchService.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/TransformSearchService.kt
@@ -16,6 +16,7 @@ import org.opensearch.action.bulk.BackoffPolicy
 import org.opensearch.action.index.IndexRequest
 import org.opensearch.action.search.SearchRequest
 import org.opensearch.action.search.SearchResponse
+import org.opensearch.action.search.TransportSearchAction.SEARCH_CANCEL_AFTER_TIME_INTERVAL_SETTING
 import org.opensearch.client.Client
 import org.opensearch.cluster.metadata.IndexMetadata
 import org.opensearch.cluster.service.ClusterService
@@ -47,6 +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_SECONDS
 import org.opensearch.search.aggregations.Aggregation
 import org.opensearch.search.aggregations.bucket.composite.CompositeAggregation
 import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder
@@ -78,11 +80,17 @@ class TransformSearchService(
     @Volatile private var backoffPolicy =
         BackoffPolicy.constantBackoff(TRANSFORM_JOB_SEARCH_BACKOFF_MILLIS.get(settings), TRANSFORM_JOB_SEARCH_BACKOFF_COUNT.get(settings))
 
+    @Volatile private var cancelAfterTimeInterval = SEARCH_CANCEL_AFTER_TIME_INTERVAL_SETTING.get(settings)
+
     init {
         clusterService.clusterSettings.addSettingsUpdateConsumer(TRANSFORM_JOB_SEARCH_BACKOFF_MILLIS, TRANSFORM_JOB_SEARCH_BACKOFF_COUNT) {
                 millis, count ->
             backoffPolicy = BackoffPolicy.constantBackoff(millis, count)
         }
+
+        clusterService.clusterSettings.addSettingsUpdateConsumer(SEARCH_CANCEL_AFTER_TIME_INTERVAL_SETTING) {
+            cancelAfterTimeInterval = it
+        }
     }
 
     @Suppress("RethrowCaughtException")
@@ -187,7 +195,11 @@ class TransformSearchService(
             val searchStart = Instant.now().epochSecond
             val searchResponse = backoffPolicy.retryTransformSearch(logger, transformContext.transformLockManager) {
                 val pageSizeDecay = 2f.pow(retryAttempt++)
-                val searchRequestTimeoutInSeconds = transformContext.getMaxRequestTimeoutInSeconds()
+
+                var searchRequestTimeoutInSeconds = transformContext.getMaxRequestTimeoutInSeconds()
+                if (searchRequestTimeoutInSeconds == null) {
+                    searchRequestTimeoutInSeconds = getCancelAfterTimeIntervalSeconds(cancelAfterTimeInterval.seconds)
+                }
 
                 client.suspendUntil { listener: ActionListener<SearchResponse> ->
                     // If the previous request of the current transform job execution was successful, take the page size of previous request.
@@ -224,6 +236,16 @@ class TransformSearchService(
         }
     }
 
+    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 (givenIntervalSeconds == -1L) {
+            return -1
+        }
+
+        return max(givenIntervalSeconds, MINIMUM_CANCEL_AFTER_TIME_INTERVAL_SECONDS)
+    }
+
     companion object {
         const val failedSearchErrorMessage = "Failed to search data in source indices"
         const val modifiedBucketsErrorMessage = "Failed to get the modified buckets in source indices"

diff --git a/src/main/kotlin/org/opensearch/indexmanagement/transform/settings/TransformSettings.kt b/src/main/kotlin/org/opensearch/indexmanagement/transform/settings/TransformSettings.kt
@@ -14,6 +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_SECONDS = 600L
 
         val TRANSFORM_JOB_SEARCH_BACKOFF_COUNT: Setting<Int> = Setting.intSetting(
             "plugins.transform.internal.search.backoff_count",