summaryrefslogtreecommitdiff
path: root/core/src/test/java/org/elasticsearch/action/admin/cluster
diff options
context:
space:
mode:
authorChris Earle <pickypg@users.noreply.github.com>2017-06-02 10:01:42 -0400
committerGitHub <noreply@github.com>2017-06-02 10:01:42 -0400
commit6464add55138c7e4be324b335ff1859356dc507b (patch)
treec493083ac65737e6c55d48670782774f36c09d26 /core/src/test/java/org/elasticsearch/action/admin/cluster
parent5f3ed99c7114e3747991d6d77d341299fd24658c (diff)
Always Accumulate Transport Exceptions (#25017)
This removes the `accumulateExceptions()` method (and its usage) from `TransportNodesAction` and `TransportTasksAction`, forcing both transport actions to always accumulate exceptions. Without this change, some transport actions, like `TransportNodesStatsAction` would respond in very unexpected ways by returning no response due to some failure, but instead of returning an error the response would simply be empty: no response and no error. This results in a very trappy response structure where users can check for an error, then attempt to blindly use the response when no error is returned.
Diffstat (limited to 'core/src/test/java/org/elasticsearch/action/admin/cluster')
-rw-r--r--core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java4
-rw-r--r--core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java8
-rw-r--r--core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java4
3 files changed, 0 insertions, 16 deletions
diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java
index 0cece76425..fdd5091485 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java
@@ -164,10 +164,6 @@ public abstract class TaskManagerTestCase extends ESTestCase {
@Override
protected abstract NodeResponse nodeOperation(NodeRequest request);
- @Override
- protected boolean accumulateExceptions() {
- return true;
- }
}
public static class TestNode implements Releasable {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java
index b4ba0354ed..ec981442b5 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java
@@ -313,10 +313,6 @@ public class TestTaskPlugin extends Plugin implements ActionPlugin {
throw new UnsupportedOperationException("the task parameter is required");
}
- @Override
- protected boolean accumulateExceptions() {
- return true;
- }
}
public static class TestTaskAction extends Action<NodesRequest, NodesResponse, NodesRequestBuilder> {
@@ -453,10 +449,6 @@ public class TestTaskPlugin extends Plugin implements ActionPlugin {
listener.onResponse(new UnblockTestTaskResponse());
}
- @Override
- protected boolean accumulateExceptions() {
- return true;
- }
}
public static class UnblockTestTasksAction extends Action<UnblockTestTasksRequest, UnblockTestTasksResponse,
diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java
index 4e624164fa..3f9792e32f 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java
@@ -270,10 +270,6 @@ public class TransportTasksActionTests extends TaskManagerTestCase {
return new TestTaskResponse(in);
}
- @Override
- protected boolean accumulateExceptions() {
- return true;
- }
}
private ActionFuture<NodesResponse> startBlockingTestNodesAction(CountDownLatch checkLatch) throws InterruptedException {