honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 01:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining tribe node references (#29574)

Browse Source 
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.
This commit is contained in:
Ryan Ernst 2018-04-19 18:02:01 -07:00 committed by GitHub
parent 9cf8b01fc4
commit 7975280383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/modules/cross-cluster-search.asciidoc
View File

@ -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]
--------------------------------------------------

5
qa/evil-tests/src/test/resources/org/elasticsearch/tribe/elasticsearch.yml
View File

@ -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

11
server/src/main/java/org/elasticsearch/bootstrap/Security.java
View File

@ -328,7 +328,6 @@ final class Security {
private static void addBindPermissions(Permissions policy, Settings settings) {
addSocketPermissionForHttp(policy, settings);
addSocketPermissionForTransportProfiles(policy, settings);
addSocketPermissionForTribeNodes(policy, settings);
}
/**
@ -374,16 +373,6 @@ final class Security {
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.
*

3
server/src/main/java/org/elasticsearch/node/Node.java
View File

@ -776,8 +776,7 @@ public class Node implements Closeable {
logger.info("closing ...");
List<Closeable> toClose = new ArrayList<>();
StopWatch stopWatch = new StopWatch("node_close");
toClose.add(() -> stopWatch.start("tribe"));
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)) {