Browse Source

ping_timeout is documented in discovery-ec2 but does not exist in code

Also mentioned in discovery-gce

Actually ping timeout can be set using `discovery.zen.ping_timeout`.

Closes #16600.
David Pilato 9 years ago
parent
commit
3bcf2653bb
2 changed files with 6 additions and 12 deletions
  1. 3 9
      docs/plugins/discovery-ec2.asciidoc
  2. 3 3
      docs/plugins/discovery-gce.asciidoc

+ 3 - 9
docs/plugins/discovery-ec2.asciidoc

@@ -168,12 +168,6 @@ The following are a list of settings (prefixed with `discovery.ec2`) that can fu
     If set to `false`, will require all security groups to be present for the
     instance to be used for the discovery. Defaults to `true`.
 
-`ping_timeout`::
-
-    How long to wait for existing EC2 nodes to reply during discovery.
-    Defaults to `3s`. If no unit like `ms`, `s` or `m` is specified,
-    milliseconds are used.
-
 `node_cache_time`::
 
     How long the list of hosts is cached to prevent further requests to the AWS API.
@@ -243,9 +237,9 @@ filter instances with a tag key set to `stage`, and a value of `dev`. Several ta
 to be set for the instance to be included.
 
 One practical use for tag filtering is when an ec2 cluster contains many nodes that are not running elasticsearch. In
-this case (particularly with high `ping_timeout` values) there is a risk that a new node's discovery phase will end
-before it has found the cluster (which will result in it declaring itself master of a new cluster with the same name
-- highly undesirable). Tagging elasticsearch ec2 nodes and then filtering by that tag will resolve this issue.
+this case (particularly with high `discovery.zen.ping_timeout` values) there is a risk that a new node's discovery phase
+will end before it has found the cluster (which will result in it declaring itself master of a new cluster with the same
+name - highly undesirable). Tagging elasticsearch ec2 nodes and then filtering by that tag will resolve this issue.
 
 [[discovery-ec2-attributes]]
 ===== Automatic Node Attributes

+ 3 - 3
docs/plugins/discovery-gce.asciidoc

@@ -377,9 +377,9 @@ For example, setting `discovery.gce.tags` to `dev` will only filter instances ha
 set will require all of those tags to be set for the instance to be included.
 
 One practical use for tag filtering is when an GCE cluster contains many nodes that are not running
-elasticsearch. In this case (particularly with high ping_timeout values) there is a risk that a new node's discovery
-phase will end before it has found the cluster (which will result in it declaring itself master of a new cluster
-with the same name - highly undesirable). Adding tag on elasticsearch GCE nodes and then filtering by that
+elasticsearch. In this case (particularly with high `discovery.zen.ping_timeout` values) there is a risk that a new
+node's discovery phase will end before it has found the cluster (which will result in it declaring itself master of a
+new cluster with the same name - highly undesirable). Adding tag on elasticsearch GCE nodes and then filtering by that
 tag will resolve this issue.
 
 Add your tag when building the new instance: