Add Cross Cluster Search support for scroll searches by s1monw · Pull Request #25094 · elastic/elasticsearch

s1monw · 2017-06-07T07:59:46Z

To complete the cross cluster search capabilities for all search types and
function this change adds cross cluster search support for scroll searches.

To complete the cross cluster search capabilities for all search types and function this change adds cross cluster search support for scroll searches.

In order to add scroll support for cross cluster search we need to resolve the nodes encoded in the scroll ID to send requests to the corresponding nodes. This change adds the low level connection infrastrucutre that also ensures that connections are re-established if the cluster is disconnected due to a network faiulre or restarts. Relates to elastic#25094

s1monw · 2017-06-08T06:55:51Z

FYI I broke out the connection infrastructure changes into a sep. PR to make this one smaller: #25123

s1monw · 2017-06-08T06:57:29Z

core/src/main/java/org/elasticsearch/action/search/ClearScrollController.java

+
+import static org.elasticsearch.action.search.TransportSearchHelper.parseScrollId;
+
+final class ClearScrollController implements Runnable {


I broke this class out of TransportClearScrollAction.java since I needed to add unittest for it. It was much easier to do that as a sep. class such that the transport action is really just passing on the request.

This change extracts the main logic from `TransportClearScrollAction` into a new class `ClearScrollController` and adds a corresponding unittest. Relates to elastic#25094

s1monw · 2017-06-08T07:25:38Z

I took another intermediate step to make this smaller here: #25125
once the breakouts are in I merge this one up for simpler reviews.

This change extracts the main logic from `TransportClearScrollAction` into a new class `ClearScrollController` and adds a corresponding unit test. Relates to #25094

jpountz

The transport layer is a bit out of my comfort zone so don't trust my review too much, but I think that change makes sense to me.

s1monw · 2017-06-08T11:43:25Z

The transport layer is a bit out of my comfort zone so don't trust my review too much, but I think that change makes sense to me.

@jpountz I opened #25123 for this to separate it out

javanna

LGTM

javanna · 2017-06-13T09:13:23Z

core/src/main/java/org/elasticsearch/action/search/ClearScrollController.java

+                    } else {
+                        try {
+                            Transport.Connection connection = searchTransportService.getConnection(target.getClusterAlias(),
+                                node);


I think that node); fits in the previous line

javanna · 2017-06-13T09:13:46Z

core/src/main/java/org/elasticsearch/action/search/ClearScrollController.java

+                                node);
+                            searchTransportService.sendFreeContext(connection, target.getScrollId(),
+                                ActionListener.wrap(freed -> onFreedContext(freed.isFreed()),
+                                    e -> onFailedFreedContext(e, node)));


I think this line fits in the previous one

javanna · 2017-06-13T09:40:47Z

qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/40_scroll.yml

+
+  - do:
+      search:
+        index: my_remote_cluster:test_index


maybe also scroll against local indices at the same time? That would complicate the test a bit though, maybe it's not worth it, not sure.

In order to add scroll support for cross cluster search we need to resolve the nodes encoded in the scroll ID to send requests to the corresponding nodes. This change adds the low level connection infrastructure that also ensures that connections are re-established if the cluster is disconnected due to a network failure or restarts. Relates to #25094

s1monw · 2017-06-13T13:25:20Z

@javanna @jpountz I merged this up with master since all spinoffs are in. I think it's basically down to the essentials of this change. If you wanna take another look at it since it's must more contained now?

This change extracts the main logic from `TransportClearScrollAction` into a new class `ClearScrollController` and adds a corresponding unit test. Relates to #25094

To complete the cross cluster search capabilities for all search types and function this change adds cross cluster search support for scroll searches.

* master: (27 commits) Refactor TransportShardBulkAction.executeUpdateRequest and add tests Make sure range queries are correctly profiled. (elastic#25108) Test: allow setting socket timeout for rest client (elastic#25221) Migration docs for elastic#25080 (elastic#25218) Remove `discovery.type` BWC layer from the EC2/Azure/GCE plugins elastic#25080 When stopping via systemd only kill the JVM, not its control group (elastic#25195) Remove PrefixAnalyzer, because it is no longer used. Internal: Remove Strings.cleanPath (elastic#25209) Docs: Add note about which secure settings are valid (elastic#25212) Indices.rollover/10_basic should refresh to make the doc visible in lucene stats Port support for commercial GeoIP2 databases from Logstash. (elastic#24889) [DOCS] Add ML node to node.asciidoc (elastic#24495) expose simple pattern tokenizers (elastic#25159) Test: add setting to change request timeout for rest client (elastic#25201) Fix secure repository-hdfs tests on JDK 9 Add target_field parameter to gsub, join, lowercase, sort, split, trim, uppercase (elastic#24133) Add Cross Cluster Search support for scroll searches (elastic#25094) Adapt skip version in rest-api-spec/test/indices.rollover/20_max_doc_condition.yml Rollover max docs should only count primaries (elastic#24977) Add remote cluster infrastructure to fetch discovery nodes. (elastic#25123) ...

Add Cross Cluster Search support for scroll searches

2d83353

To complete the cross cluster search capabilities for all search types and function this change adds cross cluster search support for scroll searches.

s1monw added :Search/Search Search-related issues that do not fall into other categories >enhancement v5.6.0 v6.0.0 labels Jun 7, 2017

s1monw requested review from javanna, jimczi and jpountz June 7, 2017 07:59

s1monw added 10 commits June 7, 2017 10:08

foo

20daeb3

fix modifyer

28b7f0c

fix line len

0d6982e

pass dummy listener to tests

5e169a6

wait for listener to be called

ae95dc1

Merge branch 'master' into scroll_cross_cluster

833b028

add extra exception handling

1e5e08b

add basic proxy actions

7769d33

Merge branch 'master' into scroll_cross_cluster

0812eb8

remove extra catch block since it's not needed

3dff739

s1monw mentioned this pull request Jun 8, 2017

Add remote cluster infrastructure to fetch discovery nodes. #25123

Merged

Merge branch 'master' into scroll_cross_cluster

ccac08e

s1monw commented Jun 8, 2017

View reviewed changes

Merge branch 'master' into scroll_cross_cluster

ae7ebaf

s1monw mentioned this pull request Jun 8, 2017

Break out clear scroll logic from TransportClearScrollAction #25125

Merged

jpountz approved these changes Jun 8, 2017

View reviewed changes

Merge branch 'master' into scroll_cross_cluster

41671c1

s1monw added 2 commits June 11, 2017 10:53

Merge branch 'master' into scroll_cross_cluster

65d8be2

Merge branch 'master' into scroll_cross_cluster

1d02055

javanna approved these changes Jun 13, 2017

View reviewed changes

fix typo

a4399e3

s1monw added 2 commits June 13, 2017 15:21

Merge branch 'master' into scroll_cross_cluster

6cb2ec4

apply feedback

9248816

s1monw merged commit bc7ec68 into elastic:master Jun 13, 2017

s1monw deleted the scroll_cross_cluster branch June 13, 2017 15:22

s1monw added a commit that referenced this pull request Jun 13, 2017

Add Cross Cluster Search support for scroll searches (#25094)

681a96a

To complete the cross cluster search capabilities for all search types and function this change adds cross cluster search support for scroll searches.

colings86 added v6.0.0-beta1 and removed v6.0.0 labels Aug 3, 2017

javanna mentioned this pull request Aug 22, 2018

Federated multi-cluster search + scroll #32932

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Cross Cluster Search support for scroll searches#25094

Add Cross Cluster Search support for scroll searches#25094
s1monw merged 19 commits intoelastic:masterfrom
s1monw:scroll_cross_cluster

s1monw commented Jun 7, 2017

Uh oh!

s1monw commented Jun 8, 2017

Uh oh!

s1monw Jun 8, 2017

Uh oh!

s1monw commented Jun 8, 2017

Uh oh!

jpountz left a comment

Uh oh!

s1monw commented Jun 8, 2017

Uh oh!

javanna left a comment

Uh oh!

javanna Jun 13, 2017

Uh oh!

javanna Jun 13, 2017

Uh oh!

javanna Jun 13, 2017

Uh oh!

s1monw commented Jun 13, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants


		import static org.elasticsearch.action.search.TransportSearchHelper.parseScrollId;

		final class ClearScrollController implements Runnable {

Conversation

s1monw commented Jun 7, 2017

Uh oh!

s1monw commented Jun 8, 2017

Uh oh!

s1monw Jun 8, 2017

Choose a reason for hiding this comment

Uh oh!

s1monw commented Jun 8, 2017

Uh oh!

jpountz left a comment

Choose a reason for hiding this comment

Uh oh!

s1monw commented Jun 8, 2017

Uh oh!

javanna left a comment

Choose a reason for hiding this comment

Uh oh!

javanna Jun 13, 2017

Choose a reason for hiding this comment

Uh oh!

javanna Jun 13, 2017

Choose a reason for hiding this comment

Uh oh!

javanna Jun 13, 2017

Choose a reason for hiding this comment

Uh oh!

s1monw commented Jun 13, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants