Use a dedicated test executor in MockTransportService #112748
Conversation
Instead of using the generic executor for delayed transport actions, this PR adds a new executor to schedule these actions. It helps avoid sharing executors with the node which may lead to unexpected CI failures due to unsafe future assertion.
ywangd
added
>test
elasticsearchmachine
added
the
Team:Distributed (Obsolete)
|
Pinging @elastic/es-distributed (Team:Distributed) |
| 4, | ||
| 30, | ||
| TimeUnit.SECONDS, | ||
| false, |
There was a problem hiding this comment.
Could we set rejectAfterShutdown to true please?
There was a problem hiding this comment.
I pondered on this and decided to use false to align with how the generic executor is defined. I also think it might be better to let the "real" executors to decide whether task should be rejected, i.e. if the task has reached here, it is not rejected and we should just queue it up. That said, I am OK with true as well since it was my initial preference for better predictability. See 63a4614
There was a problem hiding this comment.
it is not rejected and we should just queue it up
Sure but that's not what false does, it just silently drops any work submitted after shutdown.
My thinking here is twofold: firstly, we are terminating this ExecutorService at the end of the test, there should be no more tasks submitted by that point anyway. Secondly, IMO the silent-drop behaviour of generic after shutdown is a bug, even if it is unfortunately one we cannot easily address without changing lots of other things, but we can at least avoid relying on that same behaviour in specific situations like this one.
There was a problem hiding this comment.
but that's not what false does, it just silently drops any work submitted after shutdown.
TIL. Thanks!
| @@ -795,6 +808,8 @@ protected void doClose() throws IOException { | |||
| } | |||
| } catch (InterruptedException e) { | |||
| throw new IllegalStateException(e); | |||
| } finally { | |||
| ThreadPool.terminate(testExecutor, 10, TimeUnit.SECONDS); | |||
There was a problem hiding this comment.
Could we have an assertTrue here to make sure it did actually terminate?
|
@elasticmachine update branch |
ywangd
added
the
auto-merge-without-approval
…tion-ironbank-ubi * upstream/main: (302 commits) Deduplicate BucketOrder when deserializing (elastic#112707) Introduce test utils for ingest pipelines (elastic#112733) [Test] Account for auto-repairing for shard gen file (elastic#112778) Do not throw in task enqueued by CancellableRunner (elastic#112780) Mute org.elasticsearch.script.StatsSummaryTests testEqualsAndHashCode elastic#112439 Mute org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT testTransportException elastic#112779 Use a dedicated test executor in MockTransportService (elastic#112748) Estimate segment field usages (elastic#112760) (Doc+) Inference Pipeline ignores Mapping Analyzers (elastic#112522) Fix verifyVersions task (elastic#112765) (Doc+) Terminating Exit Codes (elastic#112530) (Doc+) CAT Nodes default columns (elastic#112715) [DOCS] Augment installation warnings (elastic#112756) Mute org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT testCorruption elastic#112769 Bump Elasticsearch to a minimum of JDK 21 (elastic#112252) ESQL: Compute support for filtering ungrouped aggs (elastic#112717) Bump Elasticsearch version to 9.0.0 (elastic#112570) add CDR related data streams to kibana_system priviliges (elastic#112655) Support widening of numeric types in union-types (elastic#112610) Introduce data stream options and failure store configuration classes (elastic#109515) ...
Instead of using the generic executor for delayed transport actions, this PR adds a new executor to schedule these actions. It helps avoid sharing executors with the node which may lead to unexpected CI failures due to unsafe future assertion.
Instead of using the generic executor for delayed transport actions, this PR adds a new executor to schedule these actions. It helps avoid sharing executors with the node which may lead to unexpected CI failures due to unsafe future assertion.