Skip to content
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.

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

fix workflow execution for first run #1220

Merged
merged 1 commit into from
Oct 4, 2023

Conversation

sbcd90
Copy link
Collaborator

@sbcd90 sbcd90 commented Oct 3, 2023

Issue #, if available:
opensearch-project/security-analytics#606

Description of changes:

CheckList:

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

}"""

indexDoc(index, "1", testDoc)
Thread.sleep(80000)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: adding 80 second sleeps makes tests flaky and long running we should try simulate 1 second interval jobs

can you change this to create workflow with periodicty of 1 second and sleep for 5 or 10 seconds?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we cannot change it to 1 second because the min frequency allowed is 1 min. we can remove the test always or mark as ignored.

Comment on lines 408 to 406
if (monitor.monitorType == Monitor.MonitorType.DOC_LEVEL_MONITOR) {
docLevelMonitorQueries.indexDocLevelMonitorQueries(
monitor,
monitor.id,
monitorMetadata,
request.refreshPolicy,
indexTimeout
)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed? This happens when the monitor is first created anyways.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed it.

Comment on lines 569 to 581
client.suspendUntil<Client, BulkByScrollResponse> {
DeleteByQueryRequestBuilder(client, DeleteByQueryAction.INSTANCE)
.source(monitor.dataSources.queryIndex)
.filter(QueryBuilders.matchQuery("monitor_id", monitor.id))
.execute(it)
}
docLevelMonitorQueries.indexDocLevelMonitorQueries(
monitor,
monitor.id,
updatedMetadata,
request.refreshPolicy,
indexTimeout
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to reindex the monitor queries?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed it.

@@ -3151,7 +3151,7 @@ class MonitorDataSourcesIT : AlertingSingleNodeTestCase() {
} catch (ex: java.lang.Exception) {
exception = ex
}
assertTrue(exception is java.util.NoSuchElementException)
assertFalse(exception is java.util.NoSuchElementException)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dont we want to move this into the catch and keep it as assertTrue?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed it.

@sbcd90 sbcd90 merged commit f5fc62c into opensearch-project:main Oct 4, 2023
13 of 15 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1220-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f5fc62c79fd179efa1c424d94005cbdba9dea509
# Push it to GitHub
git push --set-upstream origin backport-1220-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1220-to-2.x.

@sbcd90 sbcd90 mentioned this pull request Oct 4, 2023
1 task
amsiglan pushed a commit to amsiglan/alerting that referenced this pull request Dec 6, 2023
lezzago pushed a commit that referenced this pull request Dec 6, 2023
Signed-off-by: Subhobrata Dey <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants