Merge branch 'master' into fix_54540

Author: nik9000

.ci/bwcVersions

@@ -17,6 +17,7 @@ BWC_VERSION:
   - "7.6.0"
   - "7.6.1"
   - "7.6.2"
+  - "7.6.3"
   - "7.7.0"
   - "7.8.0"
   - "8.0.0"

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestIntegTestTask.groovy

@@ -5,11 +5,16 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class SystemPropertyCommandLineArgumentProvider implements CommandLineArgumentProvider {
     private final Map<String, Object> systemProperties = new LinkedHashMap<>();
 
+    public void systemProperty(String key, Supplier<String> value) {
+        systemProperties.put(key, value);
+    }
+
     public void systemProperty(String key, Object value) {
         systemProperties.put(key, value);
     }
@@ -18,7 +23,12 @@ public void systemProperty(String key, Object value) {
     public Iterable<String> asArguments() {
         return systemProperties.entrySet()
             .stream()
-            .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue())
+            .map(
+                entry -> "-D"
+                    + entry.getKey()
+                    + "="
+                    + (entry.getValue() instanceof Supplier ? ((Supplier) entry.getValue()).get() : entry.getValue())
+            )
             .collect(Collectors.toList());
     }
 

buildSrc/src/main/java/org/elasticsearch/gradle/SystemPropertyCommandLineArgumentProvider.java

@@ -7,7 +7,7 @@
  * 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
+ *     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
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.gradle.test
+
+package org.elasticsearch.gradle.test;
 
 /**
  * Any object that can produce an accompanying stop task, meant to tear down
@@ -25,6 +26,6 @@
 public interface Fixture {
 
     /** A task which will stop this fixture. This should be used as a finalizedBy for any tasks that use the fixture. */
-    public Object getStopTask()
+    Object getStopTask();
 
 }

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/Fixture.groovy renamed to buildSrc/src/main/java/org/elasticsearch/gradle/test/Fixture.java

@@ -0,0 +1,104 @@
+/*
+ * 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.test;
+
+import org.elasticsearch.gradle.SystemPropertyCommandLineArgumentProvider;
+import org.elasticsearch.gradle.testclusters.ElasticsearchCluster;
+import org.elasticsearch.gradle.testclusters.RestTestRunnerTask;
+import org.elasticsearch.gradle.testclusters.TestClustersPlugin;
+import org.gradle.api.Action;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+
+public class RestIntegTestTask extends DefaultTask {
+
+    protected RestTestRunnerTask runner;
+    private static final String TESTS_REST_CLUSTER = "tests.rest.cluster";
+    private static final String TESTS_CLUSTER = "tests.cluster";
+    private static final String TESTS_CLUSTER_NAME = "tests.clustername";
+
+    public RestIntegTestTask() {
+        Project project = getProject();
+        String name = getName();
+        runner = project.getTasks().create(name + "Runner", RestTestRunnerTask.class);
+        super.dependsOn(runner);
+        @SuppressWarnings("unchecked")
+        NamedDomainObjectContainer<ElasticsearchCluster> testClusters = (NamedDomainObjectContainer<ElasticsearchCluster>) project
+            .getExtensions()
+            .getByName(TestClustersPlugin.EXTENSION_NAME);
+        ElasticsearchCluster cluster = testClusters.create(name);
+        runner.useCluster(cluster);
+        runner.include("**/*IT.class");
+        runner.systemProperty("tests.rest.load_packaged", Boolean.FALSE.toString());
+        if (System.getProperty(TESTS_REST_CLUSTER) == null) {
+            if (System.getProperty(TESTS_CLUSTER) != null || System.getProperty(TESTS_CLUSTER_NAME) != null) {
+                throw new IllegalArgumentException(
+                    String.format("%s, %s, and %s must all be null or non-null", TESTS_REST_CLUSTER, TESTS_CLUSTER, TESTS_CLUSTER_NAME)
+                );
+            }
+            SystemPropertyCommandLineArgumentProvider runnerNonInputProperties = (SystemPropertyCommandLineArgumentProvider) runner
+                .getExtensions()
+                .getByName("nonInputProperties");
+            runnerNonInputProperties.systemProperty(TESTS_REST_CLUSTER, () -> String.join(",", cluster.getAllHttpSocketURI()));
+            runnerNonInputProperties.systemProperty(TESTS_CLUSTER, () -> String.join(",", cluster.getAllTransportPortURI()));
+            runnerNonInputProperties.systemProperty(TESTS_CLUSTER_NAME, cluster::getName);
+        } else {
+            if (System.getProperty(TESTS_CLUSTER) == null || System.getProperty(TESTS_CLUSTER_NAME) == null) {
+                throw new IllegalArgumentException(
+                    String.format("%s, %s, and %s must all be null or non-null", TESTS_REST_CLUSTER, TESTS_CLUSTER, TESTS_CLUSTER_NAME)
+                );
+            }
+        }
+        // this must run after all projects have been configured, so we know any project
+        // references can be accessed as a fully configured
+        project.getGradle().projectsEvaluated(x -> {
+            if (isEnabled() == false) {
+                runner.setEnabled(false);
+            }
+        });
+    }
+
+    @Override
+    public Task dependsOn(Object... dependencies) {
+        runner.dependsOn(dependencies);
+        for (Object dependency : dependencies) {
+            if (dependency instanceof Fixture) {
+                runner.finalizedBy(((Fixture) dependency).getStopTask());
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public void setDependsOn(Iterable<?> dependencies) {
+        runner.setDependsOn(dependencies);
+        for (Object dependency : dependencies) {
+            if (dependency instanceof Fixture) {
+                runner.finalizedBy(((Fixture) dependency).getStopTask());
+            }
+        }
+    }
+
+    public void runner(Action<? super RestTestRunnerTask> configure) {
+        configure.execute(runner);
+    }
+}

buildSrc/src/main/java/org/elasticsearch/gradle/test/RestIntegTestTask.java

@@ -39,6 +39,9 @@ static Request cancelTasks(CancelTasksRequest req) {
         params
             .withNodes(req.getNodes())
             .withActions(req.getActions());
+        if (req.getWaitForCompletion() != null) {
+            params.withWaitForCompletion(req.getWaitForCompletion());
+        }
         request.addParameters(params.asMap());
         return request;
     }

client/rest-high-level/src/main/java/org/elasticsearch/client/TasksRequestConverters.java

@@ -33,6 +33,7 @@ public class CancelTasksRequest implements Validatable {
     private Optional<TimeValue> timeout = Optional.empty();
     private Optional<TaskId> parentTaskId = Optional.empty();
     private Optional<TaskId> taskId = Optional.empty();
+    private Boolean waitForCompletion;
 
     CancelTasksRequest(){}
 
@@ -76,6 +77,14 @@ public Optional<TaskId> getTaskId() {
         return taskId;
     }
 
+    public Boolean getWaitForCompletion() {
+        return waitForCompletion;
+    }
+
+    public void setWaitForCompletion(boolean waitForCompletion) {
+        this.waitForCompletion = waitForCompletion;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -85,12 +94,13 @@ public boolean equals(Object o) {
             Objects.equals(getActions(), that.getActions()) &&
             Objects.equals(getTimeout(), that.getTimeout()) &&
             Objects.equals(getParentTaskId(), that.getParentTaskId()) &&
-            Objects.equals(getTaskId(), that.getTaskId()) ;
+            Objects.equals(getTaskId(), that.getTaskId()) &&
+            Objects.equals(waitForCompletion, that.waitForCompletion);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getNodes(), getActions(), getTimeout(), getParentTaskId(), getTaskId());
+        return Objects.hash(getNodes(), getActions(), getTimeout(), getParentTaskId(), getTaskId(), waitForCompletion);
     }
 
     @Override
@@ -101,6 +111,7 @@ public String toString() {
             ", timeout=" + timeout +
             ", parentTaskId=" + parentTaskId +
             ", taskId=" + taskId +
+            ", waitForCompletion=" + waitForCompletion +
             '}';
     }
 
@@ -110,6 +121,7 @@ public static class Builder {
         private Optional<TaskId> parentTaskId = Optional.empty();
         private List<String> actionsFilter = new ArrayList<>();
         private List<String> nodesFilter = new ArrayList<>();
+        private Boolean waitForCompletion;
 
         public Builder withTimeout(TimeValue timeout){
             this.timeout = Optional.of(timeout);
@@ -138,13 +150,21 @@ public Builder withNodesFiltered(List<String> nodes){
             return this;
         }
 
+        public Builder withWaitForCompletion(boolean waitForCompletion) {
+            this.waitForCompletion = waitForCompletion;
+            return this;
+        }
+
         public CancelTasksRequest build() {
             CancelTasksRequest request = new CancelTasksRequest();
             timeout.ifPresent(request::setTimeout);
             taskId.ifPresent(request::setTaskId);
             parentTaskId.ifPresent(request::setParentTaskId);
             request.setNodes(nodesFilter);
             request.setActions(actionsFilter);
+            if (waitForCompletion != null) {
+                request.setWaitForCompletion(waitForCompletion);
+            }
             return request;
         }
     }

client/rest-high-level/src/main/java/org/elasticsearch/client/tasks/CancelTasksRequest.java

@@ -22,6 +22,7 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksRequest;
+import org.elasticsearch.client.tasks.CancelTasksRequest;
 import org.elasticsearch.tasks.TaskId;
 import org.elasticsearch.test.ESTestCase;
 
@@ -40,14 +41,15 @@ public void testCancelTasks() {
             new org.elasticsearch.client.tasks.TaskId(randomAlphaOfLength(5), randomNonNegativeLong());
         org.elasticsearch.client.tasks.TaskId parentTaskId =
             new org.elasticsearch.client.tasks.TaskId(randomAlphaOfLength(5), randomNonNegativeLong());
-        org.elasticsearch.client.tasks.CancelTasksRequest request =
-            new org.elasticsearch.client.tasks.CancelTasksRequest.Builder()
-                .withTaskId(taskId)
-                .withParentTaskId(parentTaskId)
-                .build();
+        CancelTasksRequest.Builder builder = new CancelTasksRequest.Builder().withTaskId(taskId).withParentTaskId(parentTaskId);
         expectedParams.put("task_id", taskId.toString());
         expectedParams.put("parent_task_id", parentTaskId.toString());
-        Request httpRequest = TasksRequestConverters.cancelTasks(request);
+        if (randomBoolean()) {
+            boolean waitForCompletion = randomBoolean();
+            builder.withWaitForCompletion(waitForCompletion);
+            expectedParams.put("wait_for_completion", Boolean.toString(waitForCompletion));
+        }
+        Request httpRequest = TasksRequestConverters.cancelTasks(builder.build());
         assertThat(httpRequest, notNullValue());
         assertThat(httpRequest.getMethod(), equalTo(HttpPost.METHOD_NAME));
         assertThat(httpRequest.getEntity(), nullValue());

client/rest-high-level/src/test/java/org/elasticsearch/client/TasksRequestConvertersTests.java

@@ -164,7 +164,8 @@ public void testCancelTasks() throws IOException {
             // tag::cancel-tasks-request-filter
             CancelTasksRequest byTaskIdRequest = new org.elasticsearch.client.tasks.CancelTasksRequest.Builder() // <1>
                 .withTaskId(new org.elasticsearch.client.tasks.TaskId("myNode",44L)) // <2>
-                .build(); // <3>
+                .withWaitForCompletion(true) // <3>
+                .build(); // <4>
             // end::cancel-tasks-request-filter
 
         }