Merge remote-tracking branch 'origin/master' into upgrade-azure-sdk-returns

Author: fcofdez

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java

@@ -48,7 +48,7 @@ public TaskProvider<? extends Task> createTask(Project project) {
         TaskProvider<ThirdPartyAuditTask> audit = project.getTasks().register("thirdPartyAudit", ThirdPartyAuditTask.class);
         // usually only one task is created. but this construct makes our integTests easier to setup
         project.getTasks().withType(ThirdPartyAuditTask.class).configureEach(t -> {
-            Configuration runtimeConfiguration = getRuntimeConfiguration(project);
+            Configuration runtimeConfiguration = project.getConfigurations().getByName("runtimeClasspath");
             Configuration compileOnly = project.getConfigurations()
                 .getByName(CompileOnlyResolvePlugin.RESOLVEABLE_COMPILE_ONLY_CONFIGURATION_NAME);
             t.setClasspath(runtimeConfiguration.plus(compileOnly));
@@ -68,11 +68,4 @@ public TaskProvider<? extends Task> createTask(Project project) {
         return audit;
     }
 
-    private Configuration getRuntimeConfiguration(Project project) {
-        Configuration runtime = project.getConfigurations().findByName("runtimeClasspath");
-        if (runtime == null) {
-            return project.getConfigurations().getByName("testCompileClasspath");
-        }
-        return runtime;
-    }
 }

build-tools/build.gradle

@@ -154,67 +154,4 @@ normalization {
     }
 }
 
-tasks.named("check").configure { dependsOn("integTest") }
-
-// TODO These additional conventions will be applied once those plugins have been ported to build-conventions and
-//
-//  apply plugin: 'elasticsearch.build'
-//
-//  // groovydoc succeeds, but has some weird internal exception...
-//  tasks.named("groovydoc").configure {
-//    enabled = false
-//  }
-//
-//  // build-tools is not ready for primetime with these...
-//  tasks.named("dependencyLicenses").configure { enabled = false }
-//  tasks.named("dependenciesInfo").configure {enabled = false }
-//  tasks.named("dependenciesGraph").configure {enabled = false }
-//  disableTasks('forbiddenApisMain', 'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures')
-//  tasks.named("jarHell").configure {
-//    enabled = false
-//  }
-//  tasks.named("thirdPartyAudit").configure {
-//    enabled = false
-//  }
-//  configurations.register("distribution")
-//
-//
-//  tasks.withType(Test).configureEach {
-//    // Track reaper jar as a test input using runtime classpath normalization strategy
-//    inputs.files(configurations.reaper).withNormalizer(ClasspathNormalizer)
-//    useJUnitPlatform()
-//  }
-//
-//  tasks.named("test").configure {
-//    include("**/*TestSpec.class")
-//  }
-//
-
-//
-//  tasks.named("forbiddenPatterns").configure {
-//    exclude '**/*.wav'
-//    exclude '**/*.p12'
-//    exclude '**/*.jks'
-//    exclude '**/*.crt'
-//    // the file that actually defines nocommit
-//    exclude '**/ForbiddenPatternsTask.java'
-//    exclude '**/*.bcfks'
-//  }
-//
-//  eclipse {
-//    classpath {
-//        plusConfigurations += [configurations.integTestRuntimeClasspath]
-//    }
-//  }
-//
-//  tasks.named("testingConventions") {
-//    naming.clear()
-//    naming {
-//      Tests {
-//        baseClass 'org.elasticsearch.gradle.internal.test.GradleUnitTestCase'
-//      }
-//      TestSpec {
-//        baseClass 'spock.lang.Specification'
-//      }
-//    }
-//  }
+tasks.named("check").configure { dependsOn("integTest") }

build.gradle

@@ -229,12 +229,6 @@ allprojects {
     }
   }
 
-  project.ext.disableTasks = { String... tasknames ->
-    for (String taskname : tasknames) {
-      project.tasks.named(taskname).configure { enabled = false }
-    }
-  }
-
   /*
    * Remove assemble/dependenciesInfo on all qa projects because we don't
    * need to publish artifacts for them.

client/rest-high-level/build.gradle

@@ -58,16 +58,6 @@ tasks.named('forbiddenApisMain').configure {
   signaturesFiles += files('src/main/resources/forbidden/rest-high-level-signatures.txt')
 }
 
-File nodeCert = file("./testnode.crt")
-File nodeTrustStore = file("./testnode.jks")
-File pkiTrustCert = file("./src/test/resources/org/elasticsearch/client/security/delegate_pki/testRootCA.crt")
-
-def clusterUserNameProvider = providers.systemProperty('tests.rest.cluster.username')
-        .orElse('test_user')
-
-def clusterPasswordProvider = providers.systemProperty('tests.rest.cluster.password')
-        .orElse('test-user-password')
-
 tasks.named('splitPackagesAudit').configure {
   // the client package should be owned by the client, but server has some classes there too
   ignoreClasses 'org.elasticsearch.client.*'

docs/reference/modules/discovery/discovery.asciidoc

@@ -27,6 +27,58 @@ enough masterless master-eligible nodes to complete an election. If neither of
 these occur quickly enough then the node will retry after
 `discovery.find_peers_interval` which defaults to `1s`.
 
+Once a master is elected, it will normally remain as the elected master until
+it is deliberately stopped. It may also stop acting as the master if
+<<cluster-fault-detection,fault detection>> determines the cluster to be
+faulty. When a node stops being the elected master, it begins the discovery
+process again.
+
+[[modules-discovery-troubleshooting]]
+==== Troubleshooting discovery
+
+In most cases, the discovery process completes quickly, and the master node
+remains elected for a long period of time. If the cluster has no master for
+more than a few seconds or the master is unstable, the logs for each node will
+contain information explaining why:
+
+* All nodes repeatedly log messages indicating that a master cannot be
+discovered or elected using a logger called
+`org.elasticsearch.cluster.coordination.ClusterFormationFailureHelper`. By
+default, this happens every 10 seconds.
+
+* If a node wins the election, it logs a message containing
+`elected-as-master`. If this happens repeatedly, the master node is unstable.
+
+* When a node discovers the master or believes the master to have failed, it
+logs a message containing `master node changed`.
+
+* If a node is unable to discover or elect a master for several minutes, it
+starts to report additional details about the failures in its logs. Be sure to
+capture log messages covering at least five minutes of discovery problems.
+
+If your cluster doesn't have a stable master, many of its features won't work
+correctly. The cluster may report many kinds of error to clients and in its
+logs. You must fix the master node's instability before addressing these other
+issues. It will not be possible to solve any other issues while the master node
+is unstable.
+
+The logs from the `ClusterFormationFailureHelper` may indicate that a master
+election requires a certain set of nodes and that it has not discovered enough
+nodes to form a quorum. If so, you must address the reason preventing {es} from
+discovering the missing nodes. The missing nodes are needed to reconstruct the
+cluster metadata. Without the cluster metadata, the data in your cluster is
+meaningless. The cluster metadata is stored on a subset of the master-eligible
+nodes in the cluster. If a quorum cannot be discovered then the missing nodes
+were the ones holding the cluster metadata. If you cannot bring the missing
+nodes back into the cluster, start a new cluster and restore data from a recent
+snapshot. Refer to <<modules-discovery-quorums>> for more information.
+
+The logs from the `ClusterFormationFailureHelper` may also indicate that it has
+discovered a possible quorum of master-eligible nodes. If so, the usual reason
+that the cluster cannot elect a master is that one of the other nodes cannot
+discover a quorum. Inspect the logs on the other master-eligible nodes and
+ensure that every node has discovered a quorum.
+
 [[built-in-hosts-providers]]
 ==== Seed hosts providers