Skip to content

Upgrading zookeeper in hdfs-fixture#5007

Merged
andrross merged 2 commits intoopensearch-project:mainfrom
VachaShah:move-zookeeper
Nov 2, 2022
Merged

Upgrading zookeeper in hdfs-fixture#5007
andrross merged 2 commits intoopensearch-project:mainfrom
VachaShah:move-zookeeper

Conversation

@VachaShah
Copy link
Copy Markdown
Contributor

Description

Upgrading zookeeper in test hdfs-fixture since thats where the repository-hdfs plugin is getting it from. The zookeeper in test hdfs-fixture without the upgrade (version 3.5.6) brought in log4j dependency.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@VachaShah VachaShah requested review from a team and reta as code owners November 1, 2022 06:14
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

Comment thread CHANGELOG.md
- Bump `woodstox-core` to 6.4.0 ([#4947](https://github.com/opensearch-project/OpenSearch/pull/4947))
- Update Apache Lucene to 9.5.0-snapshot-a4ef70f ([#4979](https://github.com/opensearch-project/OpenSearch/pull/4979))
- Upgrade jetty-http, kotlin-stdlib and snakeyaml ([#4963](https://github.com/opensearch-project/OpenSearch/pull/4963))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Let's put back that line?

Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Copy Markdown
Contributor Author

Gradle Check (Jenkins) Run Completed with:

Related to #4881

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@VachaShah
Copy link
Copy Markdown
Contributor Author

Gradle Check (Jenkins) Run Completed with:

#4899

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 1, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 2, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 2, 2022

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Nov 2, 2022

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 70.81%. Comparing base (fab4336) to head (cae245c).
⚠️ Report is 4527 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #5007      +/-   ##
============================================
- Coverage     70.84%   70.81%   -0.04%     
+ Complexity    57867    57826      -41     
============================================
  Files          4692     4692              
  Lines        276650   276527     -123     
  Branches      40155    40084      -71     
============================================
- Hits         196002   195814     -188     
- Misses        64500    64667     +167     
+ Partials      16148    16046     -102     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@VachaShah VachaShah requested a review from andrross November 2, 2022 06:18
@andrross andrross merged commit 97bebcb into opensearch-project:main Nov 2, 2022
@VachaShah VachaShah added backport 1.x backport 2.x Backport to 2.x branch labels Nov 2, 2022
@opensearch-trigger-bot
Copy link
Copy Markdown
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-5007-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 97bebcbdab152a9d639eea0cda5afa265090655d
# Push it to GitHub
git push --set-upstream origin backport/backport-5007-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-5007-to-1.x.

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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:

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

VachaShah added a commit to VachaShah/OpenSearch that referenced this pull request Nov 2, 2022
Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah added a commit to VachaShah/OpenSearch that referenced this pull request Nov 2, 2022
Signed-off-by: Vacha Shah <vachshah@amazon.com>
andrross pushed a commit that referenced this pull request Nov 2, 2022
Signed-off-by: Vacha Shah <vachshah@amazon.com>
andrross pushed a commit that referenced this pull request Nov 2, 2022
Signed-off-by: Vacha Shah <vachshah@amazon.com>
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Nov 2, 2022
Signed-off-by: Vacha Shah <vachshah@amazon.com>
(cherry picked from commit 50f56e3)
VachaShah added a commit that referenced this pull request Nov 2, 2022
…5050)

Signed-off-by: Vacha Shah <vachshah@amazon.com>
(cherry picked from commit 50f56e3)

Co-authored-by: Vacha Shah <vachshah@amazon.com>
@ryanbogan ryanbogan added the backport 1.3 Backport to 1.3 branch label Jan 25, 2023
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 1.x backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants