alerting icon indicating copy to clipboard operation
alerting copied to clipboard

fix monitor renew lock issue

Open sbcd90 opened this issue 1 year ago • 1 comments

Issue #, if available:

If a particular monitor run fails to release the lock, the lock can never be renewed and every monitor run is skipped. Description of changes:

If a particular monitor run fails to release the lock, the lock can be renewed and acquired after a fixed timeout of 5 mins..

CheckList:

  • [X] 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.

sbcd90 avatar Jul 26 '24 19:07 sbcd90

hi @eirsep , plz review.

sbcd90 avatar Jul 26 '24 19:07 sbcd90

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-1623-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 25eec30dbf0b327b8d7e9b684e7e14c6dec74ca4
# Push it to GitHub
git push --set-upstream origin backport-1623-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-1623-to-2.x.

The backport to 2.15 failed:

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

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

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

The backport to 2.16 failed:

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

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

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

@sbcd90 plz backport to 2.15, 2.13,2.11, 2.16

eirsep avatar Jul 31 '24 09:07 eirsep