Skip to content

Commit

Permalink
Merge branch 'upstream/master' into rollover-add-max_shard_docs
Browse files Browse the repository at this point in the history
* upstream/master: (762 commits)
  [DOCS] Add note to that log4j customization is outside the support scope (elastic#82668)
  Batch Index Settings Update Requests (elastic#82896)
  [DOCS] Delete pipeline containing stored script (elastic#83102)
  Try again to fix changelog areas after reorg (elastic#83100)
  Bind to non-localhost for transport in some cases (elastic#82973)
  [DOCS] Reuse multi-level `join` warning (elastic#82976)
  Remove unnecessary CopyOnWriteHashMap class (elastic#83040)
  Adjust changelog categories after reorg (elastic#83087)
  [DOCS] Fix typo in `action.destructive_requires_name` breaking change (elastic#83085)
  Stack Monitoring: Add Enterprise Search monitoring index templates (elastic#82743)
  [DOCS] Fix stored script example snippet (elastic#83056)
  [DOCS] Re-add network traffic para to `term` query (elastic#83047)
  [DOCS] Rename example stored script (elastic#83054)
  [ML][DOCS] Add Trained model APIs to the REST APIs index (elastic#82791)
  [ML] Update running process when global calendar changes (elastic#83044)
  [Transform] Fix condition on which the transform stops processing buckets (elastic#82852)
  [DOCS] Fixes field names in ML sum functions. (elastic#83048)
  [ML] fix NLP tokenization never_split handling around punctuation (elastic#82982)
  Construct dynamic updates directly via object builders (elastic#81449)
  Emit trace.id into audit logs (elastic#82849)
  ...

# Conflicts:
#	client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
#	client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java
#	server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java
#	server/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java
#	x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/RolloverActionTests.java
#	x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/TimeseriesLifecycleTypeTests.java
#	x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/WaitForRolloverReadyStepTests.java
  • Loading branch information
weizijun committed Jan 26, 2022
2 parents 2939d24 + 30b8cdc commit 4d6f241
Showing 6,417 changed files with 143,622 additions and 122,794 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -3,9 +3,8 @@
"targetBranchChoices": [
"master",
"8.0",
"7.17",
"7.16",
"7.15",
"7.14",
"6.8"
],
"targetPRLabels": ["backport"],
6 changes: 5 additions & 1 deletion .ci/bwcVersions
Original file line number Diff line number Diff line change
@@ -44,7 +44,11 @@ BWC_VERSION:
- "7.15.0"
- "7.15.1"
- "7.15.2"
- "7.15.3"
- "7.16.0"
- "7.16.1"
- "7.16.2"
- "7.16.3"
- "7.16.4"
- "7.17.0"
- "8.0.0"
- "8.1.0"
2 changes: 1 addition & 1 deletion .ci/java-versions-aarch64.properties
Original file line number Diff line number Diff line change
@@ -4,5 +4,5 @@
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=jdk16
ES_BUILD_JAVA=jdk17
ES_RUNTIME_JAVA=jdk17
2 changes: 1 addition & 1 deletion .ci/java-versions-fips.properties
Original file line number Diff line number Diff line change
@@ -4,5 +4,5 @@
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=openjdk16
ES_BUILD_JAVA=openjdk17
ES_RUNTIME_JAVA=openjdk17
2 changes: 1 addition & 1 deletion .ci/java-versions.properties
Original file line number Diff line number Diff line change
@@ -4,5 +4,5 @@
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=openjdk16
ES_BUILD_JAVA=openjdk17
ES_RUNTIME_JAVA=openjdk17
1 change: 1 addition & 0 deletions .ci/jobs.t/defaults.yml
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@
url: https://github.com/elastic/elasticsearch/
- inject:
properties-content: |
COMPOSE_HTTP_TIMEOUT=120
JOB_BRANCH=%BRANCH%
HOME=$JENKINS_HOME
GRADLEW=./gradlew --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
Original file line number Diff line number Diff line change
@@ -28,4 +28,4 @@
JAVA16_HOME=$HOME/.java/openjdk16
- shell: |
#!/usr/local/bin/runbld --redirect-stderr
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v$BWC_VERSION
1 change: 1 addition & 0 deletions .ci/jobs.t/elastic+elasticsearch+periodic+ear.yml
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
sudo cryptsetup open --key-file key.secret "$LOOP" secret --verbose
sudo mkfs.ext2 /dev/mapper/secret
sudo mkdir /mnt/secret
# Change /mnt/secret with care (at least a test uses this path to detect when encryption at rest is used)
sudo mount /dev/mapper/secret /mnt/secret
sudo chown -R jenkins /mnt/secret
cp -r "$WORKSPACE" /mnt/secret
49 changes: 49 additions & 0 deletions .ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
- job:
name: "elastic+elasticsearch+pull-request+build-benchmark"
display-name: "elastic / elasticsearch - pull request build benchmark"
description: "Testing of Elasticsearch pull requests - build benchmark"
workspace: "/dev/shm/elastic+elasticsearch+pull-request+build-bench"
scm:
- git:
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
branches:
- "${ghprbActualCommit}"
properties:
- inject:
properties-content: |
BUILD_PERFORMANCE_TEST=true
COMPOSE_HTTP_TIMEOUT=120
JOB_BRANCH=%BRANCH%
HOME=$JENKINS_HOME
GRADLEW=./gradlew --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
GRADLEW_BAT=./gradlew.bat --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
triggers:
- github-pull-request:
org-list:
- elastic
allow-whitelist-orgs-as-admins: true
trigger-phrase: '.*run\W+elasticsearch-ci/build-bench.*'
github-hooks: true
status-context: elasticsearch-ci/build-benchmark
cancel-builds-on-update: true
black-list-target-branches:
- 6.8
excluded-regions:
- ^docs/.*
white-list-labels:
- 'build-benchmark'
builders:
- inject:
properties-file: '.ci/java-versions.properties'
properties-content: |
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
JAVA8_HOME=$HOME/.java/java8
JAVA11_HOME=$HOME/.java/java11
- shell: |
#!/usr/local/bin/runbld --redirect-stderr
$WORKSPACE/.ci/scripts/run-gradle.sh :build-tools-internal:bootstrapPerformanceTests
$WORKSPACE/.ci/scripts/install-gradle-profiler.sh
$WORKSPACE/.ci/scripts/run-gradle-profiler.sh --benchmark --scenario-file build-tools-internal/build/performanceTests/elasticsearch-build-tool-update.scenarios --project-dir . --output-dir profile-out
tar -czf build/${BUILD_NUMBER}.tar.bz2 profile-out
Original file line number Diff line number Diff line change
@@ -18,8 +18,11 @@
github-hooks: true
status-context: elasticsearch-ci/example-plugins
cancel-builds-on-update: true
white-list-labels:
- ':Delivery/Build'
included-regions:
- build-conventions/.*
- build-tools/.*
- build-tools-internal/.*
- plugins/examples/.*
builders:
- inject:
properties-file: '.ci/java-versions.properties'
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
status-context: elasticsearch-ci/rest-compatibility
cancel-builds-on-update: true
black-list-target-branches:
- 7.17
- 7.16
- 7.15
- 6.8
1 change: 1 addition & 0 deletions .ci/matrix-runtime-javas.yml
Original file line number Diff line number Diff line change
@@ -7,3 +7,4 @@

ES_RUNTIME_JAVA:
- openjdk17
- openjdk18
8 changes: 8 additions & 0 deletions .ci/scripts/install-gradle-profiler.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

set -e
# profiler version we wanna install
PROFILER_VERSION="0.16.0"
wget https://repo.gradle.org/gradle/ext-releases-local/org/gradle/profiler/gradle-profiler/$PROFILER_VERSION/gradle-profiler-$PROFILER_VERSION.zip -O $WORKSPACE/gradle-profiler-$PROFILER_VERSION.zip
unzip $WORKSPACE/gradle-profiler-$PROFILER_VERSION.zip
mv $WORKSPACE/gradle-profiler-$PROFILER_VERSION $WORKSPACE/gradle-profiler
5 changes: 0 additions & 5 deletions .ci/scripts/packaging-test.sh
Original file line number Diff line number Diff line change
@@ -37,11 +37,6 @@ if [ -f "/etc/os-release" ] ; then
if [[ "$ID" == "debian" || "$ID_LIKE" == "debian" ]] ; then
# FIXME: The base image should not have rpm installed
sudo rm -Rf /usr/bin/rpm
# Work around incorrect lintian version
# https://github.com/elastic/elasticsearch/issues/48573
if [ $VERSION_ID == 10 ] ; then
sudo apt-get install -y --allow-downgrades lintian=2.15.0
fi
fi
else
cat /etc/issue || true
24 changes: 24 additions & 0 deletions .ci/scripts/run-gradle-profiler.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
# drop page cache and kernel slab objects on linux
[[ -x /usr/local/sbin/drop-caches ]] && sudo /usr/local/sbin/drop-caches
rm -Rfv $WORKSPACE/gradle-user-home
mkdir -p $WORKSPACE/gradle-user-home/init.d && cp -v $WORKSPACE/.ci/init.gradle $WORKSPACE/gradle-user-home
if [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ]; then
MAX_WORKERS=16
elif [ -f /proc/cpuinfo ]; then
MAX_WORKERS=`grep '^cpu\scores' /proc/cpuinfo | uniq | sed 's/\s\+//g' | cut -d':' -f 2`
else
if [[ "$OSTYPE" == "darwin"* ]]; then
MAX_WORKERS=`sysctl -n hw.physicalcpu | sed 's/\s\+//g'`
else
echo "Unsupported OS Type: $OSTYPE"
exit 1
fi
fi
if pwd | grep -v -q ^/dev/shm ; then
echo "Not running on a ramdisk, reducing number of workers"
MAX_WORKERS=$(($MAX_WORKERS*2/3))
fi
set -e
GRADLE_PROFILER="$WORKSPACE/gradle-profiler/bin/gradle-profiler"
$GRADLE_PROFILER "-Dorg.gradle.workers.max=$MAX_WORKERS" $@
4 changes: 0 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -10,10 +10,6 @@ trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space

ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
ij_formatter_tags_enabled = false

[*.gradle]
ij_continuation_indent_size = 2
indent_size = 2
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -3,6 +3,3 @@ contact_links:
- name: Question
url: https://discuss.elastic.co/c/elasticsearch
about: Ask (and answer) questions here.
- name: Security Vulnerability
url: https://www.elastic.co/community/security
about: Send security vulnerability reports to [email protected].
2 changes: 1 addition & 1 deletion .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4d6f241

Please sign in to comment.