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

[Feature/Identity] Merge remote-tracking branch 'origin/main' into feature/identity #5581

Merged
merged 29 commits into from
Dec 15, 2022
Merged

[Feature/Identity] Merge remote-tracking branch 'origin/main' into feature/identity #5581

merged 29 commits into from
Dec 15, 2022

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Dec 15, 2022

Description

Merges latest changes from main into feature/identity. The gradle check will fail as the latest of feature/identity has an unstable build, but will be resolved in a subsequent PR following this one.

CHANGELOG check should be ignored.

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.

Rishikesh1159 and others added 29 commits December 5, 2022 11:34
@Rishikesh1159
Fix flaky ShardIndexingPressureConcurrentExecutionTests (opensearch-p…
0bd3141 
…roject#5439)

Add conditional check on assertNull to fix flaky tests.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
@dhwanilpatel
Fix bwc for cluster manager throttling settings (opensearch-project#5305
913cb3a 
)

Signed-off-by: Dhwanil Patel <dhwanip@amazon.com>
@reta
Update ingest-attachment plugin dependencies: Apache Tika 3.6.0, Apac…
5500114 
…he Mime4j 0.8.8, Apache Poi 5.2.3, Apache PdfBox 2.0.27 (opensearch-project#5448)

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

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@ashking94
Enhance CheckpointState to support no-op replication (opensearch-proj…
1069660 
…ect#5282)

* CheckpointState enhanced to support no-op replication

Signed-off-by: Ashish Singh <ssashish@amazon.com>
Co-authored-by: Bukhtawar Khan<bukhtawa@amazon.com>
@reta
[BUG] org.opensearch.repositories.s3.RepositoryS3ClientYamlTestSuiteI…
2416d37 
…T/test {yaml=repository_s3/20_repository_permanent_credentials/Snapshot and Restore with repository-s3 using permanent credentials} flaky: randomizing basePath (opensearch-project#5482)

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

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@nknize
[Bug] fix case sensitivity for wildcard queries (opensearch-project#5462
ce25dec 
)

Fixes the wildcard query to not normalize the pattern when case_insensitive is
set by the user. This is achieved by creating a new normalizedWildcardQuery
method so that query_string queries (which do not support case sensitivity) can
still normalize the pattern when the default analyzer is used; maintaining
existing behavior.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
@reta
Support OpenSSL Provider with default Netty allocator (opensearch-pro…
bea27b8 
…ject#5460)

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

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@rursprung
Revert "build no-jdk distributions as part of release build (opensear…
a060c0a 
…ch-project#4902)" (opensearch-project#5465)

This reverts commit 8c9ca4e.

It seems that this wasn't entirely the correct way and is currently
blocking us from removing the `build.sh` from the `opensearch-build`
repository (i.e. this `build.sh` here is not yet being used).
See the discussion in opensearch-project/opensearch-build#2835 for
further details.

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
@reta
Add max_shard_size parameter for Shrink API (fix supported version af…
8617dbe 
…ter backport) (opensearch-project#5503)

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

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@dblock
Sync CODEOWNERS with MAINTAINERS. (opensearch-project#5501)
0f651b8 
Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
@ryanbogan
Added jackson dependency to server (opensearch-project#5366)
c6663fd 
* Added jackson dependency to server

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

* Updated CHANGELOG

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

* Update build.gradle files

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

* Add RuntimePermission to fix errors

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

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@Poojita-Raj
Fix flaky test BulkIntegrationIT.testDeleteIndexWhileIndexing (opense…
7108ee5 
…arch-project#5491)

Signed-off-by: Poojita Raj <poojiraj@amazon.com>

Signed-off-by: Poojita Raj <poojiraj@amazon.com>
@xuezhou25
Add release notes for 2.4.1 (opensearch-project#5488)
67977a2 
Signed-off-by: Xue Zhou <xuezhou@amazon.com>

Signed-off-by: Xue Zhou <xuezhou@amazon.com>
@mch2
Properly skip OnDemandBlockSnapshotIndexInputTests.testVariousBlockSi…
d4e5a28 
…ze on Windows. (opensearch-project#5511)

PR opensearch-project#5397 skipped this test in @before block but still
frequently throws a TestCouldNotBeSkippedException.  This is caused by the after block still executing and throwing  an exception
while cleaning the directory created at the path in @before.  Moving the assumption to the individual test prevents this exception by ensuring the path exists.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
@ryanbogan
Merge first batch of feature/extensions into main (opensearch-project…
e41cbe5 
…#5347)

* Merge first batch of feature/extensions into main

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

* Fixed CHANGELOG

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

* Fixed newline errors

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

* Renaming and CHANGELOG fixes

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

* Refactor extension loading into private method

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

* Removed skipValidation and added connectToExtensionNode method

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

* Remove unnecessary feature flag calls

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

* Renaming and exception handling

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

* Change latches to CompletableFuture

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

* Removed unnecessary validateSettingKey call

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

* Fix azure-core dependency

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

* Update SHAs

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

* Remove unintended dependency changes

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

* Removed dynamic settings regitration, removed info() method, and added NoopExtensionsManager

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

* Add javadoc

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

* Fixed spotless failure

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

* Removed NoopExtensionsManager

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

* Added functioning NoopExtensionsManager

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

* Added missing javadoc

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

* Remove forbiddenAPI

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

* Fix spotless

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

* Change logger.info to logger.error in handleException

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

* Fix ExtensionsManagerTests

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

* Removing unrelated change

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

* Update SHAs

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

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@dependabot
Bump commons-compress from 1.21 to 1.22 (opensearch-project#5520)
bceb40c 
Bumps commons-compress from 1.21 to 1.22.

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Rishikesh1159
[Segment Replication] Trigger a round of replication for replica shar…
0cf6797 
…ds during peer recovery when segment replication is enabled (opensearch-project#5332)

* Fix new added replica shards falling behind primary.

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

* Trigger a round of replication during peer recovery when segment replication is enabled.

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

* Remove unnecessary start replication overloaded method.

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

* Add test for failure case and refactor some code.

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

* Apply spotless check.

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

* Addressing comments on the PR.

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

* Remove unnecessary condition check.

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

* Apply spotless check.

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

* Add step listeners to resolve forcing round of segment replication.

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

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
@ryanbogan
Adding support to register settings dynamically (opensearch-project#5495
08cd06f 
)

* Adding support to register settings dynamically

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

* Update CHANGELOG

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

* Removed unnecessary registerSetting methods

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

* Change setting registration order

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

* Add unregisterSettings method

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

* Remove unnecessary feature flag

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

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@owaiskazi19
Updated 1.3.7 release notes date (opensearch-project#5536)
ceca161 
Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
@imRishN
Pre conditions check before updating weighted routing metadata (opens…
aecd1ea 
…earch-project#4955)

* Pre conditions check to allow weight updates for non decommissioned attribute

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
@imRishN
Atomically update cluster state with decommission status and correspo…
ff16ebd 
…nding action (opensearch-project#5093)

* Atomically update the cluster state with decommission status and its corresponding action in the same execute call

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
@reta
Update Netty to 4.1.86.Final (opensearch-project#5529)
ea73119 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@dreamer-89
Update release date in 2.4.1 release notes (opensearch-project#5549)
ec5144b 
Signed-off-by: Suraj Singh <surajrider@gmail.com>

Signed-off-by: Suraj Singh <surajrider@gmail.com>
@reta
Update 2.4.1 release notes (opensearch-project#5552)
1710786 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@noCharger @dblock
Refactor fuzziness interface on query builders (opensearch-project#5433)
d3f6dfa 
* Refactor Object to Fuzziness type for all query builders

Signed-off-by: noCharger <lingzhichu.clz@gmail.com>

* Revise on bwc

Signed-off-by: noCharger <lingzhichu.clz@gmail.com>

* Update change log

Signed-off-by: noCharger <lingzhichu.clz@gmail.com>

Signed-off-by: noCharger <lingzhichu.clz@gmail.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
@dreamer-89 @opensearch-ci-bot @dblock
Upgrade lucene version (opensearch-project#5570)
0475d1c 
* Added bwc version 2.4.2

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>

* Added 2.4.2.

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>

* Update Lucene snapshot to 9.5.0-snapshot-d5cef1c

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Update changelog entry

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Add 2.4.2 bwc version

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Internal changes post lucene upgrade

Signed-off-by: Suraj Singh <surajrider@gmail.com>

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Signed-off-by: Suraj Singh <surajrider@gmail.com>
Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
@zelinh
Add CI bundle pattern to distribution download (opensearch-project#5348)
fe8fd67 
* Add CI bundle pattern for ivy repo

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Gradle update

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Extract path

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Change with customDistributionDownloadType

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Add default for exception handle

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

* Add documentations

Signed-off-by: Zelin Hao <zelinhao@amazon.com>

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
@dependabot @owaiskazi19 @dreamer-89
Bump protobuf-java from 3.21.9 to 3.21.11 in /plugins/repository-hdfs (…
cb26035 
…opensearch-project#5519)

* Bump protobuf-java from 3.21.9 to 3.21.11 in /plugins/repository-hdfs

Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.21.9 to 3.21.11.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py)
- [Commits](protocolbuffers/protobuf@v3.21.9...v3.21.11)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  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>

* Updated changelog

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Owais Kazi <owaiskazi19@gmail.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: Owais Kazi <owaiskazi19@gmail.com>
Co-authored-by: Suraj Singh <surajrider@gmail.com>
@cwperks
Merge branch 'main' into merge-main-into-identity-12152022
516467d
@cwperks cwperks requested a review from reta as a code owner December 15, 2022 15:22
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@saratvemulapalli
Copy link
Member

@cwperks gradle check is failing. How are you guys managing the sanity of the branch?

@saratvemulapalli saratvemulapalli merged commit 8dd63a5 into opensearch-project:feature/identity Dec 15, 2022
@cwperks
Copy link
Member Author

cwperks commented Dec 15, 2022

@saratvemulapalli Thank you for the help! The gradle check will be resolved in this PR: #5583

Basic auth was recently introduced into feature/identity in a recent PR (#4798) and some tests in the gradle check which were already passing an Authorization header in http requests started invoking the new basic auth handling which was slowing down the request processing and making tests which ran many (500+) async requests start to fail.

This PR (#5583) introduces Identity as a module and enables it only for tests in the Identity module.

@peternied
Copy link
Member

peternied commented Jan 5, 2023 •
edited
Loading

😱 It looks like this was squashed... I think future merges might be difficult, we might need to re-write history to fix this - FYI @cwperks

@cwperks
Copy link
Member Author

cwperks commented Jan 5, 2023

@peternied Is there a way to have these merges from main -> feature/identity not squash, but squash any PR into identity that is not one of the merges from main?

@peternied
Copy link
Member

One could build an auto-merger that targets feature branches, but we don't have a good mechanism with GitHub pull requests as they are

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

@saratvemulapalli saratvemulapalli saratvemulapalli approved these changes

@reta reta Awaiting requested review from reta reta is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.