forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ccr_auto_follow
* master: (64 commits) HLREST: add update by query API (elastic#32760) TEST: Increase timeout testFollowIndexAndCloseNode (elastic#33333) HLRC: ML Flush job (elastic#33187) HLRC: Adding ML Job stats (elastic#33183) LLREST: Drop deprecated methods (elastic#33223) Mute testSyncerOnClosingShard [DOCS] Moves machine learning APIs to docs folder (elastic#31118) Mute test watcher usage stats output [Rollup] Fix FullClusterRestart test Adjust soft-deletes version after backport into 6.5 completely drop `index.shard.check_on_startup: fix` for 7.0 (elastic#33194) Fix AwaitsFix issue number Mute SmokeTestWatcherWithSecurityIT testsi drop `index.shard.check_on_startup: fix` (elastic#32279) tracked at [DOCS] Moves ml folder from x-pack/docs to docs (elastic#33248) [DOCS] Move rollup APIs to docs (elastic#31450) [DOCS] Rename X-Pack Commands section (elastic#33005) TEST: Disable soft-deletes in ParentChildTestCase Fixes SecurityIntegTestCase so it always adds at least one alias (elastic#33296) ...
- Loading branch information
Showing
410 changed files
with
11,752 additions
and
3,535 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
buildSrc/src/main/java/org/elasticsearch/GradleServicesAdapter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch; | ||
|
|
||
| import org.gradle.api.Action; | ||
| import org.gradle.api.Project; | ||
| import org.gradle.api.file.CopySpec; | ||
| import org.gradle.api.file.FileTree; | ||
| import org.gradle.api.tasks.WorkResult; | ||
| import org.gradle.process.ExecResult; | ||
| import org.gradle.process.JavaExecSpec; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| /** | ||
| * Facilitate access to Gradle services without a direct dependency on Project. | ||
| * | ||
| * In a future release Gradle will offer service injection, this adapter plays that role until that time. | ||
| * It exposes the service methods that are part of the public API as the classes implementing them are not. | ||
| * Today service injection is <a href="https://github.com/gradle/gradle/issues/2363">not available</a> for | ||
| * extensions. | ||
| * | ||
| * Everything exposed here must be thread safe. That is the very reason why project is not passed in directly. | ||
| */ | ||
| public class GradleServicesAdapter { | ||
|
|
||
| public final Project project; | ||
|
|
||
| public GradleServicesAdapter(Project project) { | ||
| this.project = project; | ||
| } | ||
|
|
||
| public static GradleServicesAdapter getInstance(Project project) { | ||
| return new GradleServicesAdapter(project); | ||
| } | ||
|
|
||
| public WorkResult copy(Action<? super CopySpec> action) { | ||
| return project.copy(action); | ||
| } | ||
|
|
||
| public WorkResult sync(Action<? super CopySpec> action) { | ||
| return project.sync(action); | ||
| } | ||
|
|
||
| public ExecResult javaexec(Action<? super JavaExecSpec> action) { | ||
| return project.javaexec(action); | ||
| } | ||
|
|
||
| public FileTree zipTree(File zipPath) { | ||
| return project.zipTree(zipPath); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
buildSrc/src/main/java/org/elasticsearch/gradle/Distribution.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.gradle; | ||
|
|
||
| public enum Distribution { | ||
|
|
||
| INTEG_TEST("integ-test-zip"), | ||
| ZIP("zip"), | ||
| ZIP_OSS("zip-oss"); | ||
|
|
||
| private final String name; | ||
|
|
||
| Distribution(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
| } |
110 changes: 110 additions & 0 deletions
110
buildSrc/src/main/java/org/elasticsearch/gradle/clusterformation/ClusterformationPlugin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.gradle.clusterformation; | ||
|
|
||
| import groovy.lang.Closure; | ||
| import org.elasticsearch.GradleServicesAdapter; | ||
| import org.gradle.api.NamedDomainObjectContainer; | ||
| import org.gradle.api.Plugin; | ||
| import org.gradle.api.Project; | ||
| import org.gradle.api.Task; | ||
| import org.gradle.api.execution.TaskActionListener; | ||
| import org.gradle.api.execution.TaskExecutionListener; | ||
| import org.gradle.api.logging.Logger; | ||
| import org.gradle.api.logging.Logging; | ||
| import org.gradle.api.plugins.ExtraPropertiesExtension; | ||
| import org.gradle.api.tasks.TaskState; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public class ClusterformationPlugin implements Plugin<Project> { | ||
|
|
||
| public static final String LIST_TASK_NAME = "listElasticSearchClusters"; | ||
| public static final String EXTENSION_NAME = "elasticSearchClusters"; | ||
|
|
||
| private final Logger logger = Logging.getLogger(ClusterformationPlugin.class); | ||
|
|
||
| @Override | ||
| public void apply(Project project) { | ||
| NamedDomainObjectContainer<? extends ElasticsearchConfiguration> container = project.container( | ||
| ElasticsearchNode.class, | ||
| (name) -> new ElasticsearchNode(name, GradleServicesAdapter.getInstance(project)) | ||
| ); | ||
| project.getExtensions().add(EXTENSION_NAME, container); | ||
|
|
||
| Task listTask = project.getTasks().create(LIST_TASK_NAME); | ||
| listTask.setGroup("ES cluster formation"); | ||
| listTask.setDescription("Lists all ES clusters configured for this project"); | ||
| listTask.doLast((Task task) -> | ||
| container.forEach((ElasticsearchConfiguration cluster) -> | ||
| logger.lifecycle(" * {}: {}", cluster.getName(), cluster.getDistribution()) | ||
| ) | ||
| ); | ||
|
|
||
| Map<Task, List<ElasticsearchConfiguration>> taskToCluster = new HashMap<>(); | ||
|
|
||
| // register an extension for all current and future tasks, so that any task can declare that it wants to use a | ||
| // specific cluster. | ||
| project.getTasks().all((Task task) -> | ||
| task.getExtensions().findByType(ExtraPropertiesExtension.class) | ||
| .set( | ||
| "useCluster", | ||
| new Closure<Void>(this, this) { | ||
| public void doCall(ElasticsearchConfiguration conf) { | ||
| taskToCluster.computeIfAbsent(task, k -> new ArrayList<>()).add(conf); | ||
| } | ||
| }) | ||
| ); | ||
|
|
||
| project.getGradle().getTaskGraph().whenReady(taskExecutionGraph -> | ||
| taskExecutionGraph.getAllTasks() | ||
| .forEach(task -> | ||
| taskToCluster.getOrDefault(task, Collections.emptyList()).forEach(ElasticsearchConfiguration::claim) | ||
| ) | ||
| ); | ||
| project.getGradle().addListener( | ||
| new TaskActionListener() { | ||
| @Override | ||
| public void beforeActions(Task task) { | ||
| // we only start the cluster before the actions, so we'll not start it if the task is up-to-date | ||
| taskToCluster.getOrDefault(task, new ArrayList<>()).forEach(ElasticsearchConfiguration::start); | ||
| } | ||
| @Override | ||
| public void afterActions(Task task) {} | ||
| } | ||
| ); | ||
| project.getGradle().addListener( | ||
| new TaskExecutionListener() { | ||
| @Override | ||
| public void afterExecute(Task task, TaskState state) { | ||
| // always un-claim the cluster, even if _this_ task is up-to-date, as others might not have been and caused the | ||
| // cluster to start. | ||
| taskToCluster.getOrDefault(task, new ArrayList<>()).forEach(ElasticsearchConfiguration::unClaimAndStop); | ||
| } | ||
| @Override | ||
| public void beforeExecute(Task task) {} | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.