Skip to content

Commit 91d5602

Browse files
committed
Merge branch 'master' into fix-get-mapping-head
* master: (1210 commits) Add support for clear scroll to high level REST client (elastic#25038) Tiny correction in inner-hits.asciidoc (elastic#25066) Added release notes for 6.0.0-alpha2 Expand index expressions against indices only when managing aliases (elastic#23997) Collapse inner hits rest test should not skip 5.x Settings: Fix secure settings by prefix (elastic#25064) add `exclude_keys` option to KeyValueProcessor (elastic#24876) Test: update missing body tests to run against versions >= 5.5.0 Track EWMA[1] of task execution time in search threadpool executor Removes an invalid assert in resizing big arrays which does not always hold (resizing can result in a smaller size than the current size, while the assert attempted to verify the new size is always greater than the current). Fixed NPEs caused by requests without content. (elastic#23497) Plugins can register pre-configured char filters (elastic#25000) Build: Allow preserving shared dir (elastic#24962) Tests: Make secure settings available from settings builder for tests (elastic#25037) [TEST] Skip wildcard expansion test due to breaking change Test that gradle and Java version types match (elastic#24943) Include duplicate jar when jarhell check fails Change ScriptContexts to use needs instead of uses$. (elastic#25036) Change `has_child`, `has_parent` queries and `childen` aggregation to work with the new join field type and at the same time maintaining support for the `_parent` meta field type. Remove comma-separated feature parsing for GetIndicesAction ...
2 parents 2dc556a + d47d479 commit 91d5602

File tree

4,105 files changed

+133820
-83197
lines changed

Some content is hidden

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

4,105 files changed

+133820
-83197
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,46 @@
11
<!--
2-
GitHub is reserved for bug reports and feature requests. The best place
3-
to ask a general question is at the Elastic Discourse forums at
4-
https://discuss.elastic.co. If you are in fact posting a bug report or
5-
a feature request, please include one and only one of the below blocks
6-
in your new issue. Note that whether you're filing a bug report or a
7-
feature request, ensure that your submission is for an
8-
[OS that we support](https://www.elastic.co/support/matrix#show_os).
9-
Bug reports on an OS that we do not support or feature requests
10-
specific to an OS that we do not support will be closed.
11-
-->
122
13-
<!--
14-
If you are filing a bug report, please remove the below feature
15-
request block and provide responses for all of the below items.
3+
** Please read the guidelines below. **
4+
5+
Issues that do not follow these guidelines are likely to be closed.
6+
7+
1. GitHub is reserved for bug reports and feature requests. The best place to
8+
ask a general question is at the Elastic [forums](https://discuss.elastic.co).
9+
GitHub is not the place for general questions.
10+
11+
2. Is this bug report or feature request for a supported OS? If not, it
12+
is likely to be closed. See https://www.elastic.co/support/matrix#show_os
13+
14+
3. Please fill out EITHER the feature request block or the bug report block
15+
below, and delete the other block.
16+
1617
-->
1718

19+
<!-- Feature request -->
20+
21+
**Describe the feature**:
22+
23+
<!-- Bug report -->
24+
1825
**Elasticsearch version**:
1926

2027
**Plugins installed**: []
2128

22-
**JVM version**:
29+
**JVM version** (`java -version`):
2330

24-
**OS version**:
31+
**OS version** (`uname -a` if on a Unix-like system):
2532

2633
**Description of the problem including expected versus actual behavior**:
2734

2835
**Steps to reproduce**:
36+
37+
Please include a *minimal* but *complete* recreation of the problem, including
38+
(e.g.) index creation, mappings, settings, query etc. The easier you make for
39+
us to reproduce it, the more likely that somebody will take the time to look at it.
40+
2941
1.
3042
2.
3143
3.
3244

3345
**Provide logs (if relevant)**:
3446

35-
<!--
36-
If you are filing a feature request, please remove the above bug
37-
report block and provide responses for all of the below items.
38-
-->
39-
40-
**Describe the feature**:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ attention.
1111
- If submitting code, have you built your formula locally prior to submission with `gradle check`?
1212
- If submitting code, is your pull request against master? Unless there is a good reason otherwise, we prefer pull requests against master and will backport as needed.
1313
- If submitting code, have you checked that your submission is for an [OS that we support](https://www.elastic.co/support/matrix#show_os)?
14+
- If you are submitting this code for a class then read our [policy](https://github.com/elastic/elasticsearch/blob/master/CONTRIBUTING.md#contributing-as-part-of-a-class) for that.

CONTRIBUTING.md

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ Contributing to the Elasticsearch codebase
8888
**Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
8989

9090
Make sure you have [Gradle](http://gradle.org) installed, as
91-
Elasticsearch uses it as its build system. Gradle must be version 2.13 _exactly_ in
92-
order to build successfully.
91+
Elasticsearch uses it as its build system. Gradle must be at least
92+
version 3.3 in order to build successfully.
9393

9494
Eclipse users can automatically configure their IDE: `gradle eclipse`
9595
then `File: Import: Existing Projects into Workspace`. Select the
@@ -101,7 +101,11 @@ IntelliJ users can automatically configure their IDE: `gradle idea`
101101
then `File->New Project From Existing Sources`. Point to the root of
102102
the source directory, select
103103
`Import project from external model->Gradle`, enable
104-
`Use auto-import`.
104+
`Use auto-import`. Additionally, in order to run tests directly from
105+
IDEA 2017.1 and above it is required to disable IDEA run launcher,
106+
which can be achieved by adding `-Didea.no.launcher=true`
107+
[JVM option](https://intellij-support.jetbrains.com/hc/en-us/articles/206544869-Configuring-JVM-options-and-platform-properties)
108+
105109

106110
The Elasticsearch codebase makes heavy use of Java `assert`s and the
107111
test runner requires that assertions be enabled within the JVM. This
@@ -139,3 +143,32 @@ Before submitting your changes, run the test suite to make sure that nothing is
139143
```sh
140144
gradle check
141145
```
146+
147+
Contributing as part of a class
148+
-------------------------------
149+
In general Elasticsearch is happy to accept contributions that were created as
150+
part of a class but strongly advise against making the contribution as part of
151+
the class. So if you have code you wrote for a class feel free to submit it.
152+
153+
Please, please, please do not assign contributing to Elasticsearch as part of a
154+
class. If you really want to assign writing code for Elasticsearch as an
155+
assignment then the code contributions should be made to your private clone and
156+
opening PRs against the primary Elasticsearch clone must be optional, fully
157+
voluntary, not for a grade, and without any deadlines.
158+
159+
Because:
160+
161+
* While the code review process is likely very educational, it can take wildly
162+
varying amounts of time depending on who is available, where the change is, and
163+
how deep the change is. There is no way to predict how long it will take unless
164+
we rush.
165+
* We do not rush reviews without a very, very good reason. Class deadlines
166+
aren't a good enough reason for us to rush reviews.
167+
* We deeply discourage opening a PR you don't intend to work through the entire
168+
code review process because it wastes our time.
169+
* We don't have the capacity to absorb an entire class full of new contributors,
170+
especially when they are unlikely to become long time contributors.
171+
172+
Finally, we require that you run `gradle check` before submitting a
173+
non-documentation contribution. This is mentioned above, but it is worth
174+
repeating in this section because it has come up in this context.

README.textile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ We have just covered a very small portion of what Elasticsearch is all about. Fo
200200

201201
h3. Building from Source
202202

203-
Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have version 2.13 of Gradle installed.
203+
Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have at least version 3.3 of Gradle installed.
204204

205205
In order to create a distribution, simply run the @gradle assemble@ command in the cloned directory.
206206

TESTING.asciidoc

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -345,24 +345,23 @@ VM running trusty by running
345345

346346
These are the linux flavors the Vagrantfile currently supports:
347347

348-
* ubuntu-1204 aka precise
349348
* ubuntu-1404 aka trusty
350349
* ubuntu-1604 aka xenial
351350
* debian-8 aka jessie, the current debian stable distribution
352351
* centos-6
353352
* centos-7
354-
* fedora-24
353+
* fedora-25
355354
* oel-6 aka Oracle Enterprise Linux 6
356355
* oel-7 aka Oracle Enterprise Linux 7
357356
* sles-12
358-
* opensuse-13
357+
* opensuse-42 aka Leap
359358

360359
We're missing the following from the support matrix because there aren't high
361360
quality boxes available in vagrant atlas:
362361

363362
* sles-11
364363

365-
We're missing the follow because our tests are very linux/bash centric:
364+
We're missing the following because our tests are very linux/bash centric:
366365

367366
* Windows Server 2012
368367

@@ -418,38 +417,58 @@ sudo -E bats $BATS_TESTS/*rpm*.bats
418417
If you wanted to retest all the release artifacts on a single VM you could:
419418

420419
-------------------------------------------------
421-
gradle vagrantSetUp
422-
vagrant up ubuntu-1404 --provider virtualbox && vagrant ssh ubuntu-1404
420+
gradle setupBats
421+
cd qa/vagrant; vagrant up ubuntu-1404 --provider virtualbox && vagrant ssh ubuntu-1404
423422
cd $BATS_ARCHIVES
424423
sudo -E bats $BATS_TESTS/*.bats
425424
-------------------------------------------------
426425

427426
You can also use Gradle to prepare the test environment and then starts a single VM:
428427

429428
-------------------------------------------------
430-
gradle vagrantFedora24#up
429+
gradle vagrantFedora25#up
431430
-------------------------------------------------
432431

433-
Or any of vagrantCentos6#up, vagrantDebian8#up, vagrantFedora24#up, vagrantOel6#up,
434-
vagrantOel7#up, vagrantOpensuse13#up, vagrantSles12#up, vagrantUbuntu1204#up,
435-
vagrantUbuntu1604#up.
432+
Or any of vagrantCentos6#up, vagrantCentos7#up, vagrantDebian8#up,
433+
vagrantFedora25#up, vagrantOel6#up, vagrantOel7#up, vagrantOpensuse13#up,
434+
vagrantSles12#up, vagrantUbuntu1404#up, vagrantUbuntu1604#up.
436435

437436
Once up, you can then connect to the VM using SSH from the elasticsearch directory:
438437

439438
-------------------------------------------------
440-
vagrant ssh fedora-24
439+
vagrant ssh fedora-25
441440
-------------------------------------------------
442441

443442
Or from another directory:
444443

445444
-------------------------------------------------
446-
VAGRANT_CWD=/path/to/elasticsearch vagrant ssh fedora-24
445+
VAGRANT_CWD=/path/to/elasticsearch vagrant ssh fedora-25
447446
-------------------------------------------------
448447

449448
Note: Starting vagrant VM outside of the elasticsearch folder requires to
450449
indicates the folder that contains the Vagrantfile using the VAGRANT_CWD
451450
environment variable.
452451

452+
== Testing backwards compatibility
453+
454+
Backwards compatibility tests exist to test upgrading from each supported version
455+
to the current version. To run all backcompat tests use:
456+
457+
-------------------------------------------------
458+
gradle bwcTest
459+
-------------------------------------------------
460+
461+
A specific version can be tested as well. For example, to test backcompat with
462+
version 5.3.2 run:
463+
464+
-------------------------------------------------
465+
gradle v5.3.2#bwcTest
466+
-------------------------------------------------
467+
468+
When running `gradle check`, some minimal backcompat checks are run. Which version
469+
is tested depends on the branch. On master, this will test against the current
470+
stable branch. On the stable branch, it will test against the latest release
471+
branch. Finally, on a release branch, it will test against the most recent release.
453472

454473
== Coverage analysis
455474

@@ -505,4 +524,3 @@ included as part of the build by checking the projects of the build.
505524
---------------------------------------------------------------------------
506525
gradle projects
507526
---------------------------------------------------------------------------
508-

0 commit comments

Comments
 (0)