Skip to content

Commit

Permalink
Add queryGroupId to search workload tasks at co-ordinator and data no…
Browse files Browse the repository at this point in the history
…de level (#14708)

* add logic to add headers to Task

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add logic to add queryGroupId to task headers

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* remove redundant code

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add changelog entry

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* address comments

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* fix precommit

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add UTs for RemoteIndexMetadataManager (#14660)

Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Co-authored-by: Arpit-Bandejiya <abandeji@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix match_phrase_prefix_query not working on text field with multiple values and index_prefixes (#10959)

* Fix match_phrase_prefix_query not working on text field with multiple values and index_prefixes
Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Add more test

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* modify change log

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Fix test failure

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Change the indexAnalyzer used by prefix field

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Skip old version for yaml test

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Optimize some code

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Fix test failure

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Modify yaml test description

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Remove the name parameter for setAnalyzer()

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Offline calculation of total shard per node and caching it for weight calculation inside LocalShardBalancer (#14675)

Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* [bug fix] validate lower bound for top n size (#14587)

Signed-off-by: Chenyang Ji <cyji@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Create SystemIndexRegistry with helper method matchesSystemIndex (#14415)

* Create new extension point in SystemIndexPlugin for a single plugin to get registered system indices

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* WIP on system indices from IndexNameExpressionResolver

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add test in IndexNameExpressionResolverTests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove changes in SystemIndexPlugin

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add method in IndexNameExpressionResolver to get matching system indices

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Show how resolver can be chained to get system indices

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix forbiddenApis check

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Make SystemIndices internal

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove unneeded changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix CI failures

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix precommit errors

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use Regex instead of WildcardMatcher

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address code review feedback

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Allow caller to pass index expressions

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Create SystemIndexRegistry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove singleton limitation

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add javadoc

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add @experimentalapi annotation

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Refactor Grok validate pattern to iterative approach (#14206)

* grok validate patterns recusrion to iterative

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

* Add max depth in resolving a pattern to avoid OOM

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

* change path from deque to arraylist

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

* rename queue to stack

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

* Change max depth to 500

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

* typo originPatternName fix

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

* spotless

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

---------

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump opentelemetry from 1.39.0 to 1.40.0 (#14674)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump jackson from 2.17.1 to 2.17.2 (#14687)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add release notes for release 1.3.18 (#14699)

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump reactor from 3.5.19 to 3.5.20 (#14697)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add unit tests for read flow of RemoteClusterStateService and bug fix for transient settings (#14476)

Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Update version check for the bug fix of match_phrase_prefix_query not working on text field with multiple values and index_prefixes (#14703)

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Remove unnecessary cast to int from test (#14696)

Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* print reason why parent task was cancelled (#14604)

Signed-off-by: kkewwei <kkewwei@163.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Use set of shard routing for shard in unassigned shard batch check. (#14533)

Signed-off-by: Swetha Guptha <gupthasg@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add versioning for UploadedIndexMetadata (#14677)

* Add versioning for UploadedIndexMetadata
* Handle componentPrefix for backward compatibility

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix: update help output for _cat (#14722)

* fixed help output for _cat

Signed-off-by: ahmedsobeh <ahmed.sobeh@aiven.io>

* updated changelog

Signed-off-by: ahmedsobeh <ahmed.sobeh@aiven.io>

* updated changelog

Signed-off-by: ahmedsobeh <ahmed.sobeh@aiven.io>

---------

Signed-off-by: ahmedsobeh <ahmed.sobeh@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix hdfs-fixture kerb-admin & hadoop-minicluster dependencies are not being updated / false positive reports on CVEs (#14729)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Update to Gradle 8.9 (#14574)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix hdfs-fixture hadoop-minicluster dependencies are not being updated / false positive reports on CVEs (#14732)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add `strict_allow_templates` dynamic mapping option (#14555)

* The dynamic mapping parameter supports strict_allow_templates

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Modify change log

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Modify skip version in yml test file

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Refactor some code

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Keep the old methods

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* change public to private

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Optimize some code

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Do not override toString method for Dynamic

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Optimize some code and modify the changelog

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump net.minidev:json-smart from 2.5.0 to 2.5.1 in /plugins/repository-azure (#14748)

* Bump net.minidev:json-smart in /plugins/repository-azure

Bumps [net.minidev:json-smart](https://github.com/netplex/json-smart-v2) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/netplex/json-smart-v2/releases)
- [Commits](netplex/json-smart-v2@2.5.0...2.5.1)

---
updated-dependencies:
- dependency-name: net.minidev:json-smart
  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 changelog

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>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* remove query insights plugin from core (#14743)

Signed-off-by: Chenyang Ji <cyji@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add `strict_allow_templates` dynamic mapping option (#14555) (#14737) (#14742)

* The dynamic mapping parameter supports strict_allow_templates

* Modify change log

* Modify skip version in yml test file

* Refactor some code

* Keep the old methods

* change public to private

* Optimize some code

* Do not override toString method for Dynamic

* Optimize some code and modify the changelog

---------

(cherry picked from commit 6b8b3ef)

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix create or update alias API doesn't throw exception for unsupported parameters (#14719)

* Fix create or update alias API doesn't throw exception for unsupported parameters

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Update version check in yml test

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* modify change log

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Remove query categorization from core (#14759)

* Remove query categorization from core

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Add changelog

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Trigger Build

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

---------

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add changes to propagate queryGroupId across child requests and nodes (#14614)

* add query group header propagator

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* apply spotless check

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add new propagator in ThreadContext

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* spotlessApply

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* address comments

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump com.microsoft.azure:msal4j from 1.15.1 to 1.16.0 in /plugins/repository-azure (#14610)

* Bump com.microsoft.azure:msal4j in /plugins/repository-azure

Bumps [com.microsoft.azure:msal4j](https://github.com/AzureAD/microsoft-authentication-library-for-java) from 1.15.1 to 1.16.0.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-java/releases)
- [Changelog](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/changelog.txt)
- [Commits](AzureAD/microsoft-authentication-library-for-java@v1.15.1...v1.16.0)

---
updated-dependencies:
- dependency-name: com.microsoft.azure:msal4j
  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>

* Update changelog

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>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* [Bugfix] Fix ICacheKeySerializerTests flakiness (#14564)

* Fix testInvalidInput flakiness

Signed-off-by: Peter Alfonsi <petealft@amazon.com>

* Addressed andrross's comment

Signed-off-by: Peter Alfonsi <petealft@amazon.com>

* rerun security check

Signed-off-by: Peter Alfonsi <petealft@amazon.com>

---------

Signed-off-by: Peter Alfonsi <petealft@amazon.com>
Co-authored-by: Peter Alfonsi <petealft@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Correct typo in method name (#14621)

Signed-off-by: vatsal <vatsal.v.anand@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Refactoring FilterPath.parse by using an iterative approach instead of recursion. (#14200)

* Refactor FilterPath parse function (#12067)
Signed-off-by: Robin Friedmann <robinfriedmann.rf@gmail.com>

* Implement unit tests for FilterPathTests (#12067)
Signed-off-by: Robin Friedmann <robinfriedmann.rf@gmail.com>

* Write warn log if Filter is empty; Add comments (#12067)
Signed-off-by: Robin Friedmann <robinfriedmann.rf@gmail.com>

* Add changelog

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Remove unnecessary log statement

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Remove unused logger

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Spotless apply

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Remove incorrect changelog

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

---------

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Co-authored-by: Robin Friedmann <robinfriedmann.rf@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Removing String format in RemoteStoreMigrationAllocationDecider to optimise performance(#14612)

Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Clear templates before Adding; Use NamedWriteableAwareStreamInput for RemoteCustomMetadata; Correct the check for deciding upload of HashesOfConsistentSettings (#14513)

* Clear templates before Adding; Use NamedWriteableAwareStreamInput for RemoteCustomMetadata
* Correct the check for deciding upload of hashes of consistent settings

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add changelog

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add PR link changelog

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Improve reroute performance by optimising List.removeAll in LocalShardsBalancer to filter remote search shard from relocation decision (#14613)

Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix assertion failure while deleting remote backed index (#14601)

Signed-off-by: Sachin Kale <kalsac@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Allow system index warning in OpenSearchRestTestCase.refreshAllIndices (#14635)

* Allow system index warning

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address code review comments

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Star tree codec changes (#14514)

---------
Signed-off-by: Bharathwaj G <bharath78910@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump com.github.spullara.mustache.java:compiler from 0.9.13 to 0.9.14 in /modules/lang-mustache (#14672)

* Bump com.github.spullara.mustache.java:compiler

Bumps [com.github.spullara.mustache.java:compiler](https://github.com/spullara/mustache.java) from 0.9.13 to 0.9.14.
- [Commits](spullara/mustache.java@mustache.java-0.9.13...mustache.java-0.9.14)

---
updated-dependencies:
- dependency-name: com.github.spullara.mustache.java:compiler
  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 changelog

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>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump net.minidev:accessors-smart from 2.5.0 to 2.5.1 in /plugins/repository-azure (#14673)

* Bump net.minidev:accessors-smart in /plugins/repository-azure

Bumps [net.minidev:accessors-smart](https://github.com/netplex/json-smart-v2) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/netplex/json-smart-v2/releases)
- [Commits](netplex/json-smart-v2@2.5.0...2.5.1)

---
updated-dependencies:
- dependency-name: net.minidev:accessors-smart
  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 changelog

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>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* move query group thread context propagator out of ThreadContext

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

---------

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Peter Alfonsi <petealft@amazon.com>
Signed-off-by: vatsal <vatsal.v.anand@gmail.com>
Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
Signed-off-by: Sachin Kale <kalsac@amazon.com>
Signed-off-by: Craig Perkins <cwperx@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: Peter Alfonsi <peter.alfonsi@gmail.com>
Co-authored-by: Peter Alfonsi <petealft@amazon.com>
Co-authored-by: Vatsal <36672090+imvtsl@users.noreply.github.com>
Co-authored-by: Siddhant Deshmukh <deshsid@amazon.com>
Co-authored-by: Robin Friedmann <robinfriedmann.rf@gmail.com>
Co-authored-by: rishavz_sagar <rishavsagar4b1@gmail.com>
Co-authored-by: Sooraj Sinha <81695996+soosinha@users.noreply.github.com>
Co-authored-by: Sachin Kale <sachinpkale@gmail.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: Bharathwaj G <bharath78910@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add consumers to remote store based index settings (#14764)

Signed-off-by: Shourya Dutta Biswas <114977491+shourya035@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add matchesPluginSystemIndexPattern to SystemIndexRegistry (#14750)

* Add matchesPluginSystemIndexPattern to SystemIndexRegistry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use single data structure to keep track of system indices

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address code review comments

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add test for getAllDescriptors

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update server/src/main/java/org/opensearch/indices/SystemIndexRegistry.java

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Craig Perkins <craig5008@gmail.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Craig Perkins <craig5008@gmail.com>
Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* SPI for loading ABC templates (#14659)

* SPI for loading ABC templates

Signed-off-by: mgodwan <mgodwan@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix bulk upsert ignores the default_pipeline and final_pipeline when the auto-created index matches the index template (#12891)

* Fix bulk upsert ignores the default_pipeline and final_pipeline when auto-created index matches with the index template

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Modify changelog & comment

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Use new approach

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Fix test failure

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix flaky test due to node being used across all tests (#14787)

Signed-off-by: Mohit Godwani <mgodwan@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Star Tree Implementation [OnHeap] (#14512)

---------
Signed-off-by: Sarthak Aggarwal <sarthagg@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add Gao Binlong as maintainer (#14796)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Clear ehcache disk cache files during initialization (#14738)

* Clear ehcache disk cache files during initialization

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Adding UT to fix line coverage

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Addressing comment

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Adding more Uts for better line coverage

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Throwing exception in case we fail to clear cache files during startup

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Adding more UTs

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Adding a UT for more coverage

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Fixing gradle build

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

* Update ehcache disk cache close() logic

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>

---------

Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Refactor remote-routing-table service inline with remote state interfaces (#14668)

---------
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
Signed-off-by: Arpit-Bandejiya <abandeji@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Set version to 2.15 for determining metadata during migration to remote store

Signed-off-by: Sandeep Kumawat <skumwt@amazon.com>
Co-authored-by: Sandeep Kumawat <skumwt@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix bulk upsert ignores the default_pipeline and final_pipeline when the auto-created index matches the index template (#14793)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix create or update alias API doesn't throw exception for unsupported parameters (#14769)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Change RCSS info logs to debug (#14814)

Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* [Bugfix] Fix NPE in ReplicaShardAllocator (#13993) (#14385)

* [Bugfix] Fix NPE in ReplicaShardAllocator (#13993)

Signed-off-by: Daniil Roman <daniilroman.cv@gmail.com>

* Add fix info to CHANGELOG.md

Signed-off-by: Daniil Roman <danroman17397@gmail.com>

---------

Signed-off-by: Daniil Roman <daniilroman.cv@gmail.com>
Signed-off-by: Daniil Roman <danroman17397@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Run performance benchmark on pull requests (#14760)

* add performance benchmark workflow for pull requests

Signed-off-by: Rishabh Singh <sngri@amazon.com>

* Update PERFORMANCE_BENCHMARKS.md

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>

* Update PERFORMANCE_BENCHMARKS.md

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>

* Update .github/workflows/benchmark-pull-request.yml

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>

* Update .github/workflows/benchmark-pull-request.yml

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>

* Update .github/workflows/benchmark-pull-request.yml

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>

* Update .github/workflows/benchmark-pull-request.yml

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>

---------

Signed-off-by: Rishabh Singh <sngri@amazon.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>
Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* fix constant_keyword field type (#14807)

Signed-off-by: kkewwei <kkewwei@163.com>

test

Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* [Remote Store Migration] Reconcile remote store based index settings during STRICT mode switch (#14792)

Signed-off-by: Shourya Dutta Biswas <114977491+shourya035@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add prefix mode verification setting for repository verification (#14790)

* Add prefix mode verification setting for repository verification

Signed-off-by: Ashish Singh <ssashish@amazon.com>

* Add UTs and randomise prefix mode repository verification

Signed-off-by: Ashish Singh <ssashish@amazon.com>

* Incorporate PR review feedback

Signed-off-by: Ashish Singh <ssashish@amazon.com>

---------

Signed-off-by: Ashish Singh <ssashish@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add length check on comment body for benchmark workflow (#14834)

Signed-off-by: Rishabh Singh <sngri@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add restore-from-snapshot test procedure for snapshot run benchmark config (#14842)

Signed-off-by: Rishabh Singh <sngri@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix env variable name typo (#14843)

Signed-off-by: Rishabh Singh <sngri@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Use circuit breaker in InternalHistogram when adding empty buckets (#14754)

* introduce circuit breaker in InternalHistogram

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* use circuit breaker from reduce context

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* add test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* revert use_real_memory change in OpenSearchNode

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* add change log

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

---------

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* [Remote State] Create interface RemoteEntitiesManager (#14671)

* Create interface RemoteEntitiesManager

Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Optimise TransportNodesAction to not send DiscoveryNodes for NodeStat… (#14749)

* Optimize TransportNodesAction to not send DiscoveryNodes for NodeStats, NodesInfo and ClusterStats call

Signed-off-by: Pranshu Shukla <pranshushukla06@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Enabling term version check on local state for all ClusterManager Read Transport Actions (#14273)

* enabling term version check on local state for all admin read actions

Signed-off-by: Rajiv Kumar Vaidyanathan <rajivkv@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Reduce logging in DEBUG for MasterService:run (#14795)

* Reduce logging in DEBUG for MasteService:run by introducing short and long summary in Taskbatcher

Signed-off-by: Sumit Bansal <sumitsb@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add SplitResponseProcessor to Search Pipelines (#14800)

* Add SplitResponseProcessor for search pipelines

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Register the split processor factory

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Address code review comments

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Avoid list copy by casting array

Signed-off-by: Daniel Widdis <widdis@gmail.com>

---------

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add integration tests for RemoteRoutingTable Service. (#14631)

Signed-off-by: Shailendra Singh <singhlhs@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add SortResponseProcessor to Search Pipelines (#14785)

* Add SortResponseProcessor for search pipelines

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Add stupid and unnecessary javadocs to satisfy overly strict CI

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Split casting and sorting methods for readability

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Register the sort processor factory

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Address code review comments

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Cast individual list elements to avoid creating two lists

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Add yamlRestTests

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Clarify why there's unusual sorting

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Use instanceof instead of isAssignableFrom

Signed-off-by: Daniel Widdis <widdis@gmail.com>

---------

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix allowUnmappedFields, mapUnmappedFieldAsString settings to be applied when parsing query string query (#13957)

* Modify to invoke QueryShardContext.fieldMapper() method to apply allowUnmappedFields and mapUnmappedFieldAsString settings

Signed-off-by: imyp92 <pyw5420@gmail.com>

* Add test cases to verify returning 400 responses if unmapped fields are included for some types of query

Signed-off-by: imyp92 <pyw5420@gmail.com>

* Add changelog

Signed-off-by: imyp92 <pyw5420@gmail.com>

---------

Signed-off-by: imyp92 <pyw5420@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Co-authored-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump com.microsoft.azure:msal4j from 1.16.0 to 1.16.1 in /plugins/repository-azure (#14857)

* Bump com.microsoft.azure:msal4j in /plugins/repository-azure

Bumps [com.microsoft.azure:msal4j](https://github.com/AzureAD/microsoft-authentication-library-for-java) from 1.16.0 to 1.16.1.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-java/releases)
- [Changelog](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/changelog.txt)
- [Commits](AzureAD/microsoft-authentication-library-for-java@v1.16.0...v1.16.1)

---
updated-dependencies:
- dependency-name: com.microsoft.azure:msal4j
  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 changelog

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>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump com.gradle.develocity from 3.17.5 to 3.17.6 (#14856)

* Bump com.gradle.develocity from 3.17.5 to 3.17.6

Bumps com.gradle.develocity from 3.17.5 to 3.17.6.

---
updated-dependencies:
- dependency-name: com.gradle.develocity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Update changelog

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>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump org.jline:jline in /test/fixtures/hdfs-fixture (#14859)

Bumps [org.jline:jline](https://github.com/jline/jline3) from 3.26.2 to 3.26.3.
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](jline/jline3@jline-parent-3.26.2...jline-parent-3.26.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Use Lucene provided Persian stem (#14847)

Lucene provided Persian stem apparently isn't hooked yet and this change is
doing that based on what is done for Arabic stem support.

Signed-off-by: Ebrahim Byagowi <ebrahim@gnu.org>
Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Bump actions/checkout from 2 to 4 (#14858)

* Bump actions/checkout from 2 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Update changelog

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>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Deprecate batch_size parameter on bulk API (#14725)

By default the full _bulk payload will be passed to ingest processors as a
batch, with any sub batching logic to be implemented by each processor if
necessary.

Signed-off-by: Liyun Xiu <xiliyun@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add perms for remote snapshot cache eviction on scripted query (#14411)

Signed-off-by: Finn Carroll <carrofin@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add transport interceptor to populate queryGroupId in task headers

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Add rest, transport layer changes for Hot to warm tiering - dedicated setup (#13980)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Create listener to refresh search thread resource usage (#14832)

* [bug fix] fix incorrect coordinator node search resource usages

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* fix bug on serialization when passing task resource usage to coordinator

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* add more unit tests

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* remove query insights plugin related code

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* create per request listener to refresh task resource usage

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* Make new listener API public

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Add changelog

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Remove wrong files added

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Address review comments

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Build fix

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Make singleton

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Address review comments

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Make sure listener runs before plugin listeners

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Spotless

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Minor fix

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

---------

Signed-off-by: Chenyang Ji <cyji@amazon.com>
Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Signed-off-by: Jay Deng <jayd0104@gmail.com>
Co-authored-by: Chenyang Ji <cyji@amazon.com>
Co-authored-by: Jay Deng <jayd0104@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Caching avg total bytes and avg free bytes inside ClusterInfo (#14851)

Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Use default value when index.number_of_replicas is null (#14812)

* Use default value when index.number_of_replicas is null

Signed-off-by: Liyun Xiu <xiliyun@amazon.com>

* Add integration test

Signed-off-by: Liyun Xiu <xiliyun@amazon.com>

* Add changelog

Signed-off-by: Liyun Xiu <xiliyun@amazon.com>

---------

Signed-off-by: Liyun Xiu <xiliyun@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* [Remote Routing Table] Implement write and read flow for shard diff file. (#14684)

* Implement write and read flow to upload/download shard diff file.

Signed-off-by: Shailendra Singh <singhlhs@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Optimized ClusterStatsIndices to precomute shard stats (#14426)

* Optimize Cluster Stats Indices to precomute node level stats

Signed-off-by: Pranshu Shukla <pranshushukla06@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix constraint bug which allows more primary shards than average primary shards per index (#14908)

Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Optmising AwarenessAllocationDecider for hashmap.get call (#14761)

Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* update comment

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* Fix IngestServiceTests.testBulkRequestExecutionWithFailures (#14918)

The test would previously fail if the randomness led to only a single
indexing request being included in the bulk payload. This change
guarantees multiple indexing requests in order to ensure the batch logic
kicks in.

Also replace some unneeded mocks with real classes.

Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add queryGroupTask

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* remove unnecessary imports

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add QueryGroupTask tests

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* rename WLM transport request handler

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* add CHANGELOG entry

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* fix ut

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* address comments

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* fix UT to remove the verify for final method

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

* apply spotless

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>

---------

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Signed-off-by: Gao Binlong <gbinlong@amazon.com>
Signed-off-by: RS146BIJAY <rishavsagar4b1@gmail.com>
Signed-off-by: Chenyang Ji <cyji@amazon.com>
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: Zelin Hao <zelinhao@amazon.com>
Signed-off-by: Lukáš Vlček <lukas.vlcek@aiven.io>
Signed-off-by: kkewwei <kkewwei@163.com>
Signed-off-by: Swetha Guptha <gupthasg@amazon.com>
Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
Signed-off-by: ahmedsobeh <ahmed.sobeh@aiven.io>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Signed-off-by: Peter Alfonsi <petealft@amazon.com>
Signed-off-by: vatsal <vatsal.v.anand@gmail.com>
Signed-off-by: Sachin Kale <kalsac@amazon.com>
Signed-off-by: Shourya Dutta Biswas <114977491+shourya035@users.noreply.github.com>
Signed-off-by: Craig Perkins <craig5008@gmail.com>
Signed-off-by: mgodwan <mgodwan@amazon.com>
Signed-off-by: Mohit Godwani <mgodwan@amazon.com>
Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Signed-off-by: Sandeep Kumawat <skumwt@amazon.com>
Signed-off-by: Daniil Roman <daniilroman.cv@gmail.com>
Signed-off-by: Daniil Roman <danroman17397@gmail.com>
Signed-off-by: Rishabh Singh <sngri@amazon.com>
Signed-off-by: Rishabh Singh <rishabhksingh@gmail.com>
Signed-off-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Signed-off-by: Ashish Singh <ssashish@amazon.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: Pranshu Shukla <pranshushukla06@gmail.com>
Signed-off-by: Rajiv Kumar Vaidyanathan <rajivkv@amazon.com>
Signed-off-by: Sumit Bansal <sumitsb@amazon.com>
Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: Shailendra Singh <singhlhs@amazon.com>
Signed-off-by: imyp92 <pyw5420@gmail.com>
Signed-off-by: gaobinlong <gbinlong@amazon.com>
Signed-off-by: Ebrahim Byagowi <ebrahim@gnu.org>
Signed-off-by: Liyun Xiu <xiliyun@amazon.com>
Signed-off-by: Finn Carroll <carrofin@amazon.com>
Signed-off-by: Neetika Singhal <neetiks@amazon.com>
Signed-off-by: Jay Deng <jayd0104@gmail.com>
Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: Shivansh Arora <hishiv@amazon.com>
Co-authored-by: Arpit-Bandejiya <abandeji@amazon.com>
Co-authored-by: gaobinlong <gbinlong@amazon.com>
Co-authored-by: rishavz_sagar <rishavsagar4b1@gmail.com>
Co-authored-by: Chenyang Ji <cyji@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: Sandesh Kumar <sandeshkr419@gmail.com>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: Zelin Hao <zelinhao@amazon.com>
Co-authored-by: Lukáš Vlček <lukas.vlcek@aiven.io>
Co-authored-by: kkewwei <kkewwei@163.com>
Co-authored-by: SwethaGuptha <156877431+SwethaGuptha@users.noreply.github.com>
Co-authored-by: Sooraj Sinha <81695996+soosinha@users.noreply.github.com>
Co-authored-by: Ahmed Sobeh <ahmed.sobeh@aiven.io>
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: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Siddhant Deshmukh <deshsid@amazon.com>
Co-authored-by: Peter Alfonsi <peter.alfonsi@gmail.com>
Co-authored-by: Peter Alfonsi <petealft@amazon.com>
Co-authored-by: Vatsal <36672090+imvtsl@users.noreply.github.com>
Co-authored-by: Robin Friedmann <robinfriedmann.rf@gmail.com>
Co-authored-by: Sachin Kale <sachinpkale@gmail.com>
Co-authored-by: Bharathwaj G <bharath78910@gmail.com>
Co-authored-by: Shourya Dutta Biswas <114977491+shourya035@users.noreply.github.com>
Co-authored-by: Craig Perkins <craig5008@gmail.com>
Co-authored-by: Andriy Redko <drreta@gmail.com>
Co-authored-by: Mohit Godwani <81609427+mgodwan@users.noreply.github.com>
Co-authored-by: Sarthak Aggarwal <sarthagg@amazon.com>
Co-authored-by: Sagar <99425694+sgup432@users.noreply.github.com>
Co-authored-by: Sandeep Kumawat <2025sandeepkumawat@gmail.com>
Co-authored-by: Sandeep Kumawat <skumwt@amazon.com>
Co-authored-by: Daniil Roman <danroman17397@gmail.com>
Co-authored-by: Rishabh Singh <rishabhksingh@gmail.com>
Co-authored-by: kkewwei <kewei.11@bytedance.com>
Co-authored-by: Daniel (dB.) Doubrovkine <dblock@amazon.com>
Co-authored-by: Ashish Singh <ssashish@amazon.com>
Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
Co-authored-by: Pranshu Shukla <55992439+Pranshu-S@users.noreply.github.com>
Co-authored-by: rajiv-kv <157019998+rajiv-kv@users.noreply.github.com>
Co-authored-by: Sumit Bansal <sumit.asr@gmail.com>
Co-authored-by: Daniel Widdis <widdis@gmail.com>
Co-authored-by: shailendra0811 <167273922+shailendra0811@users.noreply.github.com>
Co-authored-by: Park, Yeongwu <pyw5420@gmail.com>
Co-authored-by: ebraminio <ebraminio@gmail.com>
Co-authored-by: Liyun Xiu <xiliyun@amazon.com>
Co-authored-by: Finn <carrofin@amazon.com>
Co-authored-by: Neetika Singhal <neetiks@amazon.com>
Co-authored-by: Jay Deng <jayd0104@gmail.com>
Co-authored-by: Gaurav Bafna <85113518+gbbafna@users.noreply.github.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 10 changed files with 320 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased 2.x]
### Added
- Fix for hasInitiatedFetching to fix allocation explain and manual reroute APIs (([#14972](https://github.com/opensearch-project/OpenSearch/pull/14972))
- [Workload Management] Add queryGroupId to Task ([14708](https://github.com/opensearch-project/OpenSearch/pull/14708))
- Add basic aggregation support for derived fields ([#14618](https://github.com/opensearch-project/OpenSearch/pull/14618))

### Dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
import org.opensearch.core.tasks.TaskId;
import org.opensearch.search.fetch.ShardFetchSearchRequest;
import org.opensearch.search.internal.ShardSearchRequest;
import org.opensearch.tasks.CancellableTask;
import org.opensearch.tasks.SearchBackpressureTask;
import org.opensearch.wlm.QueryGroupTask;

import java.util.Map;
import java.util.function.Supplier;
Expand All @@ -50,7 +50,7 @@
* @opensearch.api
*/
@PublicApi(since = "1.0.0")
public class SearchShardTask extends CancellableTask implements SearchBackpressureTask {
public class SearchShardTask extends QueryGroupTask implements SearchBackpressureTask {
// generating metadata in a lazy way since source can be quite big
private final MemoizedSupplier<String> metadataSupplier;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import org.opensearch.common.annotation.PublicApi;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.tasks.TaskId;
import org.opensearch.tasks.CancellableTask;
import org.opensearch.tasks.SearchBackpressureTask;
import org.opensearch.wlm.QueryGroupTask;

import java.util.Map;
import java.util.function.Supplier;
Expand All @@ -49,7 +49,7 @@
* @opensearch.api
*/
@PublicApi(since = "1.0.0")
public class SearchTask extends CancellableTask implements SearchBackpressureTask {
public class SearchTask extends QueryGroupTask implements SearchBackpressureTask {
// generating description in a lazy way since source can be quite big
private final Supplier<String> descriptionSupplier;
private SearchProgressListener progressListener = SearchProgressListener.NOOP;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
import org.opensearch.transport.RemoteTransportException;
import org.opensearch.transport.Transport;
import org.opensearch.transport.TransportService;
import org.opensearch.wlm.QueryGroupTask;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -442,6 +443,12 @@ private void executeRequest(
);
searchRequestContext.getSearchRequestOperationsListener().onRequestStart(searchRequestContext);

// At this point either the QUERY_GROUP_ID header will be present in ThreadContext either via ActionFilter
// or HTTP header (HTTP header will be deprecated once ActionFilter is implemented)
if (task instanceof QueryGroupTask) {
((QueryGroupTask) task).setQueryGroupId(threadPool.getThreadContext());
}

PipelinedRequest searchRequest;
ActionListener<SearchResponse> listener;
try {
Expand Down
10 changes: 9 additions & 1 deletion server/src/main/java/org/opensearch/node/Node.java
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@
import org.opensearch.transport.TransportService;
import org.opensearch.usage.UsageService;
import org.opensearch.watcher.ResourceWatcherService;
import org.opensearch.wlm.WorkloadManagementTransportInterceptor;

import javax.net.ssl.SNIHostName;

Expand Down Expand Up @@ -1047,14 +1048,21 @@ protected Node(
admissionControlService
);

WorkloadManagementTransportInterceptor workloadManagementTransportInterceptor = new WorkloadManagementTransportInterceptor(
threadPool
);

final Collection<SecureSettingsFactory> secureSettingsFactories = pluginsService.filterPlugins(Plugin.class)
.stream()
.map(p -> p.getSecureSettingFactory(settings))
.filter(Optional::isPresent)
.map(Optional::get)
.collect(Collectors.toList());

List<TransportInterceptor> transportInterceptors = List.of(admissionControlTransportInterceptor);
List<TransportInterceptor> transportInterceptors = List.of(
admissionControlTransportInterceptor,
workloadManagementTransportInterceptor
);
final NetworkModule networkModule = new NetworkModule(
settings,
pluginsService.filterPlugins(NetworkPlugin.class),
Expand Down
76 changes: 76 additions & 0 deletions server/src/main/java/org/opensearch/wlm/QueryGroupTask.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.wlm;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.core.tasks.TaskId;
import org.opensearch.tasks.CancellableTask;

import java.util.Map;
import java.util.Optional;
import java.util.function.Supplier;

import static org.opensearch.search.SearchService.NO_TIMEOUT;

/**
* Base class to define QueryGroup tasks
*/
public class QueryGroupTask extends CancellableTask {

private static final Logger logger = LogManager.getLogger(QueryGroupTask.class);
public static final String QUERY_GROUP_ID_HEADER = "queryGroupId";
public static final Supplier<String> DEFAULT_QUERY_GROUP_ID_SUPPLIER = () -> "DEFAULT_QUERY_GROUP";
private String queryGroupId;

public QueryGroupTask(long id, String type, String action, String description, TaskId parentTaskId, Map<String, String> headers) {
this(id, type, action, description, parentTaskId, headers, NO_TIMEOUT);
}

public QueryGroupTask(
long id,
String type,
String action,
String description,
TaskId parentTaskId,
Map<String, String> headers,
TimeValue cancelAfterTimeInterval
) {
super(id, type, action, description, parentTaskId, headers, cancelAfterTimeInterval);
}

/**
* This method should always be called after calling setQueryGroupId at least once on this object
* @return task queryGroupId
*/
public final String getQueryGroupId() {
if (queryGroupId == null) {
logger.warn("QueryGroup _id can't be null, It should be set before accessing it. This is abnormal behaviour ");
}
return queryGroupId;
}

/**
* sets the queryGroupId from threadContext into the task itself,
* This method was defined since the queryGroupId can only be evaluated after task creation
* @param threadContext current threadContext
*/
public final void setQueryGroupId(final ThreadContext threadContext) {
this.queryGroupId = Optional.ofNullable(threadContext)
.map(threadContext1 -> threadContext1.getHeader(QUERY_GROUP_ID_HEADER))
.orElse(DEFAULT_QUERY_GROUP_ID_SUPPLIER.get());
}

@Override
public boolean shouldCancelChildrenOnCancellation() {
return false;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.wlm;

import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportChannel;
import org.opensearch.transport.TransportInterceptor;
import org.opensearch.transport.TransportRequest;
import org.opensearch.transport.TransportRequestHandler;

/**
* This class is used to intercept search traffic requests and populate the queryGroupId header in task headers
*/
public class WorkloadManagementTransportInterceptor implements TransportInterceptor {
private final ThreadPool threadPool;

public WorkloadManagementTransportInterceptor(ThreadPool threadPool) {
this.threadPool = threadPool;
}

@Override
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(
String action,
String executor,
boolean forceExecution,
TransportRequestHandler<T> actualHandler
) {
return new RequestHandler<T>(threadPool, actualHandler);
}

/**
* This class is mainly used to populate the queryGroupId header
* @param <T> T is Search related request
*/
public static class RequestHandler<T extends TransportRequest> implements TransportRequestHandler<T> {

private final ThreadPool threadPool;
TransportRequestHandler<T> actualHandler;

public RequestHandler(ThreadPool threadPool, TransportRequestHandler<T> actualHandler) {
this.threadPool = threadPool;
this.actualHandler = actualHandler;
}

@Override
public void messageReceived(T request, TransportChannel channel, Task task) throws Exception {
if (isSearchWorkloadRequest(task)) {
((QueryGroupTask) task).setQueryGroupId(threadPool.getThreadContext());
}
actualHandler.messageReceived(request, channel, task);
}

boolean isSearchWorkloadRequest(Task task) {
return task instanceof QueryGroupTask;
}
}
}
44 changes: 44 additions & 0 deletions server/src/test/java/org/opensearch/wlm/QueryGroupTaskTests.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.wlm;

import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.threadpool.TestThreadPool;
import org.opensearch.threadpool.ThreadPool;

import java.util.Collections;

import static org.opensearch.wlm.QueryGroupTask.DEFAULT_QUERY_GROUP_ID_SUPPLIER;
import static org.opensearch.wlm.QueryGroupTask.QUERY_GROUP_ID_HEADER;

public class QueryGroupTaskTests extends OpenSearchTestCase {
private ThreadPool threadPool;
private QueryGroupTask sut;

public void setUp() throws Exception {
super.setUp();
threadPool = new TestThreadPool(getTestName());
sut = new QueryGroupTask(123, "transport", "Search", "test task", null, Collections.emptyMap());
}

public void tearDown() throws Exception {
super.tearDown();
threadPool.shutdown();
}

public void testSuccessfulSetQueryGroupId() {
sut.setQueryGroupId(threadPool.getThreadContext());
assertEquals(DEFAULT_QUERY_GROUP_ID_SUPPLIER.get(), sut.getQueryGroupId());

threadPool.getThreadContext().putHeader(QUERY_GROUP_ID_HEADER, "akfanglkaglknag2332");

sut.setQueryGroupId(threadPool.getThreadContext());
assertEquals("akfanglkaglknag2332", sut.getQueryGroupId());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.wlm;

import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.threadpool.TestThreadPool;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportRequest;
import org.opensearch.transport.TransportRequestHandler;
import org.opensearch.wlm.WorkloadManagementTransportInterceptor.RequestHandler;

import static org.opensearch.threadpool.ThreadPool.Names.SAME;

public class WorkloadManagementTransportInterceptorTests extends OpenSearchTestCase {

private ThreadPool threadPool;
private WorkloadManagementTransportInterceptor sut;

public void setUp() throws Exception {
super.setUp();
threadPool = new TestThreadPool(getTestName());
sut = new WorkloadManagementTransportInterceptor(threadPool);
}

public void tearDown() throws Exception {
super.tearDown();
threadPool.shutdown();
}

public void testInterceptHandler() {
TransportRequestHandler<TransportRequest> requestHandler = sut.interceptHandler("Search", SAME, false, null);
assertTrue(requestHandler instanceof RequestHandler);
}
}
Loading

0 comments on commit eb306d2

Please sign in to comment.