Skip to content

Fix Integration test and lint errors #1442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025
Merged

Fix Integration test and lint errors #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...kotlin/org/opensearch/indexmanagement/indexstatemanagement/validation/ValidateRollover.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ class ValidateRollover(
if (skipRollover(indexName) || alreadyRolledOver(rolloverTarget, indexName)) return this

if (!isDataStream) {
if (!hasAlias(rolloverTarget, indexName) || !isWriteIndex(rolloverTarget, indexName)
) {
if (!hasAlias(rolloverTarget, indexName) || !isWriteIndex(rolloverTarget, indexName)) {
return this
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/org/opensearch/indexmanagement/transform/util/TransformLockManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ class TransformLockManager(
*/
suspend fun renewLockForLongSearch(timeSpentOnSearch: Long) {
// If the request was longer than 10 minutes and lock expires in less than 20 minutes, renew the lock just in case
if (timeSpentOnSearch > TIMEOUT_UPPER_BOUND_IN_SECONDS && lockExpirationInSeconds() ?: 0 < MAXIMUM_LOCK_EXPIRATION_IN_SECONDS
) {
if (timeSpentOnSearch > TIMEOUT_UPPER_BOUND_IN_SECONDS && lockExpirationInSeconds() ?: 0 < MAXIMUM_LOCK_EXPIRATION_IN_SECONDS) {
this.renewLockForScheduledJob()
}
}
Expand Down
10 changes: 6 additions & 4 deletions src/test/kotlin/org/opensearch/indexmanagement/rollup/interceptor/RollupInterceptorIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,13 @@ class RollupInterceptorIT : RollupRestTestCase() {
client().makeRequest("POST", "/target_rollup_search/_search", emptyMap(), StringEntity(req, ContentType.APPLICATION_JSON))
fail("Expected 400 Method BAD_REQUEST response")
} catch (e: ResponseException) {
assertEquals(
val errorMessage = (e.response.asMap() as Map<String, Map<String, Map<String, String>>>)["error"]!!["caused_by"]!!["reason"]!!
assertTrue(
"Wrong error message",
"Could not find a rollup job that can answer this query because [missing field RateCodeID, missing field timestamp, " +
"missing sum aggregation on total_amount]",
(e.response.asMap() as Map<String, Map<String, Map<String, String>>>)["error"]!!["caused_by"]!!["reason"],
errorMessage.startsWith("Could not find a rollup job that can answer this query because") == true &&
errorMessage.contains("missing field RateCodeID") == true &&
errorMessage.contains("missing field timestamp") == true &&
errorMessage.contains("missing sum aggregation on total_amount") == true,
)
assertEquals("Unexpected status", RestStatus.BAD_REQUEST, e.response.restStatus())
}
Expand Down
Loading