Skip to content

Conversation

@smalyshev
Copy link
Contributor

Fixes #121719

@smalyshev smalyshev added >test Issues or PRs that are addressing/adding tests :Search Foundations/Search Catch all for Search Foundations v9.0.1 v9.1.0 v8.19.0 v8.18.1 labels Mar 7, 2025
@smalyshev smalyshev marked this pull request as ready for review March 7, 2025 22:18
@elasticsearchmachine elasticsearchmachine added the Team:Search Foundations Meta label for the Search Foundations team in Elasticsearch label Mar 7, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-search-foundations (Team:Search Foundations)

@smalyshev smalyshev added the auto-backport Automatically create backport pull requests when merged label Mar 7, 2025
Copy link
Contributor

@original-brownbear original-brownbear left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, what do you think about my suggestion though to simplify this slightly? :)


// When the search request executes, block all shards except 1.
final List<SearchShardBlockingPlugin> searchShardBlockingPlugins = initSearchShardBlockingPlugin();
AtomicBoolean letOneShardProceed = new AtomicBoolean();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could make this slightly simpler by using a nAtomicReference<CountDownLatch> and then doing something like latch = getAndSet(null); if (latch != null) latch.await to save a variable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understood how it should work. I think it's better to check if this one works and then if it fixes the issues then we can refactor it.

@smalyshev smalyshev enabled auto-merge (squash) March 8, 2025 00:54
@smalyshev smalyshev merged commit b9a9784 into elastic:main Mar 8, 2025
17 checks passed
smalyshev added a commit to smalyshev/elasticsearch that referenced this pull request Mar 8, 2025
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.18 Commit could not be cherrypicked due to conflicts
8.x
9.0 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 124386

smalyshev added a commit to smalyshev/elasticsearch that referenced this pull request Mar 8, 2025
…tic#124386)

(cherry picked from commit b9a9784)

# Conflicts:
#	server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java
@smalyshev
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.0
8.18

Questions ?

Please refer to the Backport tool documentation

smalyshev added a commit to smalyshev/elasticsearch that referenced this pull request Mar 8, 2025
…tic#124386)

(cherry picked from commit b9a9784)

# Conflicts:
#	server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java
elasticsearchmachine pushed a commit that referenced this pull request Mar 8, 2025
) (#124426)

(cherry picked from commit b9a9784)

# Conflicts:
#	server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java
elasticsearchmachine pushed a commit that referenced this pull request Mar 8, 2025
) (#124427)

(cherry picked from commit b9a9784)

# Conflicts:
#	server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java
georgewallace pushed a commit to georgewallace/elasticsearch that referenced this pull request Mar 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged :Search Foundations/Search Catch all for Search Foundations Team:Search Foundations Meta label for the Search Foundations team in Elasticsearch >test Issues or PRs that are addressing/adding tests v8.18.1 v8.19.0 v9.0.1 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CI] SearchCancellationIT testCancelFailedSearchWhenPartialResultDisallowed failing

3 participants