Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relax Overly Strict Assertion in TransportShardBulkAction #40940

Merged
merged 3 commits into from
Apr 8, 2019
Merged

Relax Overly Strict Assertion in TransportShardBulkAction #40940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c3e3cc
Remove Overly Strict Assertion in TransportShardBulkAction
original-brownbear Apr 8, 2019
be506ab
Merge remote-tracking branch 'elastic/master' into 40933
original-brownbear Apr 8, 2019
26fcaed
safer finishRequest call
original-brownbear Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public static void performOnPrimary(
Consumer<ActionListener<Void>> waitForMappingUpdate,
ActionListener<PrimaryResult<BulkShardRequest, BulkShardResponse>> listener,
ThreadPool threadPool) {
new ActionRunnable<PrimaryResult<BulkShardRequest, BulkShardResponse>>(listener) {
new ActionRunnable<>(listener) {

private final Executor executor = threadPool.executor(ThreadPool.Names.WRITE);

Expand Down Expand Up @@ -189,11 +189,11 @@ public void onRejection(Exception e) {
}

private void finishRequest() {
listener.onResponse(
new WritePrimaryResult<>(context.getBulkShardRequest(), context.buildShardResponse(), context.getLocationToSync(),
null, context.getPrimary(), logger));
ActionListener.completeWith(listener,
() -> new WritePrimaryResult<>(
context.getBulkShardRequest(), context.buildShardResponse(), context.getLocationToSync(), null,
context.getPrimary(), logger));
}

}.run();
}

Expand Down
1 change: 0 additions & 1 deletion x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/AnnotationIndexIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public void testNotCreatedWhenNoOtherMlIndices() {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/40933")
public void testCreatedWhenAfterOtherMlIndex() throws Exception {

Auditor auditor = new Auditor(client(), "node_1");
Expand Down