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

[Backport 2.x] Bump protobuf-java to 3.21.7 in repository-gcs and repository-hdfs #4853

Closed
wants to merge 355 commits into from

Conversation

ryanbogan
Copy link
Member

Signed-off-by: Ryan Bogan rbogan@amazon.com

Description

Backports 4790 to 2.x

Check List

  • [X ] New functionality includes testing.
    • [X ] All tests pass
  • [ X] New functionality has been documented.
    • [X ] New functionality has javadoc added
  • [X ] Commits are signed per the DCO using --signoff
  • [ X] 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.

opensearch-trigger-bot bot and others added 30 commits April 26, 2022 14:01
… benchmark (#3076) (#3080)

* [Type removal] Remove _type support in bulk indexing from client benchmark

Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit c5ff8d6)

Co-authored-by: Suraj Singh <surajrider@gmail.com>
Signed-off-by: pgodithi <pgodithi@amazon.com>
…) (#3085)

* [Remove] Type from nested fields using new metadata field mapper

types support is removed yet nested documents use the _type field to store the
path for nested documents. A new _nested_path metadata field mapper is added to
take the place of the _type field in order to remove the type dependency in
nested documents. BWC is handled in the new field mapper to ensure compatibility
with older versions.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 6b641d2)

Co-authored-by: Nick Knize <nknize@apache.org>
… (#3103)

Refactors XContentType.fromMediaTypeOrFormat to fromMediaType so Accept headers
and Content-Type headers can be parsed separately. This helps in reusing the
same parse logic in for REST Versioning API support.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit d86c88f)

Co-authored-by: Nick Knize <nknize@apache.org>
Signed-off-by: dblock <dblock@amazon.com>
In preparation for re-enabling the missingJavadoc gradle task this change adds
in the missing package-info.java files to the server folder. For now general
javadocs are added to these files with the intent to clean up with better
descriptions over time.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 2146827)

Co-authored-by: Nick Knize <nknize@apache.org>
… DetachClusterCommand and replace with '_must_join_elected_cluster_manager_' (#3138)

Signed-off-by: Tianli Feng <ftianli@amazon.com>
…3133) (#3151)

* Rename ClusterBlock description 'no master' to 'no cluster-manager'

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Adjust format by spotlessApply task

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit bb870f7)

Co-authored-by: Tianli Feng <ftianli@amazon.com>
The types exist transport action can be removed now that the TransportClient has
been removed and types support has been removed.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 15f035b)

Co-authored-by: Nick Knize <nknize@apache.org>
Fixes emeritus table formatting in Maintainers document.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit ae4c612)

Co-authored-by: Nick Knize <nknize@apache.org>
This is a very simple fix that adds a special case for the backward
compatibility message for OS 1.x/ES 7.x. This basically mirrors a
special case already codified in [Version][1]. I think this is a
reasonable fix because it allows the message to be quite verbose. It
should also only need to exist on the 2.x branch of OpenSearch since it
is a special case that will no longer exist in 3.x when the entire
LegacyESVersion concept can be removed from the code base.

[1]: https://github.com/opensearch-project/OpenSearch/blob/cb238aae616d6a0fd8f82e128a1f94c8e4e8b1f7/server/src/main/java/org/opensearch/Version.java#L398

Signed-off-by: Andrew Ross <andrross@amazon.com>
With the removal of Transport Client AliasesExistAction is no longer needed and
is removed.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 5f531b3)
…ibility for opensearch client with odfe (#2641) (#2652)

Signed-off-by: Mohit Godwani <mgodwan@amazon.com>
(cherry picked from commit ec4fe70)
Adds javadocs to o.o.bootstrap, o.o.cli, and o.o.client packages.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit c13b679)
…lder (#3169) (#3175)

Removes unused ShrinkAction, ShardUpgradeRequest, and
UpgradeSettingsRequestBuilder classes.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit c76a4c9)
…ry (#2519) (#3165)

Signed-off-by: Tianli Feng <ftianli@amazon.com>
Adds javadocs to remaining undocumented classes in o.o.action package.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 6ca3278)
…gcs (#3161) (#3191)

* Bump google-api-client from 1.30.10 to 1.34.0 in /plugins/repository-gcs

Bumps [google-api-client](https://github.com/googleapis/google-api-java-client) from 1.30.10 to 1.34.0.
- [Release notes](https://github.com/googleapis/google-api-java-client/releases)
- [Changelog](https://github.com/googleapis/google-api-java-client/blob/main/CHANGELOG.md)
- [Commits](googleapis/google-api-java-client@v1.30.10...v1.34.0)

---
updated-dependencies:
- dependency-name: com.google.api-client:google-api-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Add missing classes to third party audit

Signed-off-by: Andrew Ross <andrross@amazon.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 2e53f9a)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…or (#3099) (#3179)

Signed-off-by: Tianli Feng <ftianli@amazon.com>
…ool,usage,watcher (#3186) (#3192)

Adds javadocs to classes in the org.opensearch.monitor, persistence, plugins,
repository, script, threadpool, usage, and watcher packages.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 14704b3)

Co-authored-by: Nick Knize <nknize@apache.org>
…3190) (#3194)

* Bump commons-lang3 from 3.9 to 3.12.0 in /plugins/ingest-attachment

Bumps commons-lang3 from 3.9 to 3.12.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 112a108)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…d node pkgs (#3185) (#3187)

Adds javadocs to classes in the org.opensearch.discovery, env, gateway, http,
ingest, lucene, and node packages.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 4d3da00)

Co-authored-by: Nick Knize <nknize@apache.org>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
* Bump HdrHistogram from 2.1.9 to 2.1.12 in /server

Bumps [HdrHistogram](https://github.com/HdrHistogram/HdrHistogram) from 2.1.9 to 2.1.12.
- [Release notes](https://github.com/HdrHistogram/HdrHistogram/releases)
- [Commits](HdrHistogram/HdrHistogram@HdrHistogram-2.1.9...HdrHistogram-2.1.12)

---
updated-dependencies:
- dependency-name: org.hdrhistogram:HdrHistogram
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Update test to match new behavior of HdrHistogram

There was a [change in behavior in HdrHistogram][1] that causes the
tests to fail with the new version. The fix here is to add another value
in the test data set for the failing test, which has the result of
making both versions of HdrHistogram agree on the percentile values.

[1]: HdrHistogram/HdrHistogram@5c7226c

Signed-off-by: Andrew Ross <andrross@amazon.com>

* Remove unnecessary exclusion on third party audit

Signed-off-by: Andrew Ross <andrross@amazon.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit bce7f49)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

* Fixing the installation URL to consume build qualifier

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

* Fixing spotless

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
(cherry picked from commit ba6dc5d)

Co-authored-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
(cherry picked from commit 8033183)

Co-authored-by: Vacha Shah <vachshah@amazon.com>
)

Adds javadocs to org.opensearch.rest, snapshots, and tasks packages.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 15161a8)

Co-authored-by: Nick Knize <nknize@apache.org>
Signed-off-by: dblock <dblock@amazon.com>
(cherry picked from commit 781fc6e)

Co-authored-by: Daniel Doubrovkine (dB.) <dblock@amazon.com>
…#3211)

* Add implicit dependency

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Add implicit dependency

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Add implicit dependency

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Add implicit dependency

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Add implicit dependency

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Add implicit dependency

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Add dependsOn

Signed-off-by: pgodithi <pgodithi@amazon.com>
(cherry picked from commit 2fe2e37)

Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
Removes last trace of TypeFieldMapper since types have been removed and
NestedPathFieldMapper is now available.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
(cherry picked from commit 741445a)

Co-authored-by: Nick Knize <nknize@apache.org>
hauck-jvsh and others added 21 commits September 23, 2022 10:48
…4566)

Fixes a bug to not fail the entire document when "ignore_malformed" is set to true. Allowing the valid fields
to be indexed and ignore only the malformed fields.

(cherry picked from commit 45c9597)
Signed-off-by: Hauck <joaoh14@gmail.com>
* add s390x support in systemcallfilter

#4000
Signed-off-by: Andrija Pantovic <andrija.pantovic@phoenix-systems.ch>

* add gradle cfg for s390x

Signed-off-by: Andrija Pantovic <andrija.pantovic@gmail.com>

* change assertion for architecture

Signed-off-by: Andrija Pantovic <andrija.pantovic@gmail.com>

* change assertion for architecture

Signed-off-by: Andrija Pantovic <andrija.pantovic@gmail.com>

* update changelog

Signed-off-by: Andrija Pantovic <andrija.pantovic@gmail.com>

Signed-off-by: Andrija Pantovic <andrija.pantovic@phoenix-systems.ch>
Signed-off-by: Andrija Pantovic <andrija.pantovic@gmail.com>
(cherry picked from commit 517c19c)

Co-authored-by: Andrija Pantovic <andrija.pantovic@gmail.com>
Related commit: 0e9f74e

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit 2c0277b)
…etion (#4570) (#4670)

* Fixed the SnapshotsInProgress error during index deletion (#4570)

Signed-off-by: Xue Zhou <xuezhou@amazon.com>

* Add changelog

Signed-off-by: Xue Zhou <xuezhou@amazon.com>

Signed-off-by: Xue Zhou <xuezhou@amazon.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
* Updating hadoop-hdfs to 3.3.4

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

* Fixing typo

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
* Fixed day of year defaulting for round up parser (#4627)

Signed-off-by: Vishal Sarda <vsarda@amazon.com>
(cherry picked from commit a17692d)
* Adding create pit service layer changes

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Adding delete pit service layer changes

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Add service layer changes for list all PITs

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Add Point In Time Node Stats API ServiceLayer Changes

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Add changes to Point in time segments API service layer

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Add changes for Create PIT and Delete PIT rest layer and rest high level client

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Added restlayer changes for pit stats

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* 2.4 specific fixes

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Modified cat shards test for pit stats

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>

* Added rest layer changes for List all PITs and PIT segments

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>
* 496: Added filters, indexRouting and searchRouting when doing rollover on alias

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* 496: Removed unused map property in metada alias rollover tests

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Co-authored-by: Stevan Buzejic <stevan.buzejic@htecgroup.com>
(cherry picked from commit 54f8fdd)

Co-authored-by: Stevan Buzejic <30922513+stevanbz@users.noreply.github.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>

Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
…etAdditionalRoles() (#4653)

Signed-off-by: Tianli Feng <ftianli@amazon.com>
* Bump  from 1.4.1 to 1.5.1

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* Update change log with correct PR link

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
…ase (#4729)

This field is only used for old snapshot generations and needs to be removed in
the next major version. This commit sets up the removal for backwards
compatibility support.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
…ability (#4689) (#4739)

Signed-off-by: Tianli Feng <ftianli@amazon.com>

Signed-off-by: Tianli Feng <ftianli@amazon.com>
…and Further simplification of the ZIP publication implementation (#4360) (#4733)

* This is a backport of #4156 and #4360 to 2.x
* #4156 was cherry-picked from 7fe5830
  -  Resolving conflicts in CHANGELOG.md
* #4360 was cherry-picked from ab6849f
  -  Resolving conflicts in CHANGELOG.md

There is one noticeable difference, the `project.group` property can be empty in which case it will fall back to default value: `org.opensearch.plugin`. See <#4156 (comment)> for more details.

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
…xx tasks (#4742)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Sets analyzer to regex query string search

Signed-off-by: yogev mets <yyyogev@gmail.com>
(cherry picked from commit ea4cfcc)

Co-authored-by: Yogev Mets <yyyogev@gmail.com>
Co-authored-by: Nicholas Walter Knize <nknize@apache.org>
* Introduce experimental searchable snapshot API (#4680)

This commit adds a new parameter to the snapshot restore API to restore
to a new type of "remote snapshot" index where, unlike traditional
snapshot restores, the index data is not all downloaded to disk and
instead is read on-demand at search time. The feature is functional with
this commit, and includes a simple end-to-end integration test, but is
far from complete. See tracking issue #2919 for the rest of the work
planned/underway.

All new capabilities are gated behind a new searchable snapshot feature
flag.

Signed-off-by: Andrew Ross <andrross@amazon.com>

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 431bdeb)

* Fix assertion in test of ShardStateMetadata (#4774)

This test randomly fails if the enum selected isn't the same as the one
choosen by the legacy constructor.

Signed-off-by: Andrew Ross <andrross@amazon.com>

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 1a7aaba)

* Update version check for 2.4

Checking on or after version 3.0 does not work (or make sense) since
this is on the 2.x branch.

Signed-off-by: Andrew Ross <andrross@amazon.com>

Signed-off-by: Andrew Ross <andrross@amazon.com>
… (#4781)

* Update Jackson Databind to 2.13.4.2 (addressing CVE-2022-42003) (#4779)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 12f26d3)

* Update changelog

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@ryanbogan ryanbogan requested review from a team and reta as code owners October 20, 2022 17:09
@andrross
Copy link
Member

andrross commented Oct 20, 2022

5000+ files changed? Doesn't seem right :)

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@adnapibar adnapibar added the backport PRs or issues specific to backporting features or enhancments label Oct 20, 2022
@adnapibar adnapibar changed the title Backport/backport 4790 to 2.x [Backport 2.x] Bump protobuf-java to 3.21.7 in repository-gcs and repository-hdfs Oct 20, 2022
@ryanbogan
Copy link
Member Author

Wrong branch, closing.

@ryanbogan ryanbogan closed this Oct 20, 2022
@adnapibar
Copy link
Contributor

You need to create the pull request from the 2.x branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport PRs or issues specific to backporting features or enhancments
Projects
None yet
Development

Successfully merging this pull request may close these issues.