Skip to content

Commit e85e645

Browse files
dependabot[bot]cwperks
authored andcommitted
Bump org.apache.maven:maven-model from 3.9.6 to 3.9.12 (#20438)
* Bump org.apache.maven:maven-model from 3.9.6 to 3.9.12 Bumps org.apache.maven:maven-model from 3.9.6 to 3.9.12. --- updated-dependencies: - dependency-name: org.apache.maven:maven-model dependency-version: 3.9.12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Craig Perkins <[email protected]> Signed-off-by: Rakshit Goyal <[email protected]>
1 parent 2e7b19a commit e85e645

File tree

5 files changed

+25
-3
lines changed

5 files changed

+25
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3939
- Fix indexing regression and bug fixes for grouping criteria. ([20145](https://github.com/opensearch-project/OpenSearch/pull/20145))
4040
- LeafReader should not remove SubReaderWrappers incase IndexWriter encounters a non aborting Exception ([#20193](https://github.com/opensearch-project/OpenSearch/pull/20193))
4141
- Fix Netty deprecation warnings in transport-reactor-netty4 module ([20429](https://github.com/opensearch-project/OpenSearch/pull/20429))
42+
- Adding validation to check if Remote Store Translog Repo is enabled ([#20450](https://github.com/opensearch-project/OpenSearch/pull/20450))
4243

4344
### Dependencies
4445
- Bump `com.google.auth:google-auth-library-oauth2-http` from 1.38.0 to 1.41.0 ([#20183](https://github.com/opensearch-project/OpenSearch/pull/20183))
@@ -71,6 +72,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
7172
- Bump `org.wiremock:wiremock-standalone` from 3.6.0 to 3.13.2 ([#20406](https://github.com/opensearch-project/OpenSearch/pull/20406))
7273
- Bump `tj-actions/changed-files` from 47.0.0 to 47.0.1 ([#20408](https://github.com/opensearch-project/OpenSearch/pull/20408))
7374
- Bump `reactor-netty` to 1.3.2, `reactor` to 3.8.2 ([#20419](https://github.com/opensearch-project/OpenSearch/pull/20419))
75+
- Bump `org.apache.maven:maven-model` from 3.9.6 to 3.9.12 ([#20438](https://github.com/opensearch-project/OpenSearch/pull/20438))
7476
- Bump `dnsjava:dnsjava` from 3.6.3 to 3.6.4 ([#20440](https://github.com/opensearch-project/OpenSearch/pull/20440))
7577
- Bump `com.netflix.nebula.ospackage-base` from 12.1.1 to 12.2.0 ([#20439](https://github.com/opensearch-project/OpenSearch/pull/20439))
7678
- Bump OpenTelemetry to 1.58.0 ([#20441](https://github.com/opensearch-project/OpenSearch/pull/20441))

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ dependencies {
117117
api 'de.thetaphi:forbiddenapis:3.10'
118118
api 'com.avast.gradle:gradle-docker-compose-plugin:0.17.12'
119119
api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
120-
api 'org.apache.maven:maven-model:3.9.6'
120+
api 'org.apache.maven:maven-model:3.9.12'
121121
api 'com.networknt:json-schema-validator:1.2.0'
122122
api 'org.jruby.jcodings:jcodings:1.0.58'
123123
api 'org.jruby.joni:joni:2.2.3'

server/src/main/java/org/opensearch/index/IndexSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1553,7 +1553,7 @@ public boolean isAssignedOnRemoteNode() {
15531553
* Returns if remote translog store is enabled for this index.
15541554
*/
15551555
public boolean isRemoteTranslogStoreEnabled() {
1556-
return remoteStoreTranslogRepository != null && remoteStoreTranslogRepository.isEmpty() == false;
1556+
return remoteStoreTranslogRepository != null && remoteStoreTranslogRepository.isEmpty() == false && assignedOnRemoteNode;
15571557
}
15581558

15591559
/**

server/src/test/java/org/opensearch/index/IndexSettingsTests.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,26 @@ public void testMaxAdjacencyMatrixFiltersSetting() {
491491
);
492492
}
493493

494+
public void testRemoteTranslogStoreDisabledWhenNodeHasNoRemoteStoreAttributes() {
495+
// Corner case: Index settings have repository configured but node attributes don't have remote repositories setup
496+
IndexMetadata metadata = newIndexMeta(
497+
"index",
498+
Settings.builder()
499+
.put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
500+
.put(IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY, "tlog-store")
501+
.put(IndexSettings.INDEX_REMOTE_TRANSLOG_BUFFER_INTERVAL_SETTING.getKey(), "200ms")
502+
.build()
503+
);
504+
// Node settings without remote store attributes
505+
Settings nodeSettings = Settings.EMPTY;
506+
IndexSettings settings = new IndexSettings(metadata, nodeSettings);
507+
508+
// Verify repository is configured in index settings
509+
assertEquals("tlog-store", settings.getRemoteStoreTranslogRepository());
510+
// But remote translog should be disabled since node doesn't have remote store attributes
511+
assertFalse("Remote translog should be disabled when node has no remote store attributes", settings.isRemoteTranslogStoreEnabled());
512+
}
513+
494514
public void testMaxRegexLengthSetting() {
495515
IndexMetadata metadata = newIndexMeta(
496516
"index",

server/src/test/java/org/opensearch/index/seqno/ReplicationTrackerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ public void testInSyncIdsAreIgnoredIfNotValidatedByClusterManagerWithRemoteTrans
15721572
.put(IndexMetadata.SETTING_REMOTE_STORE_ENABLED, "true")
15731573
.put(IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY, "translog-repo")
15741574
.build();
1575-
final ReplicationTracker tracker = newTracker(primaryId, settings);
1575+
final ReplicationTracker tracker = newTracker(primaryId, updatedGlobalCheckpoint::set, () -> 0L, settings, true);
15761576
tracker.updateFromClusterManager(randomNonNegativeLong(), ids(active.keySet()), routingTable(initializing.keySet(), primaryId));
15771577
tracker.activatePrimaryMode(NO_OPS_PERFORMED);
15781578
initializing.keySet().forEach(k -> markAsTrackingAndInSyncQuietly(tracker, k.getId(), NO_OPS_PERFORMED));

0 commit comments

Comments
 (0)