Merge branch 'master' into rename-elasticsearch-nio

* master:
  Rename elasticsearch-core to core (elastic#31185)
  Move cli sub-project out of server to libs (elastic#31184)
  [DOCS] Fixes broken link in auditing settings
  QA: Better seed nodes for rolling restart

Author: jasontedor

build.gradle

@@ -205,8 +205,7 @@ subprojects {
     "org.elasticsearch.gradle:build-tools:${version}": ':build-tools',
     "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec',
     "org.elasticsearch:elasticsearch:${version}": ':server',
-    "org.elasticsearch:elasticsearch-cli:${version}": ':server:cli',
-    "org.elasticsearch:elasticsearch-core:${version}": ':libs:elasticsearch-core',
+    "org.elasticsearch:elasticsearch-core:${version}": ':libs:core',
     "org.elasticsearch:elasticsearch-nio:${version}": ':libs:nio',
     "org.elasticsearch:elasticsearch-x-content:${version}": ':libs:x-content',
     "org.elasticsearch:elasticsearch-secure-sm:${version}": ':libs:secure-sm',

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

@@ -87,8 +87,9 @@ class ClusterConfiguration {
      * A closure to call which returns the unicast host to connect to for cluster formation.
      *
      * This allows multi node clusters, or a new cluster to connect to an existing cluster.
-     * The closure takes two arguments, the NodeInfo for the first node in the cluster, and
-     * an AntBuilder which may be used to wait on conditions before returning.
+     * The closure takes three arguments, the NodeInfo for the first node in the cluster,
+     * the NodeInfo for the node current being configured, an AntBuilder which may be used
+     * to wait on conditions before returning.
      */
     @Input
     Closure unicastTransportUri = { NodeInfo seedNode, NodeInfo node, AntBuilder ant ->

client/rest/build.gradle

@@ -69,7 +69,7 @@ forbiddenApisTest {
 }
 
 // JarHell is part of es server, which we don't want to pull in
-// TODO: Not anymore. Now in elasticsearch-core
+// TODO: Not anymore. Now in :libs:core
 jarHell.enabled=false
 
 namingConventions {

client/sniffer/build.gradle

@@ -72,7 +72,7 @@ dependencyLicenses {
 }
 
 // JarHell is part of es server, which we don't want to pull in
-// TODO: Not anymore. Now in elasticsearch-core
+// TODO: Not anymore. Now in :libs:core
 jarHell.enabled=false
 
 namingConventions {

client/test/build.gradle

@@ -49,7 +49,7 @@ forbiddenApisTest {
 }
 
 // JarHell is part of es server, which we don't want to pull in
-// TODO: Not anymore. Now in elasticsearch-core
+// TODO: Not anymore. Now in :libs:core
 jarHell.enabled=false
 
 // TODO: should we have licenses for our test deps?

docs/reference/settings/audit-settings.asciidoc

@@ -33,12 +33,12 @@ subprojects {
             dependencies.all { Dependency dep ->
                 Project depProject = dependencyToProject(dep)
                 if (depProject != null
-                        && false == depProject.path.equals(':libs:elasticsearch-core')
+                        && false == depProject.path.equals(':libs:core')
                         && false == isEclipse 
                         && depProject.path.startsWith(':libs')) {
                     throw new InvalidUserDataException("projects in :libs "
                             + "may not depend on other projects libs except "
-                            + ":libs:elasticsearch-core but "
+                            + ":libs:core but "
                             + "${project.path} depends on ${depProject.path}")
                 }
             }

libs/build.gradle

@@ -19,17 +19,15 @@
 
 package org.elasticsearch.cli;
 
-import java.io.Closeable;
+import joptsimple.NonOptionArgumentSpec;
+import joptsimple.OptionSet;
+import org.elasticsearch.core.internal.io.IOUtils;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import joptsimple.NonOptionArgumentSpec;
-import joptsimple.OptionSet;
-
-import org.elasticsearch.core.internal.io.IOUtils;
-
 /**
  * A cli tool which is made up of multiple subcommands.
  */

server/cli/build.gradle renamed to libs/cli/build.gradle

@@ -81,23 +81,23 @@ dependencies {
         java9Compile sourceSets.main.output
     }
 
-    if (isEclipse == false || project.path == ":libs:elasticsearch-core-tests") {
+    if (isEclipse == false || project.path == ":libs:core-tests") {
         testCompile("org.elasticsearch.test:framework:${version}") {
             exclude group: 'org.elasticsearch', module: 'elasticsearch-core'
         }
     }
 }
 
 forbiddenApisMain {
-    // elasticsearch-core does not depend on server
-    // TODO: Need to decide how we want to handle for forbidden signatures with the changes to core
+    // :libs:core does not depend on server
+    // TODO: Need to decide how we want to handle for forbidden signatures with the changes to server
     signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')]
 }
 
 if (isEclipse) {
     // in eclipse the project is under a fake root, we need to change around the source sets
     sourceSets {
-        if (project.path == ":libs:elasticsearch-core") {
+        if (project.path == ":libs:core") {
             main.java.srcDirs = ['java']
             main.resources.srcDirs = ['resources']
         } else {

server/cli/licenses/jopt-simple-5.0.2.jar.sha1 renamed to libs/cli/licenses/jopt-simple-5.0.2.jar.sha1

@@ -1,2 +1,2 @@
-// this is just shell gradle file for eclipse to have separate projects for elasticsearch-core src and tests
+// this is just shell gradle file for eclipse to have separate projects for core src and tests
 apply from: '../../build.gradle'

server/cli/licenses/jopt-simple-LICENSE.txt renamed to libs/cli/licenses/jopt-simple-LICENSE.txt

@@ -1,6 +1,6 @@
-// this is just shell gradle file for eclipse to have separate projects for elasticsearch-core src and tests
+// this is just shell gradle file for eclipse to have separate projects for core src and tests
 apply from: '../../build.gradle'
 
 dependencies {
-  testCompile project(':libs:elasticsearch-core')
+  testCompile project(':libs:core')
 }

server/cli/licenses/jopt-simple-NOTICE.txt renamed to libs/cli/licenses/jopt-simple-NOTICE.txt

@@ -89,8 +89,9 @@ for (Version version : bwcVersions.wireCompatible) {
 
   Task oneThirdUpgradedTest = tasks.create(name: "${baseName}#oneThirdUpgradedTest", type: RestIntegTestTask)
 
-  configureUpgradeCluster("oneThirdUpgradedTestCluster", oldClusterTestRunner,
-      0, { oldClusterTest.nodes.get(1).transportUri() })
+  configureUpgradeCluster("oneThirdUpgradedTestCluster", oldClusterTestRunner, 0,
+    // Use all running nodes as seed nodes so there is no race between pinging and the tests
+    { oldClusterTest.nodes.get(1).transportUri() + ',' + oldClusterTest.nodes.get(2).transportUri() })
 
   Task oneThirdUpgradedTestRunner = tasks.getByName("${baseName}#oneThirdUpgradedTestRunner")
   oneThirdUpgradedTestRunner.configure {
@@ -101,8 +102,9 @@ for (Version version : bwcVersions.wireCompatible) {
 
   Task twoThirdsUpgradedTest = tasks.create(name: "${baseName}#twoThirdsUpgradedTest", type: RestIntegTestTask)
 
-  configureUpgradeCluster("twoThirdsUpgradedTestCluster", oneThirdUpgradedTestRunner,
-      1, { oneThirdUpgradedTest.nodes.get(0).transportUri() })
+  configureUpgradeCluster("twoThirdsUpgradedTestCluster", oneThirdUpgradedTestRunner, 1,
+    // Use all running nodes as seed nodes so there is no race between pinging and the tests
+    { oldClusterTest.nodes.get(2).transportUri() + ',' + oneThirdUpgradedTest.nodes.get(0).transportUri() })
 
   Task twoThirdsUpgradedTestRunner = tasks.getByName("${baseName}#twoThirdsUpgradedTestRunner")
   twoThirdsUpgradedTestRunner.configure {
@@ -113,8 +115,9 @@ for (Version version : bwcVersions.wireCompatible) {
 
   Task upgradedClusterTest = tasks.create(name: "${baseName}#upgradedClusterTest", type: RestIntegTestTask)
 
-  configureUpgradeCluster("upgradedClusterTestCluster", twoThirdsUpgradedTestRunner,
-      2, { twoThirdsUpgradedTest.nodes.get(0).transportUri() })
+  configureUpgradeCluster("upgradedClusterTestCluster", twoThirdsUpgradedTestRunner, 2,
+    // Use all running nodes as seed nodes so there is no race between pinging and the tests
+    { oneThirdUpgradedTest.nodes.get(0).transportUri() + ',' + twoThirdsUpgradedTest.nodes.get(0).transportUri() })
 
   Task upgradedClusterTestRunner = tasks.getByName("${baseName}#upgradedClusterTestRunner")
   upgradedClusterTestRunner.configure {

server/cli/src/main/java/org/elasticsearch/cli/Command.java renamed to libs/cli/src/main/java/org/elasticsearch/cli/Command.java

@@ -31,7 +31,7 @@ dependencies {
   compile "org.hamcrest:hamcrest-core:${versions.hamcrest}"
   compile "org.hamcrest:hamcrest-library:${versions.hamcrest}"
 
-  compile project(':libs:elasticsearch-core')
+  compile project(':libs:core')
 
   // pulls in the jar built by this project and its dependencies
   packagingTest project(path: project.path, configuration: 'runtime')

server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java renamed to libs/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java

@@ -83,7 +83,7 @@ if (isEclipse) {
   // eclipse cannot handle an intermediate dependency between main and test, so we must create separate projects
   // for server-src and server-tests
   projects << 'server-tests'
-  projects << 'libs:elasticsearch-core-tests'
+  projects << 'libs:core-tests'
   projects << 'libs:nio-tests'
   projects << 'libs:x-content-tests'
   projects << 'libs:secure-sm-tests'
@@ -99,10 +99,10 @@ if (isEclipse) {
   project(":server").buildFileName = 'eclipse-build.gradle'
   project(":server-tests").projectDir = new File(rootProject.projectDir, 'server/src/test')
   project(":server-tests").buildFileName = 'eclipse-build.gradle'
-  project(":libs:elasticsearch-core").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-core/src/main')
-  project(":libs:elasticsearch-core").buildFileName = 'eclipse-build.gradle'
-  project(":libs:elasticsearch-core-tests").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-core/src/test')
-  project(":libs:elasticsearch-core-tests").buildFileName = 'eclipse-build.gradle'
+  project(":libs:core").projectDir = new File(rootProject.projectDir, 'libs/core/src/main')
+  project(":libs:core").buildFileName = 'eclipse-build.gradle'
+  project(":libs:core-tests").projectDir = new File(rootProject.projectDir, 'libs/core/src/test')
+  project(":libs:core-tests").buildFileName = 'eclipse-build.gradle'
   project(":libs:nio").projectDir = new File(rootProject.projectDir, 'libs/nio/src/main')
   project(":libs:nio").buildFileName = 'eclipse-build.gradle'
   project(":libs:nio-tests").projectDir = new File(rootProject.projectDir, 'libs/nio/src/test')

server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java renamed to libs/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java

@@ -66,7 +66,7 @@ dependencies {
     compile (project(':libs:x-content')) {
         transitive = false
     }
-    compile project(':libs:elasticsearch-core')
+    compile project(':libs:core')
     runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
 
     testCompile "org.elasticsearch.test:framework:${version}"

server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java renamed to libs/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java

@@ -18,7 +18,7 @@ dependencies {
     compile (project(':server')) {
         transitive = false
     }
-    compile (project(':libs:elasticsearch-core')) {
+    compile (project(':libs:core')) {
         transitive = false
     }
     compile (project(':libs:x-content')) {

server/cli/src/main/java/org/elasticsearch/cli/Terminal.java renamed to libs/cli/src/main/java/org/elasticsearch/cli/Terminal.java

@@ -11,7 +11,7 @@ description = 'Request and response objects shared by the cli, jdbc ' +
         'and the Elasticsearch plugin'
 
 dependencies {
-    compile (project(':libs:elasticsearch-core')) {
+    compile (project(':libs:core')) {
         transitive = false
     }
     compile (project(':libs:x-content')) {

server/cli/src/main/java/org/elasticsearch/cli/UserException.java renamed to libs/cli/src/main/java/org/elasticsearch/cli/UserException.java

@@ -69,8 +69,9 @@ for (Version version : bwcVersions.wireCompatible) {
 
     Task oneThirdUpgradedTest = tasks.create(name: "${baseName}#oneThirdUpgradedTest", type: RestIntegTestTask)
 
-    configureUpgradeCluster("oneThirdUpgradedTestCluster", oldClusterTestRunner,
-        0, { oldClusterTest.nodes.get(1).transportUri() })
+    configureUpgradeCluster("oneThirdUpgradedTestCluster", oldClusterTestRunner, 0,
+        // Use all running nodes as seed nodes so there is no race between pinging and the tests
+        { oldClusterTest.nodes.get(1).transportUri() + ',' + oldClusterTest.nodes.get(2).transportUri() })
 
     Task oneThirdUpgradedTestRunner = tasks.getByName("${baseName}#oneThirdUpgradedTestRunner")
     oneThirdUpgradedTestRunner.configure {
@@ -81,8 +82,9 @@ for (Version version : bwcVersions.wireCompatible) {
 
     Task twoThirdsUpgradedTest = tasks.create(name: "${baseName}#twoThirdsUpgradedTest", type: RestIntegTestTask)
 
-    configureUpgradeCluster("twoThirdsUpgradedTestCluster", oneThirdUpgradedTestRunner,
-        1, { oneThirdUpgradedTest.nodes.get(0).transportUri() })
+    configureUpgradeCluster("twoThirdsUpgradedTestCluster", oneThirdUpgradedTestRunner, 1,
+        // Use all running nodes as seed nodes so there is no race between pinging and the tests
+        { oldClusterTest.nodes.get(2).transportUri() + ',' + oneThirdUpgradedTest.nodes.get(0).transportUri() })
 
     Task twoThirdsUpgradedTestRunner = tasks.getByName("${baseName}#twoThirdsUpgradedTestRunner")
     twoThirdsUpgradedTestRunner.configure {
@@ -93,8 +95,9 @@ for (Version version : bwcVersions.wireCompatible) {
 
     Task upgradedClusterTest = tasks.create(name: "${baseName}#upgradedClusterTest", type: RestIntegTestTask)
 
-    configureUpgradeCluster("upgradedClusterTestCluster", twoThirdsUpgradedTestRunner,
-        2, { twoThirdsUpgradedTest.nodes.get(0).transportUri() })
+    configureUpgradeCluster("upgradedClusterTestCluster", twoThirdsUpgradedTestRunner, 2,
+        // Use all running nodes as seed nodes so there is no race between pinging and the tests
+        { oneThirdUpgradedTest.nodes.get(0).transportUri() + ',' + twoThirdsUpgradedTest.nodes.get(0).transportUri() })
 
     Task upgradedClusterTestRunner = tasks.getByName("${baseName}#upgradedClusterTestRunner")
     upgradedClusterTestRunner.configure {

libs/elasticsearch-core/build.gradle renamed to libs/core/build.gradle

@@ -203,8 +203,9 @@ subprojects {
 
     Task oneThirdUpgradedTest = tasks.create(name: "${baseName}#oneThirdUpgradedTest", type: RestIntegTestTask)
 
-    configureUpgradeCluster("oneThirdUpgradedTestCluster", oldClusterTestRunner,
-      0, { oldClusterTest.nodes.get(1).transportUri() })
+    configureUpgradeCluster("oneThirdUpgradedTestCluster", oldClusterTestRunner, 0,
+      // Use all running nodes as seed nodes so there is no race between pinging and the tests
+      { oldClusterTest.nodes.get(1).transportUri() + ',' + oldClusterTest.nodes.get(2).transportUri() })
 
     Task oneThirdUpgradedTestRunner = tasks.getByName("${baseName}#oneThirdUpgradedTestRunner")
     oneThirdUpgradedTestRunner.configure {
@@ -221,8 +222,9 @@ subprojects {
 
     Task twoThirdsUpgradedTest = tasks.create(name: "${baseName}#twoThirdsUpgradedTest", type: RestIntegTestTask)
 
-    configureUpgradeCluster("twoThirdsUpgradedTestCluster", oneThirdUpgradedTestRunner,
-      1, { oneThirdUpgradedTest.nodes.get(0).transportUri() })
+    configureUpgradeCluster("twoThirdsUpgradedTestCluster", oneThirdUpgradedTestRunner, 1,
+      // Use all running nodes as seed nodes so there is no race between pinging and the tests
+      { oldClusterTest.nodes.get(2).transportUri() + ',' + oneThirdUpgradedTest.nodes.get(0).transportUri() })
 
     Task twoThirdsUpgradedTestRunner = tasks.getByName("${baseName}#twoThirdsUpgradedTestRunner")
     twoThirdsUpgradedTestRunner.configure {
@@ -233,16 +235,17 @@ subprojects {
 
     Task upgradedClusterTest = tasks.create(name: "${baseName}#upgradedClusterTest", type: RestIntegTestTask)
 
-    configureUpgradeCluster("upgradedClusterTestCluster", twoThirdsUpgradedTestRunner,
-        2, { twoThirdsUpgradedTest.nodes.get(0).transportUri() })
+    configureUpgradeCluster("upgradedClusterTestCluster", twoThirdsUpgradedTestRunner, 2,
+      // Use all running nodes as seed nodes so there is no race between pinging and the tests
+      { oneThirdUpgradedTest.nodes.get(0).transportUri() + ',' + twoThirdsUpgradedTest.nodes.get(0).transportUri() })
 
     Task upgradedClusterTestRunner = tasks.getByName("${baseName}#upgradedClusterTestRunner")
     upgradedClusterTestRunner.configure {
       systemProperty 'tests.rest.suite', 'upgraded_cluster'
       /*
-        * Force stopping all the upgraded nodes after the test runner
-        * so they are alive during the test.
-        */
+       * Force stopping all the upgraded nodes after the test runner
+       * so they are alive during the test.
+       */
       finalizedBy "${baseName}#oneThirdUpgradedTestCluster#stop"
       finalizedBy "${baseName}#twoThirdsUpgradedTestCluster#stop"