Merge branch 'master' into security_authz_engine

jaymode · Jan 17, 2019 · 6278eab · 6278eab
2 parents c555a44 + 4351a5e
commit 6278eab
Show file tree

Hide file tree

Showing 96 changed files with 1,445 additions and 1,115 deletions.
diff --git a/distribution/packages/src/common/env/elasticsearch b/distribution/packages/src/common/env/elasticsearch
@@ -36,7 +36,7 @@ ES_STARTUP_SLEEP_TIME=5
 # Specifies the maximum file descriptor number that can be opened by this process
 # When using Systemd, this setting is ignored and the LimitNOFILE defined in
 # /usr/lib/systemd/system/elasticsearch.service takes precedence
-#MAX_OPEN_FILES=65536
+#MAX_OPEN_FILES=65535
 
 # The maximum number of bytes of memory that may be locked into RAM
 # Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option

diff --git a/distribution/packages/src/common/systemd/elasticsearch.service b/distribution/packages/src/common/systemd/elasticsearch.service
@@ -29,7 +29,7 @@ StandardOutput=journal
 StandardError=inherit
 
 # Specifies the maximum file descriptor number that can be opened by this process
-LimitNOFILE=65536
+LimitNOFILE=65535
 
 # Specifies the maximum number of processes
 LimitNPROC=4096

diff --git a/distribution/packages/src/deb/init.d/elasticsearch b/distribution/packages/src/deb/init.d/elasticsearch
@@ -39,7 +39,7 @@ ES_HOME=/usr/share/$NAME
 #ES_JAVA_OPTS=
 
 # Maximum number of open files
-MAX_OPEN_FILES=65536
+MAX_OPEN_FILES=65535
 
 # Maximum amount of locked memory
 #MAX_LOCKED_MEMORY=

diff --git a/distribution/packages/src/rpm/init.d/elasticsearch b/distribution/packages/src/rpm/init.d/elasticsearch
@@ -33,7 +33,7 @@ fi
 
 # Sets the default values for elasticsearch variables used in this script
 ES_HOME="/usr/share/elasticsearch"
-MAX_OPEN_FILES=65536
+MAX_OPEN_FILES=65535
 MAX_MAP_COUNT=262144
 ES_PATH_CONF="${path.conf}"
 

diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc
@@ -248,7 +248,7 @@ If everything goes well with installation, you should see a bunch of messages th
 [2018-09-13T12:20:05,006][INFO ][o.e.n.Node               ] [localhost.localdomain] initialized
 [2018-09-13T12:20:05,007][INFO ][o.e.n.Node               ] [localhost.localdomain] starting ...
 [2018-09-13T12:20:05,202][INFO ][o.e.t.TransportService   ] [localhost.localdomain] publish_address {127.0.0.1:9300}, bound_addresses {[::1]:9300}, {127.0.0.1:9300}
-[2018-09-13T12:20:05,221][WARN ][o.e.b.BootstrapChecks    ] [localhost.localdomain] max file descriptors [4096] for elasticsearch process is too low, increase to at least [65536]
+[2018-09-13T12:20:05,221][WARN ][o.e.b.BootstrapChecks    ] [localhost.localdomain] max file descriptors [4096] for elasticsearch process is too low, increase to at least [65535]
 [2018-09-13T12:20:05,221][WARN ][o.e.b.BootstrapChecks    ] [localhost.localdomain] max virtual memory areas vm.max_map_count [65530] is too low, increase to at least [262144]
 [2018-09-13T12:20:08,355][INFO ][o.e.c.s.MasterService    ] [localhost.localdomain] zen-disco-elected-as-master ([0] nodes joined)[, ], reason: master node changed {previous [], current [{localhost.localdomain}{B0aEHNagTiWx7SYj-l4NTw}{hzsQz6CVQMCTpMCVLM4IHg}{127.0.0.1}{127.0.0.1:9300}{testattr=test}]}
 [2018-09-13T12:20:08,360][INFO ][o.e.c.s.ClusterApplierService] [localhost.localdomain] master node changed {previous [], current [{localhost.localdomain}{B0aEHNagTiWx7SYj-l4NTw}{hzsQz6CVQMCTpMCVLM4IHg}{127.0.0.1}{127.0.0.1:9300}{testattr=test}]}, reason: apply cluster state (from master [master {localhost.localdomain}{B0aEHNagTiWx7SYj-l4NTw}{hzsQz6CVQMCTpMCVLM4IHg}{127.0.0.1}{127.0.0.1:9300}{testattr=test} committed version [1] source [zen-disco-elected-as-master ([0] nodes joined)[, ]]])

diff --git a/docs/reference/migration/migrate_7_0/java.asciidoc b/docs/reference/migration/migrate_7_0/java.asciidoc
@@ -38,4 +38,10 @@ because `Settings` is no longer needed.
 ==== Deprecated method `Client#termVector` removed
 
 The client method `termVector`, deprecated in 2.0, has been removed. The method
-`termVectors` (plural) should be used instead.
+`termVectors` (plural) should be used instead.
+
+[float]
+==== Deprecated constructor `AbstractLifecycleComponent(Settings settings)` removed
+
+The constructor `AbstractLifecycleComponent(Settings settings)`, deprecated in 6.7
+has been removed. The parameterless constructor should be used instead.
diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc
@@ -338,7 +338,7 @@ needed, adjust them in the Daemon, or override them per container, for example
 using `docker run`:
 +
 --
-  --ulimit nofile=65536:65536
+  --ulimit nofile=65535:65535
 
 NOTE: One way of checking the Docker daemon defaults for the aforementioned
 ulimits is by running:

diff --git a/docs/reference/setup/install/sysconfig-file.asciidoc b/docs/reference/setup/install/sysconfig-file.asciidoc
@@ -5,7 +5,7 @@
 
 `MAX_OPEN_FILES`::
 
-    Maximum number of open files, defaults to `65536`.
+    Maximum number of open files, defaults to `65535`.
 
 `MAX_LOCKED_MEMORY`::
 

diff --git a/docs/reference/setup/sysconfig/configuring.asciidoc b/docs/reference/setup/sysconfig/configuring.asciidoc
@@ -25,7 +25,7 @@ open file handles (`ulimit -n`) to 65,536, you can do the following:
 [source,sh]
 --------------------------------
 sudo su  <1>
-ulimit -n 65536 <2>
+ulimit -n 65535 <2>
 su elasticsearch <3>
 --------------------------------
 <1> Become `root`.
@@ -46,7 +46,7 @@ the `limits.conf` file:
 
 [source,sh]
 --------------------------------
-elasticsearch  -  nofile  65536
+elasticsearch  -  nofile  65535
 --------------------------------
 
 This change will only take effect the next time the `elasticsearch` user opens

diff --git a/docs/reference/setup/sysconfig/file-descriptors.asciidoc b/docs/reference/setup/sysconfig/file-descriptors.asciidoc
@@ -12,15 +12,15 @@ file descriptors can be disastrous and will most probably lead to data loss.
 Make sure to increase the limit on the number of open files descriptors for
 the user running Elasticsearch to 65,536 or higher.
 
-For the `.zip` and `.tar.gz` packages, set <<ulimit,`ulimit -n 65536`>> as
-root before starting Elasticsearch,   or set `nofile` to `65536` in
+For the `.zip` and `.tar.gz` packages, set <<ulimit,`ulimit -n 65535`>> as
+root before starting Elasticsearch,   or set `nofile` to `65535` in
 <<limits.conf,`/etc/security/limits.conf`>>.
 
 On macOS, you must also pass the JVM option `-XX:-MaxFDLimit`
 to Elasticsearch in order for it to make use of the higher file descriptor limit.
 
 RPM and Debian packages already default the maximum number of file
-descriptors to 65536 and do not require further configuration.
+descriptors to 65535 and do not require further configuration.
 
 You can check the `max_file_descriptors` configured for each node
 using the <<cluster-nodes-stats>> API, with:

diff --git a/docs/reference/sql/endpoints/rest.asciidoc b/docs/reference/sql/endpoints/rest.asciidoc
@@ -68,7 +68,7 @@ Which returns:
         {"name": "author",       "type": "text"},
         {"name": "name",         "type": "text"},
         {"name": "page_count",   "type": "short"},
-        {"name": "release_date", "type": "date"}
+        {"name": "release_date", "type": "datetime"}
     ],
     "rows": [
         ["Peter F. Hamilton",  "Pandora's Star",       768, "2004-03-02T00:00:00.000Z"],
@@ -186,7 +186,7 @@ Douglas Adams  |The Hitchhiker's Guide to the Galaxy|180            |1979-10-12T
 In addition to the `query` and `cursor` fields, the request can
 contain `fetch_size` and `time_zone`. `fetch_size` is a hint for how
 many results to return in each page. SQL might chose to return more
-or fewer results though. `time_zone` is the time zone to use for date
-functions and date parsing. `time_zone` defaults to `utc` and can take
+or fewer results though. `time_zone` is the time zone to use for datetime
+functions and datetime parsing. `time_zone` defaults to `utc` and can take
 any values documented
 http://www.joda.org/joda-time/apidocs/org/joda/time/DateTimeZone.html[here].