Skip to content

Commit

Permalink
Merge branch '2.x' into backport-13819-to-2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
cwperks committed May 29, 2024
2 parents 88e9b8c + 557a2c7 commit 4cb9129
Show file tree
Hide file tree
Showing 65 changed files with 75 additions and 50 deletions.
28 changes: 26 additions & 2 deletions .github/workflows/gradle-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,28 @@ permissions:
contents: read # to fetch code (actions/checkout)

jobs:
check-files:
runs-on: ubuntu-latest
outputs:
RUN_GRADLE_CHECK: ${{ steps.changed-files-specific.outputs.any_changed }}
steps:
- uses: actions/checkout@v3
- name: Get changed files
id: changed-files-specific
uses: tj-actions/changed-files@v44
with:
files_ignore: |
release-notes/*.md
.github/**
*.md
gradle-check:
if: github.repository == 'opensearch-project/OpenSearch'
needs: check-files
if: github.repository == 'opensearch-project/OpenSearch' && needs.check-files.outputs.RUN_GRADLE_CHECK == 'true'
permissions:
contents: read # to fetch code (actions/checkout)
pull-requests: write # to create or update comment (peter-evans/create-or-update-comment)
issues: write # To create an issue if check fails on push.

runs-on: ubuntu-latest
timeout-minutes: 130
steps:
Expand Down Expand Up @@ -151,3 +166,12 @@ jobs:
with:
assignees: ${{ github.event.head_commit.author.username }}, ${{ github.triggering_actor }}
filename: .github/ISSUE_TEMPLATE/failed_check.md

check-result:
needs: [check-files, gradle-check]
if: always()
runs-on: ubuntu-latest
steps:
- name: Fail if gradle-check fails
if: ${{ needs.check-files.outputs.RUN_GRADLE_CHECK && needs.gradle-check.result == 'failure' }}
run: exit 1
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `com.google.code.gson:gson` from 2.10.1 to 2.11.0 ([#13752](https://github.com/opensearch-project/OpenSearch/pull/13752))
- Bump `ch.qos.logback:logback-core` from 1.5.3 to 1.5.6 ([#13756](https://github.com/opensearch-project/OpenSearch/pull/13756))
- Bump `netty` from 4.1.109.Final to 4.1.110.Final ([#13802](https://github.com/opensearch-project/OpenSearch/pull/13802))
- Bump `jackson` from 2.17.0 to 2.17.1 ([#13817](https://github.com/opensearch-project/OpenSearch/pull/13817))
- Bump `reactor` from 3.5.15 to 3.5.17 ([#13825](https://github.com/opensearch-project/OpenSearch/pull/13825))
- Bump `reactor-netty` from 1.1.17 to 1.1.19 ([#13825](https://github.com/opensearch-project/OpenSearch/pull/13825))
- Bump `commons-cli:commons-cli` from 1.7.0 to 1.8.0 ([#13840](https://github.com/opensearch-project/OpenSearch/pull/13840))
- Bump `org.apache.xmlbeans:xmlbeans` from 5.2.0 to 5.2.1 ([#13839](https://github.com/opensearch-project/OpenSearch/pull/13839))

### Changed
- Add ability for Boolean and date field queries to run when only doc_values are enabled ([#11650](https://github.com/opensearch-project/OpenSearch/pull/11650))
Expand All @@ -34,7 +39,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Remove handling of index.mapper.dynamic in AutoCreateIndex([#13067](https://github.com/opensearch-project/OpenSearch/pull/13067))

### Fixed
- Fix negative RequestStats metric issue ([#13553](https://github.com/opensearch-project/OpenSearch/pull/13553))
- Fix get field mapping API returns 404 error in mixed cluster with multiple versions ([#13624](https://github.com/opensearch-project/OpenSearch/pull/13624))
- Allow clearing `remote_store.compatibility_mode` setting ([#13646](https://github.com/opensearch-project/OpenSearch/pull/13646))

Expand Down
8 changes: 4 additions & 4 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ bundled_jdk = 21.0.3+9
# optional dependencies
spatial4j = 0.7
jts = 1.15.0
jackson = 2.17.0
jackson_databind = 2.17.0
jackson = 2.17.1
jackson_databind = 2.17.1
snakeyaml = 2.1
icu4j = 70.1
supercsv = 2.4.0
Expand All @@ -31,8 +31,8 @@ netty = 4.1.110.Final
joda = 2.12.7

# project reactor
reactor_netty = 1.1.17
reactor = 3.5.15
reactor_netty = 1.1.19
reactor = 3.5.17

# client dependencies
httpclient = 4.5.14
Expand Down
1 change: 0 additions & 1 deletion client/sniffer/licenses/jackson-core-2.17.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions client/sniffer/licenses/jackson-core-2.17.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e52a11644cd59a28ef79f02bddc2cc3bab45edb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079
1 change: 0 additions & 1 deletion libs/core/licenses/jackson-core-2.17.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/core/licenses/jackson-core-2.17.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e52a11644cd59a28ef79f02bddc2cc3bab45edb
1 change: 0 additions & 1 deletion libs/x-content/licenses/jackson-core-2.17.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/x-content/licenses/jackson-core-2.17.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5e52a11644cd59a28ef79f02bddc2cc3bab45edb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ba5d8e6ecc62aa0e49c0ce935b8696352dbebc71

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
89683ac4f0a0c2c4f69ea56b90480ed40266dac8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4c7b8a9ea3f398116a75c146b982b22afebc4ee

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079
2 changes: 1 addition & 1 deletion plugins/ingest-attachment/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ dependencies {
api "org.apache.poi:poi:${versions.poi}"
api "org.apache.poi:poi-ooxml-lite:${versions.poi}"
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'org.apache.xmlbeans:xmlbeans:5.2.0'
api 'org.apache.xmlbeans:xmlbeans:5.2.1'
api 'org.apache.commons:commons-collections4:4.4'
// MS Office
api "org.apache.poi:poi-scratchpad:${versions.poi}"
Expand Down
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/xmlbeans-5.2.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/xmlbeans-5.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e16ddf17fe181c202b097e0dcc0ee2fed91cb7da

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e6a168dba62aa63743b9e2b83f4e0f0dfdc143d3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0969b0c3cb8c75d759e9a6c585c44c9b9f3a4f75

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f77e7bf0e64dfcf53bfdcf2764ad7ab92b78a4da

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
639e2c63ade6f2a49d7e501ca2264b74d240b448

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4bbb1aeb64ecb2b3949c38983032a7f0b0ebd07
2 changes: 1 addition & 1 deletion plugins/repository-hdfs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
api 'com.google.code.gson:gson:2.11.0'
runtimeOnly "com.google.guava:guava:${versions.guava}"
api "commons-logging:commons-logging:${versions.commonslogging}"
api 'commons-cli:commons-cli:1.7.0'
api 'commons-cli:commons-cli:1.8.0'
api "commons-codec:commons-codec:${versions.commonscodec}"
api 'commons-collections:commons-collections:3.2.2'
api "org.apache.commons:commons-compress:${versions.commonscompress}"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
41a4bff12057eecb6daaf9c7f36c237815be3da1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fca7ef6192c9ad05d07bc50da991bf937a84af3a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0524dcbcccdde7d45a679dfc333e4763feb09079

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
639e2c63ade6f2a49d7e501ca2264b74d240b448

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4bbb1aeb64ecb2b3949c38983032a7f0b0ebd07
3 changes: 2 additions & 1 deletion release-notes/opensearch.release-notes-2.14.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,5 @@
- Improve the error messages for _stats with closed indices ([#13012](https://github.com/opensearch-project/OpenSearch/pull/13012))
- Ignore BaseRestHandler unconsumed content check as it's always consumed. ([#13290](https://github.com/opensearch-project/OpenSearch/pull/13290))
- Fix mapper_parsing_exception when using flat_object fields with names longer than 11 characters ([#13259](https://github.com/opensearch-project/OpenSearch/pull/13259))
- DATETIME_FORMATTER_CACHING_SETTING experimental feature should not default to 'true' ([#13532](https://github.com/opensearch-project/OpenSearch/pull/13532))
- DATETIME_FORMATTER_CACHING_SETTING experimental feature should not default to 'true' ([#13532](https://github.com/opensearch-project/OpenSearch/pull/13532))
- Fix negative RequestStats metric issue ([#13553](https://github.com/opensearch-project/OpenSearch/pull/13553))
1 change: 0 additions & 1 deletion server/licenses/reactor-core-3.5.15.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/reactor-core-3.5.17.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2cf9b080e3a2d8a5a39948260db5fd1dae54c3ac
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ protected FeatureFlagSettings(
FeatureFlags.IDENTITY_SETTING,
FeatureFlags.TELEMETRY_SETTING,
FeatureFlags.DATETIME_FORMATTER_CACHING_SETTING,
FeatureFlags.WRITEABLE_REMOTE_INDEX_SETTING,
FeatureFlags.PLUGGABLE_CACHE_SETTING,
FeatureFlags.REMOTE_STORE_MIGRATION_EXPERIMENTAL_SETTING
FeatureFlags.TIERED_REMOTE_INDEX_SETTING,
FeatureFlags.REMOTE_STORE_MIGRATION_EXPERIMENTAL_SETTING,
FeatureFlags.PLUGGABLE_CACHE_SETTING
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ public class FeatureFlags {
public static final String DATETIME_FORMATTER_CACHING = "opensearch.experimental.optimization.datetime_formatter_caching.enabled";

/**
* Gates the functionality of writeable remote index
* Gates the functionality of remote index having the capability to move across different tiers
* Once the feature is ready for release, this feature flag can be removed.
*/
public static final String WRITEABLE_REMOTE_INDEX = "opensearch.experimental.feature.writeable_remote_index.enabled";
public static final String TIERED_REMOTE_INDEX = "opensearch.experimental.feature.tiered_remote_index.enabled";

/**
* Gates the functionality of pluggable cache.
Expand All @@ -85,11 +85,7 @@ public class FeatureFlags {
Property.NodeScope
);

public static final Setting<Boolean> WRITEABLE_REMOTE_INDEX_SETTING = Setting.boolSetting(
WRITEABLE_REMOTE_INDEX,
false,
Property.NodeScope
);
public static final Setting<Boolean> TIERED_REMOTE_INDEX_SETTING = Setting.boolSetting(TIERED_REMOTE_INDEX, false, Property.NodeScope);

public static final Setting<Boolean> PLUGGABLE_CACHE_SETTING = Setting.boolSetting(PLUGGABLE_CACHE, false, Property.NodeScope);

Expand All @@ -99,7 +95,7 @@ public class FeatureFlags {
IDENTITY_SETTING,
TELEMETRY_SETTING,
DATETIME_FORMATTER_CACHING_SETTING,
WRITEABLE_REMOTE_INDEX_SETTING,
TIERED_REMOTE_INDEX_SETTING,
PLUGGABLE_CACHE_SETTING
);
/**
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/hdfs-fixture/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
api "commons-codec:commons-codec:${versions.commonscodec}"
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
api "io.netty:netty-all:${versions.netty}"
api 'com.google.code.gson:gson:2.9.0'
api 'com.google.code.gson:gson:2.11.0'
api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
Expand Down

0 comments on commit 4cb9129

Please sign in to comment.