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.

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

Jump to bottom

[Backport 2.x] fix for concurrentmodificationexception with linkedhashmap #1259

Merged
merged 2 commits into from
Oct 12, 2023
Merged

[Backport 2.x] fix for concurrentmodificationexception with linkedhashmap #1259

merged 2 commits into from
Oct 12, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 36d81e4 from #1255.

@github-actions
fix for concurrentmodificationexception with linkedhashmap (#1255)
c503504 
Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit 36d81e4)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@sbcd90 sbcd90 merged commit 579e248 into 2.x Oct 12, 2023
28 of 32 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

@opensearch-trigger-bot
Copy link
Contributor Author

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

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

@opensearch-trigger-bot
Copy link
Contributor Author

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

@sbcd90 sbcd90 removed the autocut label Oct 12, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 12, 2023
@github-actions
[Backport 2.x] fix for concurrentmodificationexception with linkedhas…
900876f 
…hmap (#1259)

Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit 579e248)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 12, 2023
Merged
@lezzago lezzago added backport 2.9 backports PRs to 2.9 backport 2.10 and removed backport 2.9 backports PRs to 2.9 backport 2.10 labels Oct 12, 2023
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 12, 2023
@github-actions
[Backport 2.x] fix for concurrentmodificationexception with linkedhas…
e36a1c4 
…hmap (#1259)

Signed-off-by: Subhobrata Dey <[email protected]>
(cherry picked from commit 579e248)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 12, 2023
Merged
@lezzago lezzago added backport 2.9 backports PRs to 2.9 and removed backport 2.9 backports PRs to 2.9 labels Oct 12, 2023
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

@sbcd90 sbcd90 added backport 2.9 backports PRs to 2.9 and removed backport 2.9 backports PRs to 2.9 labels Oct 12, 2023
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

@sbcd90 sbcd90 added backport 2.9 backports PRs to 2.9 and removed backport 2.9 backports PRs to 2.9 labels Oct 12, 2023
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

sbcd90 pushed a commit to sbcd90/alerting that referenced this pull request Oct 12, 2023
@opensearch-trigger-bot @sbcd90
[Backport 2.x] fix for concurrentmodificationexception with linkedhas…
63d4b15 
…hmap (opensearch-project#1259)

Signed-off-by: Subhobrata Dey <[email protected]>
sbcd90 pushed a commit that referenced this pull request Oct 12, 2023
@opensearch-trigger-bot
[Backport 2.x] fix for concurrentmodificationexception with linkedhas…
1e58f52 
…hmap (#1259) (#1262)

Signed-off-by: Subhobrata Dey <[email protected]>
sbcd90 pushed a commit that referenced this pull request Oct 12, 2023
@opensearch-trigger-bot
[Backport 2.x] fix for concurrentmodificationexception with linkedhas…
765ab36 
…hmap (#1259) (#1261)

Signed-off-by: Subhobrata Dey <[email protected]>
eirsep pushed a commit to eirsep/alerting that referenced this pull request Oct 12, 2023
@opensearch-trigger-bot @eirsep
[Backport 2.x] fix for concurrentmodificationexception with linkedhas…
55f8b64 
…hmap (opensearch-project#1259)

Signed-off-by: Subhobrata Dey <[email protected]>
@eirsep eirsep mentioned this pull request Oct 12, 2023
Merged
eirsep pushed a commit to eirsep/alerting that referenced this pull request Oct 12, 2023
@opensearch-trigger-bot @eirsep
[Backport 2.x] fix for concurrentmodificationexception with linkedhas…
1d8d13c 
…hmap (opensearch-project#1259)

Signed-off-by: Subhobrata Dey <[email protected]>
eirsep added a commit that referenced this pull request Oct 12, 2023
@eirsep @sbcd90 @opensearch-trigger-bot
Backport bug fixes to 2.9 (#1265)
0269dd1 
* fix workflow execution for first run (#1227)

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

* optimize doc-level monitor workflow for index patterns (#1122)

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

* [Backport 2.x] fix for concurrentmodificationexception with linkedhashmap (#1259)

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

* ignore bwc test

Signed-off-by: Surya Sashank Nistala <[email protected]>

* replace ignore annotation with awaitsFix annotation

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lezzago lezzago lezzago approved these changes

@sbcd90 sbcd90 sbcd90 approved these changes

Assignees
No one assigned
Labels
backport 2.9 backports PRs to 2.9 backport 2.10 backport 2.11 failed backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sbcd90 @lezzago