forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into translog-generation
* master: Clear the interrupt flag before joining Migrate to max line length of 100 Docs: Corrected path to elasticsearch-plugin (elastic#23622) Docs: Add comma to reverse nested agg snippet Fix third-party audit task for Gradle 3.4 (elastic#23612) Adapter action future should restore interrupts Update scripting.asciidoc Unmark reindex as experimental CompletionSuggestionContext#toQuery() should also consider text if prefix/regex missing (elastic#23451) Docs: Specify that byte units use powers of 1024 (elastic#23574) Remove Settings.settingsBuilder (elastic#23575)
- Loading branch information
Showing
15 changed files
with
3,506 additions
and
188 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
3,505 changes: 3,347 additions & 158 deletions
3,505
buildSrc/src/main/resources/checkstyle_suppressions.xml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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
This file contains 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
93 changes: 93 additions & 0 deletions
93
core/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.action.support; | ||
|
|
||
| import org.elasticsearch.common.unit.TimeValue; | ||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.util.Objects; | ||
| import java.util.concurrent.BrokenBarrierException; | ||
| import java.util.concurrent.CyclicBarrier; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
|
|
||
| public class AdapterActionFutureTests extends ESTestCase { | ||
|
|
||
| public void testInterruption() throws Exception { | ||
| final AdapterActionFuture<String, Integer> adapter = | ||
| new AdapterActionFuture<String, Integer>() { | ||
| @Override | ||
| protected String convert(final Integer listenerResponse) { | ||
| return Objects.toString(listenerResponse); | ||
| } | ||
| }; | ||
|
|
||
| // test all possible methods that can be interrupted | ||
| final Runnable runnable = () -> { | ||
| final int method = randomIntBetween(0, 4); | ||
| switch (method) { | ||
| case 0: | ||
| adapter.actionGet(); | ||
| break; | ||
| case 1: | ||
| adapter.actionGet("30s"); | ||
| break; | ||
| case 2: | ||
| adapter.actionGet(30000); | ||
| break; | ||
| case 3: | ||
| adapter.actionGet(TimeValue.timeValueSeconds(30)); | ||
| break; | ||
| case 4: | ||
| adapter.actionGet(30, TimeUnit.SECONDS); | ||
| break; | ||
| default: | ||
| throw new AssertionError(method); | ||
| } | ||
| }; | ||
|
|
||
| final CyclicBarrier barrier = new CyclicBarrier(2); | ||
| final Thread main = Thread.currentThread(); | ||
| final Thread thread = new Thread(() -> { | ||
| try { | ||
| barrier.await(); | ||
| } catch (final BrokenBarrierException | InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| main.interrupt(); | ||
| }); | ||
| thread.start(); | ||
|
|
||
| final AtomicBoolean interrupted = new AtomicBoolean(); | ||
|
|
||
| barrier.await(); | ||
|
|
||
| try { | ||
| runnable.run(); | ||
| } catch (final IllegalStateException e) { | ||
| interrupted.set(Thread.interrupted()); | ||
| } | ||
| // we check this here instead of in the catch block to ensure that the catch block executed | ||
| assertTrue(interrupted.get()); | ||
|
|
||
| thread.join(); | ||
| } | ||
|
|
||
| } |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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