Skip to content

Commit 3d631f2

Browse files
kaushalmahi12shiv0408alchemist51gaobinlongRS146BIJAY
authored and
harshavamsi
committed
Add queryGroupId to search workload tasks at co-ordinator and data node level (opensearch-project#14708)
* add logic to add headers to Task Signed-off-by: Kaushal Kumar <[email protected]> * add logic to add queryGroupId to task headers Signed-off-by: Kaushal Kumar <[email protected]> * remove redundant code Signed-off-by: Kaushal Kumar <[email protected]> * add changelog entry Signed-off-by: Kaushal Kumar <[email protected]> * address comments Signed-off-by: Kaushal Kumar <[email protected]> * fix precommit Signed-off-by: Kaushal Kumar <[email protected]> * Add UTs for RemoteIndexMetadataManager (opensearch-project#14660) Signed-off-by: Shivansh Arora <[email protected]> Co-authored-by: Arpit-Bandejiya <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix match_phrase_prefix_query not working on text field with multiple values and index_prefixes (opensearch-project#10959) * Fix match_phrase_prefix_query not working on text field with multiple values and index_prefixes Signed-off-by: Gao Binlong <[email protected]> * Add more test Signed-off-by: Gao Binlong <[email protected]> * modify change log Signed-off-by: Gao Binlong <[email protected]> * Fix test failure Signed-off-by: Gao Binlong <[email protected]> * Change the indexAnalyzer used by prefix field Signed-off-by: Gao Binlong <[email protected]> * Skip old version for yaml test Signed-off-by: Gao Binlong <[email protected]> * Optimize some code Signed-off-by: Gao Binlong <[email protected]> * Fix test failure Signed-off-by: Gao Binlong <[email protected]> * Modify yaml test description Signed-off-by: Gao Binlong <[email protected]> * Remove the name parameter for setAnalyzer() Signed-off-by: Gao Binlong <[email protected]> --------- Signed-off-by: Gao Binlong <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Offline calculation of total shard per node and caching it for weight calculation inside LocalShardBalancer (opensearch-project#14675) Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * [bug fix] validate lower bound for top n size (opensearch-project#14587) Signed-off-by: Chenyang Ji <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Create SystemIndexRegistry with helper method matchesSystemIndex (opensearch-project#14415) * Create new extension point in SystemIndexPlugin for a single plugin to get registered system indices Signed-off-by: Craig Perkins <[email protected]> * Add to CHANGELOG Signed-off-by: Craig Perkins <[email protected]> * WIP on system indices from IndexNameExpressionResolver Signed-off-by: Craig Perkins <[email protected]> * Add test in IndexNameExpressionResolverTests Signed-off-by: Craig Perkins <[email protected]> * Remove changes in SystemIndexPlugin Signed-off-by: Craig Perkins <[email protected]> * Add method in IndexNameExpressionResolver to get matching system indices Signed-off-by: Craig Perkins <[email protected]> * Show how resolver can be chained to get system indices Signed-off-by: Craig Perkins <[email protected]> * Fix forbiddenApis check Signed-off-by: Craig Perkins <[email protected]> * Update CHANGELOG Signed-off-by: Craig Perkins <[email protected]> * Make SystemIndices internal Signed-off-by: Craig Perkins <[email protected]> * Remove unneeded changes Signed-off-by: Craig Perkins <[email protected]> * Fix CI failures Signed-off-by: Craig Perkins <[email protected]> * Fix precommit errors Signed-off-by: Craig Perkins <[email protected]> * Use Regex instead of WildcardMatcher Signed-off-by: Craig Perkins <[email protected]> * Address code review feedback Signed-off-by: Craig Perkins <[email protected]> * Allow caller to pass index expressions Signed-off-by: Craig Perkins <[email protected]> * Create SystemIndexRegistry Signed-off-by: Craig Perkins <[email protected]> * Update CHANGELOG Signed-off-by: Craig Perkins <[email protected]> * Remove singleton limitation Signed-off-by: Craig Perkins <[email protected]> * Add javadoc Signed-off-by: Craig Perkins <[email protected]> * Add @experimentalapi annotation Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Refactor Grok validate pattern to iterative approach (opensearch-project#14206) * grok validate patterns recusrion to iterative Signed-off-by: Sandesh Kumar <[email protected]> * Add max depth in resolving a pattern to avoid OOM Signed-off-by: Sandesh Kumar <[email protected]> * change path from deque to arraylist Signed-off-by: Sandesh Kumar <[email protected]> * rename queue to stack Signed-off-by: Sandesh Kumar <[email protected]> * Change max depth to 500 Signed-off-by: Sandesh Kumar <[email protected]> * typo originPatternName fix Signed-off-by: Sandesh Kumar <[email protected]> * spotless Signed-off-by: Sandesh Kumar <[email protected]> --------- Signed-off-by: Sandesh Kumar <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Bump opentelemetry from 1.39.0 to 1.40.0 (opensearch-project#14674) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Bump jackson from 2.17.1 to 2.17.2 (opensearch-project#14687) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add release notes for release 1.3.18 (opensearch-project#14699) Signed-off-by: Zelin Hao <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Bump reactor from 3.5.19 to 3.5.20 (opensearch-project#14697) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add unit tests for read flow of RemoteClusterStateService and bug fix for transient settings (opensearch-project#14476) Signed-off-by: Shivansh Arora <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Update version check for the bug fix of match_phrase_prefix_query not working on text field with multiple values and index_prefixes (opensearch-project#14703) Signed-off-by: Gao Binlong <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Remove unnecessary cast to int from test (opensearch-project#14696) Signed-off-by: Lukáš Vlček <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * print reason why parent task was cancelled (opensearch-project#14604) Signed-off-by: kkewwei <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Use set of shard routing for shard in unassigned shard batch check. (opensearch-project#14533) Signed-off-by: Swetha Guptha <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add versioning for UploadedIndexMetadata (opensearch-project#14677) * Add versioning for UploadedIndexMetadata * Handle componentPrefix for backward compatibility Signed-off-by: Sooraj Sinha <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix: update help output for _cat (opensearch-project#14722) * fixed help output for _cat Signed-off-by: ahmedsobeh <[email protected]> * updated changelog Signed-off-by: ahmedsobeh <[email protected]> * updated changelog Signed-off-by: ahmedsobeh <[email protected]> --------- Signed-off-by: ahmedsobeh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix hdfs-fixture kerb-admin & hadoop-minicluster dependencies are not being updated / false positive reports on CVEs (opensearch-project#14729) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Update to Gradle 8.9 (opensearch-project#14574) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix hdfs-fixture hadoop-minicluster dependencies are not being updated / false positive reports on CVEs (opensearch-project#14732) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add `strict_allow_templates` dynamic mapping option (opensearch-project#14555) * The dynamic mapping parameter supports strict_allow_templates Signed-off-by: Gao Binlong <[email protected]> * Modify change log Signed-off-by: Gao Binlong <[email protected]> * Modify skip version in yml test file Signed-off-by: Gao Binlong <[email protected]> * Refactor some code Signed-off-by: Gao Binlong <[email protected]> * Keep the old methods Signed-off-by: Gao Binlong <[email protected]> * change public to private Signed-off-by: Gao Binlong <[email protected]> * Optimize some code Signed-off-by: Gao Binlong <[email protected]> * Do not override toString method for Dynamic Signed-off-by: Gao Binlong <[email protected]> * Optimize some code and modify the changelog Signed-off-by: Gao Binlong <[email protected]> --------- Signed-off-by: Gao Binlong <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Bump net.minidev:json-smart from 2.5.0 to 2.5.1 in /plugins/repository-azure (opensearch-project#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] <[email protected]> * Updating SHAs Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * remove query insights plugin from core (opensearch-project#14743) Signed-off-by: Chenyang Ji <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add `strict_allow_templates` dynamic mapping option (opensearch-project#14555) (opensearch-project#14737) (opensearch-project#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 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Andriy Redko <[email protected]> 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 <[email protected]> * Fix create or update alias API doesn't throw exception for unsupported parameters (opensearch-project#14719) * Fix create or update alias API doesn't throw exception for unsupported parameters Signed-off-by: Gao Binlong <[email protected]> * Update version check in yml test Signed-off-by: Gao Binlong <[email protected]> * modify change log Signed-off-by: Gao Binlong <[email protected]> --------- Signed-off-by: Gao Binlong <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Remove query categorization from core (opensearch-project#14759) * Remove query categorization from core Signed-off-by: Siddhant Deshmukh <[email protected]> * Add changelog Signed-off-by: Siddhant Deshmukh <[email protected]> * Trigger Build Signed-off-by: Siddhant Deshmukh <[email protected]> --------- Signed-off-by: Siddhant Deshmukh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add changes to propagate queryGroupId across child requests and nodes (opensearch-project#14614) * add query group header propagator Signed-off-by: Kaushal Kumar <[email protected]> * apply spotless check Signed-off-by: Kaushal Kumar <[email protected]> * add new propagator in ThreadContext Signed-off-by: Kaushal Kumar <[email protected]> * spotlessApply Signed-off-by: Kaushal Kumar <[email protected]> * address comments Signed-off-by: Kaushal Kumar <[email protected]> * Bump com.microsoft.azure:msal4j from 1.15.1 to 1.16.0 in /plugins/repository-azure (opensearch-project#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] <[email protected]> * Updating SHAs Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * [Bugfix] Fix ICacheKeySerializerTests flakiness (opensearch-project#14564) * Fix testInvalidInput flakiness Signed-off-by: Peter Alfonsi <[email protected]> * Addressed andrross's comment Signed-off-by: Peter Alfonsi <[email protected]> * rerun security check Signed-off-by: Peter Alfonsi <[email protected]> --------- Signed-off-by: Peter Alfonsi <[email protected]> Co-authored-by: Peter Alfonsi <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Correct typo in method name (opensearch-project#14621) Signed-off-by: vatsal <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Refactoring FilterPath.parse by using an iterative approach instead of recursion. (opensearch-project#14200) * Refactor FilterPath parse function (opensearch-project#12067) Signed-off-by: Robin Friedmann <[email protected]> * Implement unit tests for FilterPathTests (opensearch-project#12067) Signed-off-by: Robin Friedmann <[email protected]> * Write warn log if Filter is empty; Add comments (opensearch-project#12067) Signed-off-by: Robin Friedmann <[email protected]> * Add changelog Signed-off-by: Siddhant Deshmukh <[email protected]> * Remove unnecessary log statement Signed-off-by: Siddhant Deshmukh <[email protected]> * Remove unused logger Signed-off-by: Siddhant Deshmukh <[email protected]> * Spotless apply Signed-off-by: Siddhant Deshmukh <[email protected]> * Remove incorrect changelog Signed-off-by: Siddhant Deshmukh <[email protected]> --------- Signed-off-by: Siddhant Deshmukh <[email protected]> Co-authored-by: Robin Friedmann <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Removing String format in RemoteStoreMigrationAllocationDecider to optimise performance(opensearch-project#14612) Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Clear templates before Adding; Use NamedWriteableAwareStreamInput for RemoteCustomMetadata; Correct the check for deciding upload of HashesOfConsistentSettings (opensearch-project#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 <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * add changelog Signed-off-by: Kaushal Kumar <[email protected]> * add PR link changelog Signed-off-by: Kaushal Kumar <[email protected]> * Improve reroute performance by optimising List.removeAll in LocalShardsBalancer to filter remote search shard from relocation decision (opensearch-project#14613) Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix assertion failure while deleting remote backed index (opensearch-project#14601) Signed-off-by: Sachin Kale <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Allow system index warning in OpenSearchRestTestCase.refreshAllIndices (opensearch-project#14635) * Allow system index warning Signed-off-by: Craig Perkins <[email protected]> * Add to CHANGELOG Signed-off-by: Craig Perkins <[email protected]> * Address code review comments Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Star tree codec changes (opensearch-project#14514) --------- Signed-off-by: Bharathwaj G <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Bump com.github.spullara.mustache.java:compiler from 0.9.13 to 0.9.14 in /modules/lang-mustache (opensearch-project#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] <[email protected]> * Updating SHAs Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * Bump net.minidev:accessors-smart from 2.5.0 to 2.5.1 in /plugins/repository-azure (opensearch-project#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] <[email protected]> * Updating SHAs Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * move query group thread context propagator out of ThreadContext Signed-off-by: Kaushal Kumar <[email protected]> --------- Signed-off-by: Kaushal Kumar <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Peter Alfonsi <[email protected]> Signed-off-by: vatsal <[email protected]> Signed-off-by: Siddhant Deshmukh <[email protected]> Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: Sooraj Sinha <[email protected]> Signed-off-by: Sachin Kale <[email protected]> Signed-off-by: Craig Perkins <[email protected]> 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 <[email protected]> Co-authored-by: Peter Alfonsi <[email protected]> Co-authored-by: Vatsal <[email protected]> Co-authored-by: Siddhant Deshmukh <[email protected]> Co-authored-by: Robin Friedmann <[email protected]> Co-authored-by: rishavz_sagar <[email protected]> Co-authored-by: Sooraj Sinha <[email protected]> Co-authored-by: Sachin Kale <[email protected]> Co-authored-by: Craig Perkins <[email protected]> Co-authored-by: Bharathwaj G <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add consumers to remote store based index settings (opensearch-project#14764) Signed-off-by: Shourya Dutta Biswas <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add matchesPluginSystemIndexPattern to SystemIndexRegistry (opensearch-project#14750) * Add matchesPluginSystemIndexPattern to SystemIndexRegistry Signed-off-by: Craig Perkins <[email protected]> * Add to CHANGELOG Signed-off-by: Craig Perkins <[email protected]> * Use single data structure to keep track of system indices Signed-off-by: Craig Perkins <[email protected]> * Address code review comments Signed-off-by: Craig Perkins <[email protected]> * Add test for getAllDescriptors Signed-off-by: Craig Perkins <[email protected]> * Update server/src/main/java/org/opensearch/indices/SystemIndexRegistry.java Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * SPI for loading ABC templates (opensearch-project#14659) * SPI for loading ABC templates Signed-off-by: mgodwan <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix bulk upsert ignores the default_pipeline and final_pipeline when the auto-created index matches the index template (opensearch-project#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 <[email protected]> * Modify changelog & comment Signed-off-by: Gao Binlong <[email protected]> * Use new approach Signed-off-by: Gao Binlong <[email protected]> * Fix test failure Signed-off-by: Gao Binlong <[email protected]> --------- Signed-off-by: Gao Binlong <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix flaky test due to node being used across all tests (opensearch-project#14787) Signed-off-by: Mohit Godwani <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Star Tree Implementation [OnHeap] (opensearch-project#14512) --------- Signed-off-by: Sarthak Aggarwal <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add Gao Binlong as maintainer (opensearch-project#14796) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Clear ehcache disk cache files during initialization (opensearch-project#14738) * Clear ehcache disk cache files during initialization Signed-off-by: Sagar Upadhyaya <[email protected]> * Adding UT to fix line coverage Signed-off-by: Sagar Upadhyaya <[email protected]> * Addressing comment Signed-off-by: Sagar Upadhyaya <[email protected]> * Adding more Uts for better line coverage Signed-off-by: Sagar Upadhyaya <[email protected]> * Throwing exception in case we fail to clear cache files during startup Signed-off-by: Sagar Upadhyaya <[email protected]> * Adding more UTs Signed-off-by: Sagar Upadhyaya <[email protected]> * Adding a UT for more coverage Signed-off-by: Sagar Upadhyaya <[email protected]> * Fixing gradle build Signed-off-by: Sagar Upadhyaya <[email protected]> * Update ehcache disk cache close() logic Signed-off-by: Sagar Upadhyaya <[email protected]> --------- Signed-off-by: Sagar Upadhyaya <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Refactor remote-routing-table service inline with remote state interfaces (opensearch-project#14668) --------- Signed-off-by: Arpit Bandejiya <[email protected]> Signed-off-by: Arpit-Bandejiya <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Set version to 2.15 for determining metadata during migration to remote store Signed-off-by: Sandeep Kumawat <[email protected]> Co-authored-by: Sandeep Kumawat <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix bulk upsert ignores the default_pipeline and final_pipeline when the auto-created index matches the index template (opensearch-project#14793) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix create or update alias API doesn't throw exception for unsupported parameters (opensearch-project#14769) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Change RCSS info logs to debug (opensearch-project#14814) Signed-off-by: Shivansh Arora <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * [Bugfix] Fix NPE in ReplicaShardAllocator (opensearch-project#13993) (opensearch-project#14385) * [Bugfix] Fix NPE in ReplicaShardAllocator (opensearch-project#13993) Signed-off-by: Daniil Roman <[email protected]> * Add fix info to CHANGELOG.md Signed-off-by: Daniil Roman <[email protected]> --------- Signed-off-by: Daniil Roman <[email protected]> Signed-off-by: Daniil Roman <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Run performance benchmark on pull requests (opensearch-project#14760) * add performance benchmark workflow for pull requests Signed-off-by: Rishabh Singh <[email protected]> * Update PERFORMANCE_BENCHMARKS.md Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> * Update PERFORMANCE_BENCHMARKS.md Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> * Update .github/workflows/benchmark-pull-request.yml Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> * Update .github/workflows/benchmark-pull-request.yml Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> * Update .github/workflows/benchmark-pull-request.yml Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> * Update .github/workflows/benchmark-pull-request.yml Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> --------- Signed-off-by: Rishabh Singh <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * fix constant_keyword field type (opensearch-project#14807) Signed-off-by: kkewwei <[email protected]> test Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]> Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * [Remote Store Migration] Reconcile remote store based index settings during STRICT mode switch (opensearch-project#14792) Signed-off-by: Shourya Dutta Biswas <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add prefix mode verification setting for repository verification (opensearch-project#14790) * Add prefix mode verification setting for repository verification Signed-off-by: Ashish Singh <[email protected]> * Add UTs and randomise prefix mode repository verification Signed-off-by: Ashish Singh <[email protected]> * Incorporate PR review feedback Signed-off-by: Ashish Singh <[email protected]> --------- Signed-off-by: Ashish Singh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * add length check on comment body for benchmark workflow (opensearch-project#14834) Signed-off-by: Rishabh Singh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add restore-from-snapshot test procedure for snapshot run benchmark config (opensearch-project#14842) Signed-off-by: Rishabh Singh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix env variable name typo (opensearch-project#14843) Signed-off-by: Rishabh Singh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Use circuit breaker in InternalHistogram when adding empty buckets (opensearch-project#14754) * introduce circuit breaker in InternalHistogram Signed-off-by: bowenlan-amzn <[email protected]> * use circuit breaker from reduce context Signed-off-by: bowenlan-amzn <[email protected]> * add test Signed-off-by: bowenlan-amzn <[email protected]> * revert use_real_memory change in OpenSearchNode Signed-off-by: bowenlan-amzn <[email protected]> * add change log Signed-off-by: bowenlan-amzn <[email protected]> --------- Signed-off-by: bowenlan-amzn <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * [Remote State] Create interface RemoteEntitiesManager (opensearch-project#14671) * Create interface RemoteEntitiesManager Signed-off-by: Shivansh Arora <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Optimise TransportNodesAction to not send DiscoveryNodes for NodeStat… (opensearch-project#14749) * Optimize TransportNodesAction to not send DiscoveryNodes for NodeStats, NodesInfo and ClusterStats call Signed-off-by: Pranshu Shukla <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Enabling term version check on local state for all ClusterManager Read Transport Actions (opensearch-project#14273) * enabling term version check on local state for all admin read actions Signed-off-by: Rajiv Kumar Vaidyanathan <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Reduce logging in DEBUG for MasterService:run (opensearch-project#14795) * Reduce logging in DEBUG for MasteService:run by introducing short and long summary in Taskbatcher Signed-off-by: Sumit Bansal <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add SplitResponseProcessor to Search Pipelines (opensearch-project#14800) * Add SplitResponseProcessor for search pipelines Signed-off-by: Daniel Widdis <[email protected]> * Register the split processor factory Signed-off-by: Daniel Widdis <[email protected]> * Address code review comments Signed-off-by: Daniel Widdis <[email protected]> * Avoid list copy by casting array Signed-off-by: Daniel Widdis <[email protected]> --------- Signed-off-by: Daniel Widdis <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add integration tests for RemoteRoutingTable Service. (opensearch-project#14631) Signed-off-by: Shailendra Singh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add SortResponseProcessor to Search Pipelines (opensearch-project#14785) * Add SortResponseProcessor for search pipelines Signed-off-by: Daniel Widdis <[email protected]> * Add stupid and unnecessary javadocs to satisfy overly strict CI Signed-off-by: Daniel Widdis <[email protected]> * Split casting and sorting methods for readability Signed-off-by: Daniel Widdis <[email protected]> * Register the sort processor factory Signed-off-by: Daniel Widdis <[email protected]> * Address code review comments Signed-off-by: Daniel Widdis <[email protected]> * Cast individual list elements to avoid creating two lists Signed-off-by: Daniel Widdis <[email protected]> * Add yamlRestTests Signed-off-by: Daniel Widdis <[email protected]> * Clarify why there's unusual sorting Signed-off-by: Daniel Widdis <[email protected]> * Use instanceof instead of isAssignableFrom Signed-off-by: Daniel Widdis <[email protected]> --------- Signed-off-by: Daniel Widdis <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix allowUnmappedFields, mapUnmappedFieldAsString settings to be applied when parsing query string query (opensearch-project#13957) * Modify to invoke QueryShardContext.fieldMapper() method to apply allowUnmappedFields and mapUnmappedFieldAsString settings Signed-off-by: imyp92 <[email protected]> * Add test cases to verify returning 400 responses if unmapped fields are included for some types of query Signed-off-by: imyp92 <[email protected]> * Add changelog Signed-off-by: imyp92 <[email protected]> --------- Signed-off-by: imyp92 <[email protected]> Signed-off-by: gaobinlong <[email protected]> Co-authored-by: gaobinlong <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Bump com.microsoft.azure:msal4j from 1.16.0 to 1.16.1 in /plugins/repository-azure (opensearch-project#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] <[email protected]> * Updating SHAs Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * Bump com.gradle.develocity from 3.17.5 to 3.17.6 (opensearch-project#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] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * Bump org.jline:jline in /test/fixtures/hdfs-fixture (opensearch-project#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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Kaushal Kumar <[email protected]> * Use Lucene provided Persian stem (opensearch-project#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 <[email protected]> Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]> Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Bump actions/checkout from 2 to 4 (opensearch-project#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] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * Deprecate batch_size parameter on bulk API (opensearch-project#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 <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Add perms for remote snapshot cache eviction on scripted query (opensearch-project#14411) Signed-off-by: Finn Carroll <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * add transport interceptor to populate queryGroupId in task headers Signed-off-by: Kaushal Kumar <[email protected]> * Add rest, transport layer changes for Hot to warm tiering - dedicated setup (opensearch-project#13980) Signed-off-by: Neetika Singhal <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Create listener to refresh search thread resource usage (opensearch-project#14832) * [bug fix] fix incorrect coordinator node search resource usages Signed-off-by: Chenyang Ji <[email protected]> * fix bug on serialization when passing task resource usage to coordinator Signed-off-by: Chenyang Ji <[email protected]> * add more unit tests Signed-off-by: Chenyang Ji <[email protected]> * remove query insights plugin related code Signed-off-by: Chenyang Ji <[email protected]> * create per request listener to refresh task resource usage Signed-off-by: Chenyang Ji <[email protected]> * Make new listener API public Signed-off-by: Siddhant Deshmukh <[email protected]> * Add changelog Signed-off-by: Siddhant Deshmukh <[email protected]> * Remove wrong files added Signed-off-by: Siddhant Deshmukh <[email protected]> * Address review comments Signed-off-by: Siddhant Deshmukh <[email protected]> * Build fix Signed-off-by: Siddhant Deshmukh <[email protected]> * Make singleton Signed-off-by: Siddhant Deshmukh <[email protected]> * Address review comments Signed-off-by: Siddhant Deshmukh <[email protected]> * Make sure listener runs before plugin listeners Signed-off-by: Siddhant Deshmukh <[email protected]> * Spotless Signed-off-by: Siddhant Deshmukh <[email protected]> * Minor fix Signed-off-by: Siddhant Deshmukh <[email protected]> --------- Signed-off-by: Chenyang Ji <[email protected]> Signed-off-by: Siddhant Deshmukh <[email protected]> Signed-off-by: Jay Deng <[email protected]> Co-authored-by: Chenyang Ji <[email protected]> Co-authored-by: Jay Deng <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Caching avg total bytes and avg free bytes inside ClusterInfo (opensearch-project#14851) Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Use default value when index.number_of_replicas is null (opensearch-project#14812) * Use default value when index.number_of_replicas is null Signed-off-by: Liyun Xiu <[email protected]> * Add integration test Signed-off-by: Liyun Xiu <[email protected]> * Add changelog Signed-off-by: Liyun Xiu <[email protected]> --------- Signed-off-by: Liyun Xiu <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * [Remote Routing Table] Implement write and read flow for shard diff file. (opensearch-project#14684) * Implement write and read flow to upload/download shard diff file. Signed-off-by: Shailendra Singh <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Optimized ClusterStatsIndices to precomute shard stats (opensearch-project#14426) * Optimize Cluster Stats Indices to precomute node level stats Signed-off-by: Pranshu Shukla <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Fix constraint bug which allows more primary shards than average primary shards per index (opensearch-project#14908) Signed-off-by: Gaurav Bafna <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * Optmising AwarenessAllocationDecider for hashmap.get call (opensearch-project#14761) Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * update comment Signed-off-by: Kaushal Kumar <[email protected]> * Fix IngestServiceTests.testBulkRequestExecutionWithFailures (opensearch-project#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 <[email protected]> Signed-off-by: Kaushal Kumar <[email protected]> * add queryGroupTask Signed-off-by: Kaushal Kumar <[email protected]> * remove unnecessary imports Signed-off-by: Kaushal Kumar <[email protected]> * add QueryGroupTask tests Signed-off-by: Kaushal Kumar <[email protected]> * rename WLM transport request handler Signed-off-by: Kaushal Kumar <[email protected]> * add CHANGELOG entry Signed-off-by: Kaushal Kumar <[email protected]> * fix ut Signed-off-by: Kaushal Kumar <[email protected]> * address comments Signed-off-by: Kaushal Kumar <[email protected]> * fix UT to remove the verify for final method Signed-off-by: Kaushal Kumar <[email protected]> * apply spotless Signed-off-by: Kaushal Kumar <[email protected]> --------- Signed-off-by: Kaushal Kumar <[email protected]> Signed-off-by: Shivansh Arora <[email protected]> Signed-off-by: Gao Binlong <[email protected]> Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: Chenyang Ji <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Sandesh Kumar <[email protected]> Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Zelin Hao <[email protected]> Signed-off-by: Lukáš Vlček <[email protected]> Signed-off-by: kkewwei <[email protected]> Signed-off-by: Swetha Guptha <[email protected]> Signed-off-by: Sooraj Sinha <[email protected]> Signed-off-by: ahmedsobeh <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Siddhant Deshmukh <[email protected]> Signed-off-by: Peter Alfonsi <[email protected]> Signed-off-by: vatsal <[email protected]> Signed-off-by: Sachin Kale <[email protected]> Signed-off-by: Shourya Dutta Biswas <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: mgodwan <[email protected]> Signed-off-by: Mohit Godwani <[email protected]> Signed-off-by: Sagar Upadhyaya <[email protected]> Signed-off-by: Sandeep Kumawat <[email protected]> Signed-off-by: Daniil Roman <[email protected]> Signed-off-by: Daniil Roman <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]> Signed-off-by: Ashish Singh <[email protected]> Signed-off-by: bowenlan-amzn <[email protected]> Signed-off-by: Pranshu Shukla <[email protected]> Signed-off-by: Rajiv Kumar Vaidyanathan <[email protected]> Signed-off-by: Sumit Bansal <[email protected]> Signed-off-by: Daniel Widdis <[email protected]> Signed-off-by: Shailendra Singh <[email protected]> Signed-off-by: imyp92 <[email protected]> Signed-off-by: gaobinlong <[email protected]> Signed-off-by: Ebrahim Byagowi <[email protected]> Signed-off-by: Liyun Xiu <[email protected]> Signed-off-by: Finn Carroll <[email protected]> Signed-off-by: Neetika Singhal <[email protected]> Signed-off-by: Jay Deng <[email protected]> Signed-off-by: Gaurav Bafna <[email protected]> Signed-off-by: Andrew Ross <[email protected]> Co-authored-by: Shivansh Arora <[email protected]> Co-authored-by: Arpit-Bandejiya <[email protected]> Co-authored-by: gaobinlong <[email protected]> Co-authored-by: rishavz_sagar <[email protected]> Co-authored-by: Chenyang Ji <[email protected]> Co-authored-by: Craig Perkins <[email protected]> Co-authored-by: Sandesh Kumar <[email protected]> Co-authored-by: Andriy Redko <[email protected]> Co-authored-by: Zelin Hao <[email protected]> Co-authored-by: Lukáš Vlček <[email protected]> Co-authored-by: kkewwei <[email protected]> Co-authored-by: SwethaGuptha <[email protected]> Co-authored-by: Sooraj Sinha <[email protected]> Co-authored-by: Ahmed Sobeh <[email protected]> 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 <[email protected]> Co-authored-by: Peter Alfonsi <[email protected]> Co-authored-by: Peter Alfonsi <[email protected]> Co-authored-by: Vatsal <[email protected]> Co-authored-by: Robin Friedmann <[email protected]> Co-authored-by: Sachin Kale <[email protected]> Co-authored-by: Bharathwaj G <[email protected]> Co-authored-by: Shourya Dutta Biswas <[email protected]> Co-authored-by: Craig Perkins <[email protected]> Co-authored-by: Andriy Redko <[email protected]> Co-authored-by: Mohit Godwani <[email protected]> Co-authored-by: Sarthak Aggarwal <[email protected]> Co-authored-by: Sagar <[email protected]> Co-authored-by: Sandeep Kumawat <[email protected]> Co-authored-by: Sandeep Kumawat <[email protected]> Co-authored-by: Daniil Roman <[email protected]> Co-authored-by: Rishabh Singh <[email protected]> Co-authored-by: kkewwei <[email protected]> Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]> Co-authored-by: Ashish Singh <[email protected]> Co-authored-by: bowenlan-amzn <[email protected]> Co-authored-by: Pranshu Shukla <[email protected]> Co-authored-by: rajiv-kv <[email protected]> Co-authored-by: Sumit Bansal <[email protected]> Co-authored-by: Daniel Widdis <[email protected]> Co-authored-by: shailendra0811 <[email protected]> Co-authored-by: Park, Yeongwu <[email protected]> Co-authored-by: ebraminio <[email protected]> Co-authored-by: Liyun Xiu <[email protected]> Co-authored-by: Finn <[email protected]> Co-authored-by: Neetika Singhal <[email protected]> Co-authored-by: Jay Deng <[email protected]> Co-authored-by: Gaurav Bafna <[email protected]> Co-authored-by: Andrew Ross <[email protected]>
1 parent 176385c commit 3d631f2

File tree

10 files changed

+320
-5
lines changed

10 files changed

+320
-5
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3333
- Optimize Cluster Stats Indices to precomute node level stats ([#14426](https://github.com/opensearch-project/OpenSearch/pull/14426))
3434
- Add logic to create index templates (v2) using context field ([#14811](https://github.com/opensearch-project/OpenSearch/pull/14811))
3535
- Fix for hasInitiatedFetching to fix allocation explain and manual reroute APIs (([#14972](https://github.com/opensearch-project/OpenSearch/pull/14972))
36+
- [Workload Management] Add queryGroupId to Task ([14708](https://github.com/opensearch-project/OpenSearch/pull/14708))
3637
- Add basic aggregation support for derived fields ([#14618](https://github.com/opensearch-project/OpenSearch/pull/14618))
3738
- [Range Queries] Add new approximateable query framework to short-circuit range queries ([#13788](https://github.com/opensearch-project/OpenSearch/pull/13788))
3839

‎server/src/main/java/org/opensearch/action/search/SearchShardTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import org.opensearch.core.tasks.TaskId;
3838
import org.opensearch.search.fetch.ShardFetchSearchRequest;
3939
import org.opensearch.search.internal.ShardSearchRequest;
40-
import org.opensearch.tasks.CancellableTask;
4140
import org.opensearch.tasks.SearchBackpressureTask;
41+
import org.opensearch.wlm.QueryGroupTask;
4242

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

‎server/src/main/java/org/opensearch/action/search/SearchTask.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.opensearch.common.annotation.PublicApi;
3636
import org.opensearch.common.unit.TimeValue;
3737
import org.opensearch.core.tasks.TaskId;
38-
import org.opensearch.tasks.CancellableTask;
3938
import org.opensearch.tasks.SearchBackpressureTask;
39+
import org.opensearch.wlm.QueryGroupTask;
4040

4141
import java.util.Map;
4242
import java.util.function.Supplier;
@@ -49,7 +49,7 @@
4949
* @opensearch.api
5050
*/
5151
@PublicApi(since = "1.0.0")
52-
public class SearchTask extends CancellableTask implements SearchBackpressureTask {
52+
public class SearchTask extends QueryGroupTask implements SearchBackpressureTask {
5353
// generating description in a lazy way since source can be quite big
5454
private final Supplier<String> descriptionSupplier;
5555
private SearchProgressListener progressListener = SearchProgressListener.NOOP;

‎server/src/main/java/org/opensearch/action/search/TransportSearchAction.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
import org.opensearch.transport.RemoteTransportException;
102102
import org.opensearch.transport.Transport;
103103
import org.opensearch.transport.TransportService;
104+
import org.opensearch.wlm.QueryGroupTask;
104105

105106
import java.util.ArrayList;
106107
import java.util.Arrays;
@@ -442,6 +443,12 @@ private void executeRequest(
442443
);
443444
searchRequestContext.getSearchRequestOperationsListener().onRequestStart(searchRequestContext);
444445

446+
// At this point either the QUERY_GROUP_ID header will be present in ThreadContext either via ActionFilter
447+
// or HTTP header (HTTP header will be deprecated once ActionFilter is implemented)
448+
if (task instanceof QueryGroupTask) {
449+
((QueryGroupTask) task).setQueryGroupId(threadPool.getThreadContext());
450+
}
451+
445452
PipelinedRequest searchRequest;
446453
ActionListener<SearchResponse> listener;
447454
try {

‎server/src/main/java/org/opensearch/node/Node.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@
263263
import org.opensearch.transport.TransportService;
264264
import org.opensearch.usage.UsageService;
265265
import org.opensearch.watcher.ResourceWatcherService;
266+
import org.opensearch.wlm.WorkloadManagementTransportInterceptor;
266267

267268
import javax.net.ssl.SNIHostName;
268269

@@ -1047,14 +1048,21 @@ protected Node(
10471048
admissionControlService
10481049
);
10491050

1051+
WorkloadManagementTransportInterceptor workloadManagementTransportInterceptor = new WorkloadManagementTransportInterceptor(
1052+
threadPool
1053+
);
1054+
10501055
final Collection<SecureSettingsFactory> secureSettingsFactories = pluginsService.filterPlugins(Plugin.class)
10511056
.stream()
10521057
.map(p -> p.getSecureSettingFactory(settings))
10531058
.filter(Optional::isPresent)
10541059
.map(Optional::get)
10551060
.collect(Collectors.toList());
10561061

1057-
List<TransportInterceptor> transportInterceptors = List.of(admissionControlTransportInterceptor);
1062+
List<TransportInterceptor> transportInterceptors = List.of(
1063+
admissionControlTransportInterceptor,
1064+
workloadManagementTransportInterceptor
1065+
);
10581066
final NetworkModule networkModule = new NetworkModule(
10591067
settings,
10601068
pluginsService.filterPlugins(NetworkPlugin.class),

‎server/src/main/java/org/opensearch/wlm/QueryGroupTask.java‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
9+
package org.opensearch.wlm;
10+
11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
13+
import org.opensearch.common.unit.TimeValue;
14+
import org.opensearch.common.util.concurrent.ThreadContext;
15+
import org.opensearch.core.tasks.TaskId;
16+
import org.opensearch.tasks.CancellableTask;
17+
18+
import java.util.Map;
19+
import java.util.Optional;
20+
import java.util.function.Supplier;
21+
22+
import static org.opensearch.search.SearchService.NO_TIMEOUT;
23+
24+
/**
25+
* Base class to define QueryGroup tasks
26+
*/
27+
public class QueryGroupTask extends CancellableTask {
28+
29+
private static final Logger logger = LogManager.getLogger(QueryGroupTask.class);
30+
public static final String QUERY_GROUP_ID_HEADER = "queryGroupId";
31+
public static final Supplier<String> DEFAULT_QUERY_GROUP_ID_SUPPLIER = () -> "DEFAULT_QUERY_GROUP";
32+
private String queryGroupId;
33+
34+
public QueryGroupTask(long id, String type, String action, String description, TaskId parentTaskId, Map<String, String> headers) {
35+
this(id, type, action, description, parentTaskId, headers, NO_TIMEOUT);
36+
}
37+
38+
public QueryGroupTask(
39+
long id,
40+
String type,
41+
String action,
42+
String description,
43+
TaskId parentTaskId,
44+
Map<String, String> headers,
45+
TimeValue cancelAfterTimeInterval
46+
) {
47+
super(id, type, action, description, parentTaskId, headers, cancelAfterTimeInterval);
48+
}
49+
50+
/**
51+
* This method should always be called after calling setQueryGroupId at least once on this object
52+
* @return task queryGroupId
53+
*/
54+
public final String getQueryGroupId() {
55+
if (queryGroupId == null) {
56+
logger.warn("QueryGroup _id can't be null, It should be set before accessing it. This is abnormal behaviour ");
57+
}
58+
return queryGroupId;
59+
}
60+
61+
/**
62+
* sets the queryGroupId from threadContext into the task itself,
63+
* This method was defined since the queryGroupId can only be evaluated after task creation
64+
* @param threadContext current threadContext
65+
*/
66+
public final void setQueryGroupId(final ThreadContext threadContext) {
67+
this.queryGroupId = Optional.ofNullable(threadContext)
68+
.map(threadContext1 -> threadContext1.getHeader(QUERY_GROUP_ID_HEADER))
69+
.orElse(DEFAULT_QUERY_GROUP_ID_SUPPLIER.get());
70+
}
71+
72+
@Override
73+
public boolean shouldCancelChildrenOnCancellation() {
74+
return false;
75+
}
76+
}

‎server/src/main/java/org/opensearch/wlm/WorkloadManagementTransportInterceptor.java‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
9+
package org.opensearch.wlm;
10+
11+
import org.opensearch.tasks.Task;
12+
import org.opensearch.threadpool.ThreadPool;
13+
import org.opensearch.transport.TransportChannel;
14+
import org.opensearch.transport.TransportInterceptor;
15+
import org.opensearch.transport.TransportRequest;
16+
import org.opensearch.transport.TransportRequestHandler;
17+
18+
/**
19+
* This class is used to intercept search traffic requests and populate the queryGroupId header in task headers
20+
*/
21+
public class WorkloadManagementTransportInterceptor implements TransportInterceptor {
22+
private final ThreadPool threadPool;
23+
24+
public WorkloadManagementTransportInterceptor(ThreadPool threadPool) {
25+
this.threadPool = threadPool;
26+
}
27+
28+
@Override
29+
public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(
30+
String action,
31+
String executor,
32+
boolean forceExecution,
33+
TransportRequestHandler<T> actualHandler
34+
) {
35+
return new RequestHandler<T>(threadPool, actualHandler);
36+
}
37+
38+
/**
39+
* This class is mainly used to populate the queryGroupId header
40+
* @param <T> T is Search related request
41+
*/
42+
public static class RequestHandler<T extends TransportRequest> implements TransportRequestHandler<T> {
43+
44+
private final ThreadPool threadPool;
45+
TransportRequestHandler<T> actualHandler;
46+
47+
public RequestHandler(ThreadPool threadPool, TransportRequestHandler<T> actualHandler) {
48+
this.threadPool = threadPool;
49+
this.actualHandler = actualHandler;
50+
}
51+
52+
@Override
53+
public void messageReceived(T request, TransportChannel channel, Task task) throws Exception {
54+
if (isSearchWorkloadRequest(task)) {
55+
((QueryGroupTask) task).setQueryGroupId(threadPool.getThreadContext());
56+
}
57+
actualHandler.messageReceived(request, channel, task);
58+
}
59+
60+
boolean isSearchWorkloadRequest(Task task) {
61+
return task instanceof QueryGroupTask;
62+
}
63+
}
64+
}

‎server/src/test/java/org/opensearch/wlm/QueryGroupTaskTests.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
9+
package org.opensearch.wlm;
10+
11+
import org.opensearch.test.OpenSearchTestCase;
12+
import org.opensearch.threadpool.TestThreadPool;
13+
import org.opensearch.threadpool.ThreadPool;
14+
15+
import java.util.Collections;
16+
17+
import static org.opensearch.wlm.QueryGroupTask.DEFAULT_QUERY_GROUP_ID_SUPPLIER;
18+
import static org.opensearch.wlm.QueryGroupTask.QUERY_GROUP_ID_HEADER;
19+
20+
public class QueryGroupTaskTests extends OpenSearchTestCase {
21+
private ThreadPool threadPool;
22+
private QueryGroupTask sut;
23+
24+
public void setUp() throws Exception {
25+
super.setUp();
26+
threadPool = new TestThreadPool(getTestName());
27+
sut = new QueryGroupTask(123, "transport", "Search", "test task", null, Collections.emptyMap());
28+
}
29+
30+
public void tearDown() throws Exception {
31+
super.tearDown();
32+
threadPool.shutdown();
33+
}
34+
35+
public void testSuccessfulSetQueryGroupId() {
36+
sut.setQueryGroupId(threadPool.getThreadContext());
37+
assertEquals(DEFAULT_QUERY_GROUP_ID_SUPPLIER.get(), sut.getQueryGroupId());
38+
39+
threadPool.getThreadContext().putHeader(QUERY_GROUP_ID_HEADER, "akfanglkaglknag2332");
40+
41+
sut.setQueryGroupId(threadPool.getThreadContext());
42+
assertEquals("akfanglkaglknag2332", sut.getQueryGroupId());
43+
}
44+
}

‎server/src/test/java/org/opensearch/wlm/WorkloadManagementTransportInterceptorTests.java‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
9+
package org.opensearch.wlm;
10+
11+
import org.opensearch.test.OpenSearchTestCase;
12+
import org.opensearch.threadpool.TestThreadPool;
13+
import org.opensearch.threadpool.ThreadPool;
14+
import org.opensearch.transport.TransportRequest;
15+
import org.opensearch.transport.TransportRequestHandler;
16+
import org.opensearch.wlm.WorkloadManagementTransportInterceptor.RequestHandler;
17+
18+
import static org.opensearch.threadpool.ThreadPool.Names.SAME;
19+
20+
public class WorkloadManagementTransportInterceptorTests extends OpenSearchTestCase {
21+
22+
private ThreadPool threadPool;
23+
private WorkloadManagementTransportInterceptor sut;
24+
25+
public void setUp() throws Exception {
26+
super.setUp();
27+
threadPool = new TestThreadPool(getTestName());
28+
sut = new WorkloadManagementTransportInterceptor(threadPool);
29+
}
30+
31+
public void tearDown() throws Exception {
32+
super.tearDown();
33+
threadPool.shutdown();
34+
}
35+
36+
public void testInterceptHandler() {
37+
TransportRequestHandler<TransportRequest> requestHandler = sut.interceptHandler("Search", SAME, false, null);
38+
assertTrue(requestHandler instanceof RequestHandler);
39+
}
40+
}

0 commit comments

Comments
 (0)