Skip to content

Conversation

@smalyshev
Copy link
Contributor

Force the lock to be reset existing from the test method, and async query be always deleted even on failure.

@smalyshev smalyshev requested a review from quux00 February 10, 2025 22:26
@smalyshev smalyshev added >test Issues or PRs that are addressing/adding tests v9.1.0 v8.19.0 auto-backport Automatically create backport pull requests when merged :Analytics/ES|QL AKA ESQL labels Feb 10, 2025
@smalyshev smalyshev marked this pull request as ready for review February 10, 2025 22:26
@elasticsearchmachine elasticsearchmachine added the Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) label Feb 10, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-analytical-engine (Team:Analytics)

@alex-spies
Copy link
Contributor

Hey @smalyshev ! I'd like to re-label this PR with :Search Foundations/CCS and remove the :Analytics/ES|QL label, if that's okay.

The reason is that these PR labels determine what the CI bot will use to label test failures; and it's probably better if the CI bot labels failures in cross cluster tests with a label that pings you directly rather than requiring manual relabeling, or us pinging you by other means.

I hope that's okay - feel free to undo my relabeling if you'd like to keep the original labels.

@alex-spies alex-spies added :Search Foundations/CCS and removed Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) :Analytics/ES|QL AKA ESQL labels Feb 11, 2025
@elasticsearchmachine elasticsearchmachine added the Team:Search Foundations Meta label for the Search Foundations team in Elasticsearch label Feb 11, 2025
@elasticsearchmachine
Copy link
Collaborator

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

Copy link
Contributor

@quux00 quux00 left a comment

Choose a reason for hiding this comment

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

Questions left.

.filter(t -> t.description().contains("_LuceneSourceOperator") == false)
.toList();
assertThat(reduceTasks, empty());
});
Copy link
Contributor

Choose a reason for hiding this comment

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

I know this assertBusy code isn't changed, but I don't think I understand what it is doing. I think this is waiting for the drivers to be cancelled and all the Lucene operations to no longer present? If yes, can you add a comment to that effect for later help in understanding.

Copy link
Contributor Author

@smalyshev smalyshev Feb 11, 2025

Choose a reason for hiding this comment

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

TBH I don't fully understand it myself, it's Nhat's code, but it looks like it checks that the drivers don't have any other tasks except _LuceneSourceOperator. I am not 100% sure why _LuceneSourceOperator is excluded though. I personally don't feel confident enough with this to comment it, but this is not the purpose of this patch.

}
} finally {
// Ensure proper cleanup if the test fails
CountingPauseFieldPlugin.allowEmitting.countDown();
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this the only substantive change in this PR? It's hard to tell what is new and not as even the side-by-side view in GH is not helping?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this makes it so if the test fails, the locks are still removed and the async request is cleared. I've got some very confusing rare failures in the logs, and I suspect this is caused by one test's setup leaking into another. So I want to make it cleaner.

Copy link
Contributor

@quux00 quux00 left a comment

Choose a reason for hiding this comment

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

LGTM

@smalyshev smalyshev merged commit 4531243 into elastic:main Feb 11, 2025
17 checks passed
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
8.x

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/CCS Team:Search Foundations Meta label for the Search Foundations team in Elasticsearch >test Issues or PRs that are addressing/adding tests v8.19.0 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants