Skip to content

Commit a01c6c0

Browse files
committed
Merge branch 'master' into java9-checkstyle
* master: (476 commits) Fix compilation errors in ML integration tests Small code cleanups and refactorings in persistent tasks (elastic#29109) Update allocation awareness docs (elastic#29116) Configure error file for archive packages (elastic#29129) Configure heap dump path for archive packages (elastic#29130) Client: Add missing test getMinGenerationForSeqNo should acquire read lock (elastic#29126) Backport - Do not renew sync-id PR to 5.6 and 6.3 Client: Wrap SSLHandshakeException in sync calls Fix creating keystore when upgrading (elastic#29121) Align thread pool info to thread pool configuration (elastic#29123) TEST: Adjust translog size assumption in new engine Docs: HighLevelRestClient#multiGet (elastic#29095) Client: Wrap synchronous exceptions (elastic#28919) REST: Clear Indices Cache API simplify param parsing (elastic#29111) Fix typo in ExceptionSerializationTests Remove BWC layer for rejected execution exception Fix EsAbortPolicy to conform to API (elastic#29075) [DOCS] Removed prerelease footnote from upgrade table. Docs: Support triple quotes (elastic#28915) ...
2 parents 3376236 + 0f93b7a commit a01c6c0

File tree

1,528 files changed

+38223
-19421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,528 files changed

+38223
-19421
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,12 @@ cd elasticsearch/
162162
./gradlew assemble
163163
```
164164

165-
You will find the newly built packages under: `./distribution/(deb|rpm|tar|zip)/build/distributions/`.
165+
The package distributions (Debian and RPM) can be found under:
166+
`./distribution/packages/(deb|rpm)/build/distributions/`
167+
168+
The archive distributions (tar and zip) can be found under:
169+
`./distribution/archives/(tar|zip)/build/distributions/`
170+
166171

167172
Before submitting your changes, run the test suite to make sure that nothing is broken, with:
168173

README.textile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ h3. Distributed, Highly Available
192192

193193
Let's face it, things will fail....
194194

195-
Elasticsearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replica. By default, an index is created with 5 shards and 1 replica per shard (5/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
195+
Elasticsearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replicas. By default, an index is created with 5 shards and 1 replica per shard (5/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
196196

197197
In order to play with the distributed nature of Elasticsearch, simply bring more nodes up and shut down nodes. The system will continue to serve requests (make sure you use the correct http port) with the latest data indexed.
198198

TESTING.asciidoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,18 +264,20 @@ The REST layer is tested through specific tests that are shared between all
264264
the elasticsearch official clients and consist of YAML files that describe the
265265
operations to be executed and the obtained results that need to be tested.
266266

267+
The YAML files support various operators defined in the link:/rest-api-spec/src/main/resources/rest-api-spec/test/README.asciidoc[rest-api-spec] and adhere to the link:/rest-api-spec/README.markdown[Elasticsearch REST API JSON specification]
268+
267269
The REST tests are run automatically when executing the "./gradlew check" command. To run only the
268270
REST tests use the following command:
269271

270272
---------------------------------------------------------------------------
271-
./gradlew :distribution:integ-test-zip:integTest \
273+
./gradlew :distribution:archives:integ-test-zip:integTest \
272274
-Dtests.class="org.elasticsearch.test.rest.*Yaml*IT"
273275
---------------------------------------------------------------------------
274276

275277
A specific test case can be run with
276278

277279
---------------------------------------------------------------------------
278-
./gradlew :distribution:integ-test-zip:integTest \
280+
./gradlew :distribution:archives:integ-test-zip:integTest \
279281
-Dtests.class="org.elasticsearch.test.rest.*Yaml*IT" \
280282
-Dtests.method="test {p0=cat.shards/10_basic/Help}"
281283
---------------------------------------------------------------------------
@@ -405,7 +407,7 @@ destructive. When working with a single package it's generally faster to run its
405407
tests in a tighter loop than Gradle provides. In one window:
406408

407409
--------------------------------
408-
./gradlew :distribution:rpm:assemble
410+
./gradlew :distribution:packages:rpm:assemble
409411
--------------------------------
410412

411413
and in another window:

0 commit comments

Comments
 (0)