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

delete query index only if put mappings throws an exception #1685

Merged
merged 4 commits into from
Oct 2, 2024

Conversation

sbcd90
Copy link
Collaborator

@sbcd90 sbcd90 commented Oct 2, 2024

Description

delete query index only if put mappings throws an exception
continue from #1674

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

Signed-off-by: Subhobrata Dey <[email protected]>
indexTimeout = indexTimeout
)
} catch (e: Exception) {
log.debug("unknown exception during PUT mapping on queryIndex: $targetQueryIndex")
Copy link
Member

Choose a reason for hiding this comment

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

always log the exception

log.debug("Doc level monitor $monitorId: unknown exception during PUT mapping on queryIndex: $targetQueryIndex", e)

Copy link
Member

Choose a reason for hiding this comment

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

in AlertingException class plz add first line logging error so that if we miss here we wont eat up stacktrace..right now debugging is tough as stacktrace and message is not descriptive due to lack of logging

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

AlertingException class resides in common-utils. logged the exception.

val unwrappedException = ExceptionsHelper.unwrapCause(e) as Exception
throw AlertingException.wrap(unwrappedException)
// retry with deleting query index
if (monitor.deleteQueryIndexInEveryRun == true && docLevelQueryIndexExists(monitor.dataSources)) {
Copy link
Member

Choose a reason for hiding this comment

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

we should check doc level query exsits or not only for deletion not for creation of new index
can we remove index exists check here and add only before trying deleteDocLevelQueryIndex(..)

what if query doesnt exist and exception was index not found

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

changed this.

// retry with deleting query index
if (monitor.deleteQueryIndexInEveryRun == true && docLevelQueryIndexExists(monitor.dataSources)) {
try {
log.info(
Copy link
Member

Choose a reason for hiding this comment

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

split into error log and plz log exception

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

added error log.

Signed-off-by: Subhobrata Dey <[email protected]>
@sbcd90 sbcd90 merged commit 6239d7b into opensearch-project:main Oct 2, 2024
18 of 21 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 2, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit 6239d7b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 2, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit 6239d7b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 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.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.17
# Create a new branch
git switch --create backport-1685-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6239d7b665a98efcee7a1001e12a215d9ed53be4
# Push it to GitHub
git push --set-upstream origin backport-1685-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport-1685-to-2.17.

sbcd90 pushed a commit that referenced this pull request Oct 3, 2024
sbcd90 pushed a commit that referenced this pull request Oct 3, 2024
sbcd90 pushed a commit to sbcd90/alerting that referenced this pull request Oct 16, 2024
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