Backport 17101 to 2.19 #17213
Closed
Backport 17101 to 2.19 #17213
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ture (opensearch-project#16135) (opensearch-project#16206) * Bump org.jline:jline in /test/fixtures/hdfs-fixture Bumps [org.jline:jline](https://github.com/jline/jline3) from 3.26.3 to 3.27.0. - [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.3...jline-3.27.0) --- updated-dependencies: - dependency-name: org.jline:jline dependency-type: direct:production update-type: version-update:semver-minor ... 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> (cherry picked from commit c46bf41) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…roject#16228) (opensearch-project#16234) (cherry picked from commit 96082f7) Signed-off-by: Sachin Kale <sachinpkale@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…azure (opensearch-project#16217) (opensearch-project#16231) * Bump com.azure:azure-json in /plugins/repository-azure Bumps [com.azure:azure-json](https://github.com/Azure/azure-sdk-for-java) from 1.1.0 to 1.3.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](Azure/azure-sdk-for-java@v1.1.0...v1.3.0) --- updated-dependencies: - dependency-name: com.azure:azure-json dependency-type: direct:production update-type: version-update:semver-minor ... * Updating SHAs * Update changelog --------- (cherry picked from commit aad325f) Signed-off-by: dependabot[bot] <support@github.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: github-actions[bot] <github-actions[bot]@users.noreply.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> Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
…es (opensearch-project#16237) (opensearch-project#16239) * Remove force to TLSv1.2 in gradle.properties * Add TLSv1.3 --------- (cherry picked from commit febbc00) Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…rch-project#16240) (opensearch-project#16241) (cherry picked from commit 2ed8ff0) Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…-project#16211) * Update Apache Lucene to 9.12.0 * change to IOContext READONCE in locations where the file is not expected to be read multiple times. * Use READ IOContext for all non Segment* files when copying node-node * Fixing more test failures * Move Composite912Codec under org.opensearch.index.codec.composite.composite912 package --------- (cherry picked from commit 146b0f7) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Signed-off-by: Marc Handalian <marc.handalian@gmail.com> Co-authored-by: Marc Handalian <marc.handalian@gmail.com>
…roject#16229) * [Tiered Caching] Segmented cache changes (opensearch-project#16047) * Segmented cache changes for TieredCache Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Adding change log Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Allow segment number to be power of two Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Moving common tiered cache IT methods to a common base class Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Adding disk took time IT test with multiple segment Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Correcting changelog Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Addressing comments Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Fixing invalid segment count variable name Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Introducing new settings for size for respective cache tier Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Changing the default segmentCount logic Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> * Fixing missing java doc issue Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> --------- Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> Signed-off-by: Sagar <99425694+sgup432@users.noreply.github.com> * Fixing compatilbility test Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> --------- Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> Signed-off-by: Sagar <99425694+sgup432@users.noreply.github.com>
…#16110) (opensearch-project#16243) Signed-off-by: David Zane <davizane@amazon.com> Signed-off-by: Ankit Jain <akjain@amazon.com> (cherry picked from commit 5279d21)
…on dynamic limit settings (opensearch-project#15986) (opensearch-project#16235) Signed-off-by: Sumit Bansal <sumitsb@amazon.com>
…ch-project#16254) (opensearch-project#16260) * The protobuf-java leaks through client library dependencies * Address code review comments --------- (cherry picked from commit 68e3e45) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…igured methods (opensearch-project#16249) * Separate Remote State and Publication enabled and configured methods (opensearch-project#16080) * Separate Remote State and Publication enabled and configured methods Signed-off-by: Shivansh Arora <hishiv@amazon.com> * Revert remote publication method renaming in DiscoveryNode (opensearch-project#16250) Signed-off-by: Sooraj Sinha <soosinha@amazon.com> --------- Signed-off-by: Shivansh Arora <hishiv@amazon.com> Signed-off-by: Sooraj Sinha <soosinha@amazon.com> Co-authored-by: Shivansh Arora <hishiv@amazon.com>
…search-project#16248) (opensearch-project#16264) (cherry picked from commit 58adc18) Signed-off-by: Sachin Kale <sachinpkale@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…plugins/repository-gcs (opensearch-project#16216) (opensearch-project#16244) * Bump com.google.api-client:google-api-client in /plugins/repository-gcs Bumps [com.google.api-client:google-api-client](https://github.com/googleapis/google-api-java-client) from 2.2.0 to 2.7.0. - [Release notes](https://github.com/googleapis/google-api-java-client/releases) - [Changelog](https://github.com/googleapis/google-api-java-client/blob/main/CHANGELOG.md) - [Commits](googleapis/google-api-java-client@v2.2.0...v2.7.0) --- updated-dependencies: - dependency-name: com.google.api-client:google-api-client dependency-type: direct:production update-type: version-update:semver-minor ... * Updating SHAs * Update changelog --------- (cherry picked from commit acf209f) Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: gaobinlong <gbinlong@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.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> Co-authored-by: gaobinlong <gbinlong@amazon.com>
…ch-project#16267) (opensearch-project#16270) (cherry picked from commit 942765e) Signed-off-by: Ashish Singh <ssashish@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…opensearch-project#16113) * Registering disable user-agent setting with OpenSearch (opensearch-project#16052) * Registering allowlist setting in user-agent Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> * Adding unit tests Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> --------- Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> (cherry picked from commit 78860ac) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Fixing backport 2.x Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> --------- Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
…opensearch-project#15955) (opensearch-project#16275) * Add Integration Tests for Workload Management CRUD APIs (opensearch-project#15955) Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add IT for workload management CRUD APIs Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify based on comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add IT for workload management CRUD APIs Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> (cherry picked from commit b3b8c9b) * Add Integration Tests for Workload Management CRUD APIs (opensearch-project#15955) Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add IT for workload management CRUD APIs Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify based on comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add IT for workload management CRUD APIs Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> (cherry picked from commit b3b8c9b)
…arch-project#16274) * [Workload Management] QueryGroup Stats API Logic (opensearch-project#15777) Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * changelog Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * address comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add tests Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify uri Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * address comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify based on comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * changelog Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * address comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add tests Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify uri Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify based on comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify based on comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * revise Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * address comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * changelog Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * address comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * add tests Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify uri Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify based on comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * modify based on comments Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * git pull Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * rebase Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * encapsulate querygroupstats in wlmstats Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * fix UT Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> (cherry picked from commit b2253f1) * fix backward compatibility issue Signed-off-by: Ruirui Zhang <mariazrr@amazon.com> * spotless apply Signed-off-by: Ruirui Zhang <mariazrr@amazon.com>
…ch-project#16280) * fix wlm stats output Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> * rename wlm stats vars Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> * fix ut failure Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com> --------- Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
…opensearch-project#16268) * Reconfigure remote state thread pool count Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
…oject#16277) * Support JDK-23 (build time and runtime) (opensearch-project#16257) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit 1e7f6df) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Update DistroTestPlugin.java Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Update version.properties Signed-off-by: Andriy Redko <andriy.redko@aiven.io> --------- Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
…rch-project#16281) (opensearch-project#16283) (cherry picked from commit d6ea8eb) Signed-off-by: Sachin Kale <sachinpkale@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…opensearch-project#16213) (opensearch-project#16258) * Bump io.grpc:grpc-api from 1.57.2 to 1.68.0 in /plugins/discovery-gce Bumps [io.grpc:grpc-api](https://github.com/grpc/grpc-java) from 1.57.2 to 1.68.0. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](grpc/grpc-java@v1.57.2...v1.68.0) updated-dependencies: - dependency-name: io.grpc:grpc-api dependency-type: direct:production update-type: version-update:semver-minor Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Andriy Redko <andriy.redko@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: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit ba0ccfa) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…s-fixture (opensearch-project#16212) (opensearch-project#16256) * Bump com.squareup.okio:okio in /test/fixtures/hdfs-fixture Bumps [com.squareup.okio:okio](https://github.com/square/okio) from 3.9.0 to 3.9.1. - [Release notes](https://github.com/square/okio/releases) - [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md) - [Commits](square/okio@parent-3.9.0...3.9.1) --- updated-dependencies: - dependency-name: com.squareup.okio:okio 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> (cherry picked from commit 9225aa2) Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…arch-project#14810 (opensearch-project#14948) (opensearch-project#16287) * Update setting API honors cluster's replica setting as default opensearch-project#14810 * Update changelog & add one more test case --------- (cherry picked from commit b3459fd) Signed-off-by: Liyun Xiu <xiliyun@amazon.com> Signed-off-by: Daniel Widdis <widdis@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel Widdis <widdis@gmail.com>
…nsearch-project#16293) (cherry picked from commit 20536ee) Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…project#15975) (opensearch-project#15991) (cherry picked from commit 80ff07e) Signed-off-by: Bharathwaj G <bharath78910@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project#16230) (cherry picked from commit e8e041b) Signed-off-by: Gaurav Bafna <gbbafna@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…er when not in debug mode (opensearch-project#16299) (opensearch-project#16301) (cherry picked from commit 5d2d392) Signed-off-by: Rishab Nahata <rnnahata@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…pensearch-project#16291) Looking into the query approximation framework, I realized that we don't actually need ApproximateIndexOrDocValuesQuery. We already have ApproximateScoreQuery that is able to choose between the approximate query and the original query. Assuming the range query is over an indexed field, it is (potentially) possible to approximate. If there are doc values, then the original query will be an IndexOrDocValuesQuery. Otherwise, it will just be a PointRangeQuery. Either way, we can wrap the original query into a generic ApproximateScoreQuery along with the approximate query. The approximation logic doesn't need to be specialized to the IndexOrDocValue case. --------- (cherry picked from commit 53c9ddf) Signed-off-by: Michael Froh <froh@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…6144) (opensearch-project#16259) (cherry picked from commit a09750a) Signed-off-by: Finn Carroll <carrofin@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
…earch-project#17210) * Fix auto date histogram rounding assertion bug (opensearch-project#17023) * Add comments explanations for auto date histo increaseRoundingIfNeeded. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Add testFilterRewriteWithTZRoundingRangeAssert() to reproduce auto date histo assertion bug per opensearch-project#16932 Signed-off-by: Finn Carroll <carrofin@amazon.com> * Fix opensearch-project#16932. Ensure optimized path can only increase preparedRounding of agg. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Spotless apply Signed-off-by: Finn Carroll <carrofin@amazon.com> * Fast fail filter rewrite opt in data histo aggs for non UTC timezones Signed-off-by: Finn Carroll <carrofin@amazon.com> * Remove redundant UTC check from getInterval(). Signed-off-by: Finn Carroll <carrofin@amazon.com> * Save a call to prepareRounding if roundingIdx is unchanged. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Spotless apply Signed-off-by: Finn Carroll <carrofin@amazon.com> * Changelog Signed-off-by: Finn Carroll <carrofin@amazon.com> * Add ZoneId getter for date histo filter rewrite canOptimize check. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Spotless apply Signed-off-by: Finn Carroll <carrofin@amazon.com> * Disable ff optimzation for composite agg in canOptimize. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Spotless apply Signed-off-by: Finn Carroll <carrofin@amazon.com> * Handle utc timezone check Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Remove redundant timeZone getter. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Simplify ff prepared rounding check. Signed-off-by: Finn Carroll <carrofin@amazon.com> --------- Signed-off-by: Finn Carroll <carrofin@amazon.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com> (cherry picked from commit de59264) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Remove breaking abstract isUTC() getter from Rounding.java. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Remove unused ZoneId getter. Signed-off-by: Finn Carroll <carrofin@amazon.com> --------- Signed-off-by: Finn Carroll <carrofin@amazon.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
--------- Signed-off-by: Eugene Tolbakov <ev.tolbakov@gmail.com>
msfroh
requested review from
Bukhtawar,
CEHENKLE,
Rishikesh1159,
VachaShah,
anasalkouz,
andrross,
ashking94,
cwperks,
dblock,
dbwiddis,
gaobinlong,
gbbafna,
jainankitk,
jed326,
kotwanikunal,
linuxpi,
mch2,
nknize,
owaiskazi19,
peternied,
reta,
sachinpkale,
saratvemulapalli,
shwetathareja and
sohami
as code owners
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Manual backport of #17101 to 2.19
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.