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

Manually updates Google-HTTP-Client #7928

Merged
merged 4 commits into from
Jun 6, 2023

Conversation

stephen-crawford
Copy link
Contributor

Description

#7915 failed so manually updating the dependency as part of core oncall.

Related Issues

Resolves #[Issue number to be closed when this PR is merged]
#7915

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.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchShardTaskCancellationWithHighCpu

@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT.test {yaml=pit/10_basic/Delete all}
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchTaskCancellationWithHighCpu

@codecov
Copy link

codecov bot commented Jun 6, 2023

Codecov Report

Merging #7928 (f849e2c) into main (d55813e) will increase coverage by 0.05%.
The diff coverage is n/a.

❗ Current head f849e2c differs from pull request most recent head 5374ac6. Consider uploading reports for the commit 5374ac6 to get more accurate results

@@             Coverage Diff              @@
##               main    #7928      +/-   ##
============================================
+ Coverage     70.87%   70.93%   +0.05%     
+ Complexity    56326    56290      -36     
============================================
  Files          4691     4689       -2     
  Lines        266388   266304      -84     
  Branches      39090    39086       -4     
============================================
+ Hits         188813   188892      +79     
+ Misses        61566    61413     -153     
+ Partials      16009    15999      -10     

see 470 files with indirect coverage changes

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

Gradle Check (Jenkins) Run Completed with:

@dblock dblock merged commit 4376bbd into opensearch-project:main Jun 6, 2023
@opensearch-trigger-bot
Copy link
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-7928-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4376bbdd056b3047f3e803a9c33f3a860dcaeb4a
# Push it to GitHub
git push --set-upstream origin backport/backport-7928-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-7928-to-2.x.

@reta
Copy link
Collaborator

reta commented Jun 6, 2023

@scrawfor99 may need manual backport sadly

@stephen-crawford stephen-crawford deleted the UpdateGoogleHTTP branch June 8, 2023 15:25
sandeshkr419 pushed a commit to sandeshkr419/OpenSearch that referenced this pull request Jun 8, 2023
* Update Google HTTP

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Google HTTP

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* add changelog

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
* Update Google HTTP

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Google HTTP

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* add changelog

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants