Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add queryGroupId to search workload tasks at co-ordinator and data no…
…de level (#14708) (#15029) * add logic to add headers to Task * add logic to add queryGroupId to task headers * remove redundant code * add changelog entry * address comments * fix precommit * Add UTs for RemoteIndexMetadataManager (#14660) * 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 * Add more test * modify change log * Fix test failure * Change the indexAnalyzer used by prefix field * Skip old version for yaml test * Optimize some code * Fix test failure * Modify yaml test description * Remove the name parameter for setAnalyzer() --------- * Offline calculation of total shard per node and caching it for weight calculation inside LocalShardBalancer (#14675) * [bug fix] validate lower bound for top n size (#14587) * Create SystemIndexRegistry with helper method matchesSystemIndex (#14415) * Create new extension point in SystemIndexPlugin for a single plugin to get registered system indices * Add to CHANGELOG * WIP on system indices from IndexNameExpressionResolver * Add test in IndexNameExpressionResolverTests * Remove changes in SystemIndexPlugin * Add method in IndexNameExpressionResolver to get matching system indices * Show how resolver can be chained to get system indices * Fix forbiddenApis check * Update CHANGELOG * Make SystemIndices internal * Remove unneeded changes * Fix CI failures * Fix precommit errors * Use Regex instead of WildcardMatcher * Address code review feedback * Allow caller to pass index expressions * Create SystemIndexRegistry * Update CHANGELOG * Remove singleton limitation * Add javadoc * Add @experimentalapi annotation --------- * Refactor Grok validate pattern to iterative approach (#14206) * grok validate patterns recusrion to iterative * Add max depth in resolving a pattern to avoid OOM * change path from deque to arraylist * rename queue to stack * Change max depth to 500 * typo originPatternName fix * spotless --------- * Bump opentelemetry from 1.39.0 to 1.40.0 (#14674) * Bump jackson from 2.17.1 to 2.17.2 (#14687) * Add release notes for release 1.3.18 (#14699) * Bump reactor from 3.5.19 to 3.5.20 (#14697) * Add unit tests for read flow of RemoteClusterStateService and bug fix for transient settings (#14476) * Update version check for the bug fix of match_phrase_prefix_query not working on text field with multiple values and index_prefixes (#14703) * Remove unnecessary cast to int from test (#14696) * print reason why parent task was cancelled (#14604) * Use set of shard routing for shard in unassigned shard batch check. (#14533) * Add versioning for UploadedIndexMetadata (#14677) * Add versioning for UploadedIndexMetadata * Handle componentPrefix for backward compatibility * Fix: update help output for _cat (#14722) * fixed help output for _cat * updated changelog * updated changelog --------- * Fix hdfs-fixture kerb-admin & hadoop-minicluster dependencies are not being updated / false positive reports on CVEs (#14729) * Update to Gradle 8.9 (#14574) * Fix hdfs-fixture hadoop-minicluster dependencies are not being updated / false positive reports on CVEs (#14732) * Add `strict_allow_templates` dynamic mapping option (#14555) * 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 --------- * 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 ... * Updating SHAs * Update changelog --------- * remove query insights plugin from core (#14743) * 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) * 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 * Update version check in yml test * modify change log --------- * Remove query categorization from core (#14759) * Remove query categorization from core * Add changelog * Trigger Build --------- * Add changes to propagate queryGroupId across child requests and nodes (#14614) * add query group header propagator * apply spotless check * add new propagator in ThreadContext * spotlessApply * address comments * 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 ... * Updating SHAs * Update changelog --------- * [Bugfix] Fix ICacheKeySerializerTests flakiness (#14564) * Fix testInvalidInput flakiness * Addressed andrross's comment * rerun security check --------- * Correct typo in method name (#14621) * Refactoring FilterPath.parse by using an iterative approach instead of recursion. (#14200) * Refactor FilterPath parse function (#12067) * Implement unit tests for FilterPathTests (#12067) * Write warn log if Filter is empty; Add comments (#12067) * Add changelog * Remove unnecessary log statement * Remove unused logger * Spotless apply * Remove incorrect changelog --------- * Removing String format in RemoteStoreMigrationAllocationDecider to optimise performance(#14612) * 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 * add changelog * add PR link changelog * Improve reroute performance by optimising List.removeAll in LocalShardsBalancer to filter remote search shard from relocation decision (#14613) * Fix assertion failure while deleting remote backed index (#14601) * Allow system index warning in OpenSearchRestTestCase.refreshAllIndices (#14635) * Allow system index warning * Add to CHANGELOG * Address code review comments --------- * Star tree codec changes (#14514) --------- * 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 ... * Updating SHAs * Update changelog --------- * 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 ... * Updating SHAs * Update changelog --------- * move query group thread context propagator out of ThreadContext --------- * Add consumers to remote store based index settings (#14764) * Add matchesPluginSystemIndexPattern to SystemIndexRegistry (#14750) * Add matchesPluginSystemIndexPattern to SystemIndexRegistry * Add to CHANGELOG * Use single data structure to keep track of system indices * Address code review comments * Add test for getAllDescriptors * Update server/src/main/java/org/opensearch/indices/SystemIndexRegistry.java --------- * SPI for loading ABC templates (#14659) * SPI for loading ABC templates * 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 * Modify changelog & comment * Use new approach * Fix test failure --------- * Fix flaky test due to node being used across all tests (#14787) * Star Tree Implementation [OnHeap] (#14512) --------- * Add Gao Binlong as maintainer (#14796) * Clear ehcache disk cache files during initialization (#14738) * Clear ehcache disk cache files during initialization * Adding UT to fix line coverage * Addressing comment * Adding more Uts for better line coverage * Throwing exception in case we fail to clear cache files during startup * Adding more UTs * Adding a UT for more coverage * Fixing gradle build * Update ehcache disk cache close() logic --------- * Refactor remote-routing-table service inline with remote state interfaces (#14668) --------- * Set version to 2.15 for determining metadata during migration to remote store * Fix bulk upsert ignores the default_pipeline and final_pipeline when the auto-created index matches the index template (#14793) * Fix create or update alias API doesn't throw exception for unsupported parameters (#14769) * Change RCSS info logs to debug (#14814) * [Bugfix] Fix NPE in ReplicaShardAllocator (#13993) (#14385) * [Bugfix] Fix NPE in ReplicaShardAllocator (#13993) * Add fix info to CHANGELOG.md --------- * Run performance benchmark on pull requests (#14760) * add performance benchmark workflow for pull requests * Update PERFORMANCE_BENCHMARKS.md * Update PERFORMANCE_BENCHMARKS.md * Update .github/workflows/benchmark-pull-request.yml * Update .github/workflows/benchmark-pull-request.yml * Update .github/workflows/benchmark-pull-request.yml * Update .github/workflows/benchmark-pull-request.yml --------- * fix constant_keyword field type (#14807) test * [Remote Store Migration] Reconcile remote store based index settings during STRICT mode switch (#14792) * Add prefix mode verification setting for repository verification (#14790) * Add prefix mode verification setting for repository verification * Add UTs and randomise prefix mode repository verification * Incorporate PR review feedback --------- * add length check on comment body for benchmark workflow (#14834) * Add restore-from-snapshot test procedure for snapshot run benchmark config (#14842) * Fix env variable name typo (#14843) * Use circuit breaker in InternalHistogram when adding empty buckets (#14754) * introduce circuit breaker in InternalHistogram * use circuit breaker from reduce context * add test * revert use_real_memory change in OpenSearchNode * add change log --------- * [Remote State] Create interface RemoteEntitiesManager (#14671) * Create interface RemoteEntitiesManager * Optimise TransportNodesAction to not send DiscoveryNodes for NodeStat… (#14749) * Optimize TransportNodesAction to not send DiscoveryNodes for NodeStats, NodesInfo and ClusterStats call * 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 * Reduce logging in DEBUG for MasterService:run (#14795) * Reduce logging in DEBUG for MasteService:run by introducing short and long summary in Taskbatcher * Add SplitResponseProcessor to Search Pipelines (#14800) * Add SplitResponseProcessor for search pipelines * Register the split processor factory * Address code review comments * Avoid list copy by casting array --------- * Add integration tests for RemoteRoutingTable Service. (#14631) * Add SortResponseProcessor to Search Pipelines (#14785) * Add SortResponseProcessor for search pipelines * Add stupid and unnecessary javadocs to satisfy overly strict CI * Split casting and sorting methods for readability * Register the sort processor factory * Address code review comments * Cast individual list elements to avoid creating two lists * Add yamlRestTests * Clarify why there's unusual sorting * Use instanceof instead of isAssignableFrom --------- * 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 * Add test cases to verify returning 400 responses if unmapped fields are included for some types of query * Add changelog --------- * 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 ... * Updating SHAs * Update changelog --------- * 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 ... * Update changelog --------- * 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 ... * 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. * 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 ... * Update changelog --------- * 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. * Add perms for remote snapshot cache eviction on scripted query (#14411) * add transport interceptor to populate queryGroupId in task headers * Add rest, transport layer changes for Hot to warm tiering - dedicated setup (#13980) * Create listener to refresh search thread resource usage (#14832) * [bug fix] fix incorrect coordinator node search resource usages * fix bug on serialization when passing task resource usage to coordinator * add more unit tests * remove query insights plugin related code * create per request listener to refresh task resource usage * Make new listener API public * Add changelog * Remove wrong files added * Address review comments * Build fix * Make singleton * Address review comments * Make sure listener runs before plugin listeners * Spotless * Minor fix --------- * Caching avg total bytes and avg free bytes inside ClusterInfo (#14851) * Use default value when index.number_of_replicas is null (#14812) * Use default value when index.number_of_replicas is null * Add integration test * Add changelog --------- * [Remote Routing Table] Implement write and read flow for shard diff file. (#14684) * Implement write and read flow to upload/download shard diff file. * Optimized ClusterStatsIndices to precomute shard stats (#14426) * Optimize Cluster Stats Indices to precomute node level stats * Fix constraint bug which allows more primary shards than average primary shards per index (#14908) * Optmising AwarenessAllocationDecider for hashmap.get call (#14761) * update comment * 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. * add queryGroupTask * remove unnecessary imports * add QueryGroupTask tests * rename WLM transport request handler * add CHANGELOG entry * fix ut * address comments * fix UT to remove the verify for final method * apply spotless --------- (cherry picked from commit eb306d2) 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: github-actions[bot] <github-actions[bot]@users.noreply.github.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: 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
52 people
committed
Aug 7, 2024
1 parent
fb8f656
commit d4bdc7a