From 90fc389a6143ec38cf98f33b9bb034ae25b89c0b Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 17 Apr 2018 19:56:06 -0700 Subject: [PATCH 1/2] Remove remaining tribe node references While tribe node was removed in https://github.com/elastic/elasticsearch/pull/28443, there remained a couple lingering references to it in docs and code. This commit removes those remaining references. --- docs/reference/modules/cross-cluster-search.asciidoc | 3 +-- .../org/elasticsearch/tribe/elasticsearch.yml | 5 ----- .../java/org/elasticsearch/bootstrap/Security.java | 11 ----------- server/src/main/java/org/elasticsearch/node/Node.java | 1 - 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 qa/evil-tests/src/test/resources/org/elasticsearch/tribe/elasticsearch.yml diff --git a/docs/reference/modules/cross-cluster-search.asciidoc b/docs/reference/modules/cross-cluster-search.asciidoc index d3c6426f271ef..21e21edc35b57 100644 --- a/docs/reference/modules/cross-cluster-search.asciidoc +++ b/docs/reference/modules/cross-cluster-search.asciidoc @@ -222,8 +222,7 @@ GET /cluster_one:twitter/_search // TESTRESPONSE[s/"_score": 1/"_score": "$body.hits.hits.0._score"/] -In contrast to the `tribe` feature cross cluster search can also search indices with the same name on different -clusters: +Indices can also be searched with the same name on different clusters: [source,js] -------------------------------------------------- diff --git a/qa/evil-tests/src/test/resources/org/elasticsearch/tribe/elasticsearch.yml b/qa/evil-tests/src/test/resources/org/elasticsearch/tribe/elasticsearch.yml deleted file mode 100644 index 19b2a7b5dd92f..0000000000000 --- a/qa/evil-tests/src/test/resources/org/elasticsearch/tribe/elasticsearch.yml +++ /dev/null @@ -1,5 +0,0 @@ -cluster.name: tribe_node_cluster -tribe.t1.cluster.name: tribe1 -tribe.t2.cluster.name: tribe2 -tribe.t1.node.id.seed: 1 -tribe.t2.node.id.seed: 2 diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Security.java b/server/src/main/java/org/elasticsearch/bootstrap/Security.java index 9f2790c94cce6..5b4f352ded945 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/Security.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/Security.java @@ -328,7 +328,6 @@ static void addFilePermissions(Permissions policy, Environment environment) thro private static void addBindPermissions(Permissions policy, Settings settings) { addSocketPermissionForHttp(policy, settings); addSocketPermissionForTransportProfiles(policy, settings); - addSocketPermissionForTribeNodes(policy, settings); } /** @@ -374,16 +373,6 @@ private static void addSocketPermissionForTransport(final Permissions policy, fi addSocketPermissionForPortRange(policy, transportRange); } - private static void addSocketPermissionForTribeNodes(final Permissions policy, final Settings settings) { - for (final Settings tribeNodeSettings : settings.getGroups("tribe", true).values()) { - // tribe nodes have HTTP disabled by default, so we check if HTTP is enabled before granting - if (NetworkModule.HTTP_ENABLED.exists(tribeNodeSettings) && NetworkModule.HTTP_ENABLED.get(tribeNodeSettings)) { - addSocketPermissionForHttp(policy, tribeNodeSettings); - } - addSocketPermissionForTransport(policy, tribeNodeSettings); - } - } - /** * Add dynamic {@link SocketPermission} for the specified port range. * diff --git a/server/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java index b02e1614bbdea..7a3250e1a0dde 100644 --- a/server/src/main/java/org/elasticsearch/node/Node.java +++ b/server/src/main/java/org/elasticsearch/node/Node.java @@ -777,7 +777,6 @@ public synchronized void close() throws IOException { logger.info("closing ..."); List toClose = new ArrayList<>(); StopWatch stopWatch = new StopWatch("node_close"); - toClose.add(() -> stopWatch.start("tribe")); toClose.add(() -> stopWatch.stop().start("node_service")); toClose.add(nodeService); toClose.add(() -> stopWatch.stop().start("http")); From 558f49d20984c36f62973dfb8a7c01b286544273 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 18 Apr 2018 12:26:30 -0700 Subject: [PATCH 2/2] fix incorrect stop call now that tribe is gone from close --- server/src/main/java/org/elasticsearch/node/Node.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java index 7a3250e1a0dde..6bf9b6ec4a9b1 100644 --- a/server/src/main/java/org/elasticsearch/node/Node.java +++ b/server/src/main/java/org/elasticsearch/node/Node.java @@ -777,7 +777,7 @@ public synchronized void close() throws IOException { logger.info("closing ..."); List toClose = new ArrayList<>(); StopWatch stopWatch = new StopWatch("node_close"); - toClose.add(() -> stopWatch.stop().start("node_service")); + toClose.add(() -> stopWatch.start("node_service")); toClose.add(nodeService); toClose.add(() -> stopWatch.stop().start("http")); if (NetworkModule.HTTP_ENABLED.get(settings)) {