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

[Backport 2.x] fix monitor renew lock issue #1627

Merged
merged 1 commit into from
Jul 31, 2024

Conversation

sbcd90
Copy link
Collaborator

@sbcd90 sbcd90 commented Jul 31, 2024

Issue #, if available:

Description of changes:
backport of #1623

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.

Signed-off-by: Subhobrata Dey <[email protected]>
@AWSHurneyt AWSHurneyt changed the title fix monitor renew lock issue [Backport 2.x] fix monitor renew lock issue Jul 31, 2024
Copy link
Collaborator

@AWSHurneyt AWSHurneyt left a comment

Choose a reason for hiding this comment

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

Approved assuming CI passes

@sbcd90 sbcd90 merged commit b04f693 into opensearch-project:2.x Jul 31, 2024
18 of 20 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit b04f693)
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 Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit b04f693)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
sbcd90 pushed a commit that referenced this pull request Jul 31, 2024
sbcd90 pushed a commit that referenced this pull request Jul 31, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit b04f693)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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

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

sbcd90 added a commit to sbcd90/alerting that referenced this pull request Jul 31, 2024
sbcd90 pushed a commit that referenced this pull request Jul 31, 2024
AWSHurneyt pushed a commit that referenced this pull request Jul 31, 2024
* fix monitor renew lock issue (#1627)

Signed-off-by: Subhobrata Dey <[email protected]>

* fix ktlint

Signed-off-by: Subhobrata Dey <[email protected]>

* fix compilation issues

Signed-off-by: Subhobrata Dey <[email protected]>

---------

Signed-off-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