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

OSD-2847 bump del version to fix race condition #2873

Merged
merged 3 commits into from
Nov 21, 2022
Merged

OSD-2847 bump del version to fix race condition #2873

merged 3 commits into from
Nov 21, 2022

Conversation

DanielBelmes
Copy link
Contributor

@DanielBelmes DanielBelmes commented Nov 14, 2022

Description

There is a Mac OS only race condition within the del library. This causes failures when info [ opensearch-dashboards ] Cleaning all empty folders recursively is running and causes the build to fail.(Tries to delete an already deleted folder) Version 6.1.1 is the latest version of del that requires 0 implementation changes on our end. Just need to update the package.

Issues Resolved

[OSD-2847]

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
    • yarn test:ftr
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
@DanielBelmes DanielBelmes requested a review from a team as a code owner November 14, 2022 22:55
Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
Copy link
Member

@joshuarrrr joshuarrrr left a comment

Choose a reason for hiding this comment

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

@DanielBelmes thanks for the fix! Do you mind updating the CHANGELOG entry to specify the "why"?

@@ -161,7 +161,7 @@
"commander": "^3.0.2",
"core-js": "^3.6.5",
"deep-freeze-strict": "^1.1.1",
"del": "^5.1.0",
"del": "^6.1.1",
Copy link
Member

Choose a reason for hiding this comment

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

Although this is a major version bump of a direct dependency, it should be safe to backport, because the only breaking change in v6 is requiring Node.js 10. Our 1.x branch is already on Node.js 10.

Copy link
Member

Choose a reason for hiding this comment

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

Do we know if other plugins use del

Copy link
Member

Choose a reason for hiding this comment

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

Why would that matter - none of them can specify a node engine < 10, right?

CHANGELOG.md Outdated Show resolved Hide resolved
@joshuarrrr joshuarrrr added backport 1.x backport 2.x v2.5.0 'Issues and PRs related to version v2.5.0' labels Nov 15, 2022
Co-authored-by: Josh Romero <rmerqg@amazon.com>
Signed-off-by: DanielBelmes <3631206+DanielBelmes@users.noreply.github.com>
@codecov-commenter
Copy link

Codecov Report

Merging #2873 (3a8190a) into main (b19c171) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #2873      +/-   ##
==========================================
- Coverage   66.68%   66.67%   -0.01%     
==========================================
  Files        3219     3219              
  Lines       61445    61445              
  Branches     9417     9417              
==========================================
- Hits        40972    40968       -4     
- Misses      18228    18231       +3     
- Partials     2245     2246       +1     
Impacted Files Coverage Δ
...s/osd-optimizer/src/node/node_auto_tranpilation.ts 83.67% <0.00%> (-4.09%) ⬇️
packages/osd-optimizer/src/node/cache.ts 50.00% <0.00%> (-2.64%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@joshuarrrr joshuarrrr merged commit 9041a82 into opensearch-project:main Nov 21, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2873-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9041a8278739e2979cdf6b2307629f3f3b802dcd
# Push it to GitHub
git push --set-upstream origin backport/backport-2873-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2873-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9041a8278739e2979cdf6b2307629f3f3b802dcd
# Push it to GitHub
git push --set-upstream origin backport/backport-2873-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

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

@DanielBelmes DanielBelmes deleted the feature/bump-del branch November 23, 2022 03:15
joshuarrrr pushed a commit to joshuarrrr/OpenSearch-Dashboards that referenced this pull request Nov 29, 2022
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 9041a82)
joshuarrrr added a commit that referenced this pull request Nov 30, 2022
* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 9041a82)

Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
joshuarrrr pushed a commit to joshuarrrr/OpenSearch-Dashboards that referenced this pull request Nov 30, 2022
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 9041a82)
joshuarrrr pushed a commit to joshuarrrr/OpenSearch-Dashboards that referenced this pull request Nov 30, 2022
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 9041a82)
joshuarrrr added a commit that referenced this pull request Dec 1, 2022
* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 9041a82)

Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 1, 2022
* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 9041a82)

Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 7c9cba1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ananzh pushed a commit that referenced this pull request Dec 1, 2022
…ix race condition (#2873) (#2979)

* OSD-2847 bump del version to fix race condition (#2873) (#2971)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 9041a82)

Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
(cherry picked from commit 7c9cba1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* [Chore] update changelog

Signed-off-by: Josh Romero <rmerqg@amazon.com>

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
AlexRuiz7 pushed a commit to wazuh/wazuh-dashboard that referenced this pull request Dec 14, 2022
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
AlexRuiz7 pushed a commit to wazuh/wazuh-dashboard that referenced this pull request Dec 14, 2022
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
sipopo pushed a commit to sipopo/OpenSearch-Dashboards that referenced this pull request Dec 16, 2022
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
Signed-off-by: Sergey Osipov <sipopo@yandex.ru>
Arpit-Bandejiya pushed a commit to Arpit-Bandejiya/OpenSearch-Dashboards that referenced this pull request Jan 13, 2023
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
sikhote pushed a commit to sikhote/OpenSearch-Dashboards that referenced this pull request Apr 24, 2023
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
Signed-off-by: David Sinclair <david@sinclair.tech>
sikhote pushed a commit to sikhote/OpenSearch-Dashboards that referenced this pull request Apr 24, 2023
)

* OSD-2847 bump del version to fix race condition

Signed-off-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com>
Signed-off-by: David Sinclair <david@sinclair.tech>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x v1.3.7 v2.5.0 'Issues and PRs related to version v2.5.0'
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants