From dbff0e114449232a025037a79781071717eab613 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Fri, 29 Jan 2016 15:33:57 -0500 Subject: [PATCH] Add task cancellation mechanism See elastic/elasticsearchelastic/elasticsearch#16320 for more information Original commit: elastic/x-pack-elasticsearch@4f8a9b1258e3e1ff8341fbc9a1b23821c1dfd4e0 --- .../src/test/resources/org/elasticsearch/transport/actions | 1 + .../src/test/resources/org/elasticsearch/transport/handlers | 2 ++ 2 files changed, 3 insertions(+) diff --git a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions index 3505f5d1e3a..481521d2d78 100644 --- a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions +++ b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/actions @@ -10,6 +10,7 @@ cluster:admin/snapshot/delete cluster:admin/snapshot/get cluster:admin/snapshot/restore cluster:admin/snapshot/status +cluster:admin/tasks/cancel cluster:monitor/health cluster:monitor/nodes/hot_threads cluster:monitor/nodes/info diff --git a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/handlers b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/handlers index acbabff5f9c..e0e564e12f6 100644 --- a/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/handlers +++ b/elasticsearch/x-pack/shield/src/test/resources/org/elasticsearch/transport/handlers @@ -1,6 +1,7 @@ cluster:admin/render/template/search cluster:admin/snapshot/status[nodes] cluster:admin/snapshot/status[nodes][n] +cluster:admin/tasks/cancel[n] cluster:monitor/nodes/hot_threads[n] cluster:monitor/nodes/info[n] cluster:monitor/nodes/liveness @@ -69,6 +70,7 @@ indices:monitor/shard_stores indices:monitor/stats[n] indices:monitor/upgrade[n] indices:monitor/upgrade +internal:admin/tasks/ban internal:cluster/node/index/deleted internal:cluster/node/index_store/deleted internal:cluster/node/mapping/refresh