@@ -406,7 +406,7 @@ public IndexShard(
406
406
logger ,
407
407
threadPool ,
408
408
this ::getEngine ,
409
- indexSettings .isRemoteNode (),
409
+ indexSettings .isAssignedOnRemoteNode (),
410
410
() -> getRemoteTranslogUploadBufferInterval (remoteStoreSettings ::getClusterRemoteTranslogBufferInterval )
411
411
);
412
412
this .mapperService = mapperService ;
@@ -1469,7 +1469,7 @@ public SegmentsStats segmentStats(boolean includeSegmentFileSizes, boolean inclu
1469
1469
SegmentsStats segmentsStats = getEngine ().segmentsStats (includeSegmentFileSizes , includeUnloadedSegments );
1470
1470
segmentsStats .addBitsetMemoryInBytes (shardBitsetFilterCache .getMemorySizeInBytes ());
1471
1471
// Populate remote_store stats only if the index is remote store backed
1472
- if (indexSettings ().isRemoteNode ()) {
1472
+ if (indexSettings ().isAssignedOnRemoteNode ()) {
1473
1473
segmentsStats .addRemoteSegmentStats (
1474
1474
new RemoteSegmentStats (remoteStoreStatsTrackerFactory .getRemoteSegmentTransferTracker (shardId ).stats ())
1475
1475
);
@@ -1491,7 +1491,7 @@ public FieldDataStats fieldDataStats(String... fields) {
1491
1491
public TranslogStats translogStats () {
1492
1492
TranslogStats translogStats = getEngine ().translogManager ().getTranslogStats ();
1493
1493
// Populate remote_store stats only if the index is remote store backed
1494
- if (indexSettings .isRemoteNode ()) {
1494
+ if (indexSettings .isAssignedOnRemoteNode ()) {
1495
1495
translogStats .addRemoteTranslogStats (
1496
1496
new RemoteTranslogStats (remoteStoreStatsTrackerFactory .getRemoteTranslogTransferTracker (shardId ).stats ())
1497
1497
);
@@ -1530,7 +1530,7 @@ public void flush(FlushRequest request) {
1530
1530
* {@link org.opensearch.index.translog.TranslogDeletionPolicy} for details
1531
1531
*/
1532
1532
public void trimTranslog () {
1533
- if (indexSettings .isRemoteNode ()) {
1533
+ if (indexSettings .isAssignedOnRemoteNode ()) {
1534
1534
return ;
1535
1535
}
1536
1536
verifyNotClosed ();
@@ -2050,7 +2050,7 @@ public void close(String reason, boolean flushEngine, boolean deleted) throws IO
2050
2050
ToDo : Fix this https://github.com/opensearch-project/OpenSearch/issues/8003
2051
2051
*/
2052
2052
public RemoteSegmentStoreDirectory getRemoteDirectory () {
2053
- assert indexSettings .isRemoteNode ();
2053
+ assert indexSettings .isAssignedOnRemoteNode ();
2054
2054
assert remoteStore .directory () instanceof FilterDirectory : "Store.directory is not an instance of FilterDirectory" ;
2055
2055
FilterDirectory remoteStoreDirectory = (FilterDirectory ) remoteStore .directory ();
2056
2056
FilterDirectory byteSizeCachingStoreDirectory = (FilterDirectory ) remoteStoreDirectory .getDelegate ();
@@ -2063,7 +2063,7 @@ public RemoteSegmentStoreDirectory getRemoteDirectory() {
2063
2063
* is in sync with local
2064
2064
*/
2065
2065
public boolean isRemoteSegmentStoreInSync () {
2066
- assert indexSettings .isRemoteNode ();
2066
+ assert indexSettings .isAssignedOnRemoteNode ();
2067
2067
try {
2068
2068
RemoteSegmentStoreDirectory directory = getRemoteDirectory ();
2069
2069
if (directory .readLatestMetadataFile () != null ) {
@@ -2102,7 +2102,7 @@ public void waitForRemoteStoreSync() {
2102
2102
Calls onProgress on seeing an increased file count on remote
2103
2103
*/
2104
2104
public void waitForRemoteStoreSync (Runnable onProgress ) {
2105
- assert indexSettings .isRemoteNode ();
2105
+ assert indexSettings .isAssignedOnRemoteNode ();
2106
2106
RemoteSegmentStoreDirectory directory = getRemoteDirectory ();
2107
2107
int segmentUploadeCount = 0 ;
2108
2108
if (shardRouting .primary () == false ) {
@@ -2277,7 +2277,7 @@ public long recoverLocallyAndFetchStartSeqNo(boolean localTranslog) {
2277
2277
* @return the starting sequence number from which the recovery should start.
2278
2278
*/
2279
2279
private long recoverLocallyUptoLastCommit () {
2280
- assert indexSettings .isRemoteNode () : "Remote translog store is not enabled" ;
2280
+ assert indexSettings .isAssignedOnRemoteNode () : "Remote translog store is not enabled" ;
2281
2281
long seqNo ;
2282
2282
validateLocalRecoveryState ();
2283
2283
@@ -3540,7 +3540,7 @@ assert getLocalCheckpoint() == primaryContext.getCheckpointStates().get(allocati
3540
3540
}
3541
3541
3542
3542
private void postActivatePrimaryMode () {
3543
- if (indexSettings .isRemoteNode ()) {
3543
+ if (indexSettings .isAssignedOnRemoteNode ()) {
3544
3544
// We make sure to upload translog (even if it does not contain any operations) to remote translog.
3545
3545
// This helps to get a consistent state in remote store where both remote segment store and remote
3546
3546
// translog contains data.
@@ -4010,7 +4010,7 @@ public boolean enableUploadToRemoteTranslog() {
4010
4010
}
4011
4011
4012
4012
private boolean hasOneRemoteSegmentSyncHappened () {
4013
- assert indexSettings .isRemoteNode ();
4013
+ assert indexSettings .isAssignedOnRemoteNode ();
4014
4014
// We upload remote translog only after one remote segment upload in case of migration
4015
4015
RemoteSegmentStoreDirectory rd = getRemoteDirectory ();
4016
4016
AtomicBoolean segment_n_uploaded = new AtomicBoolean (false );
@@ -4624,7 +4624,7 @@ public final boolean isSearchIdle() {
4624
4624
public final boolean isSearchIdleSupported () {
4625
4625
// If the index is remote store backed, then search idle is not supported. This is to ensure that async refresh
4626
4626
// task continues to upload to remote store periodically.
4627
- if (isRemoteTranslogEnabled () || indexSettings .isRemoteNode ()) {
4627
+ if (isRemoteTranslogEnabled () || indexSettings .isAssignedOnRemoteNode ()) {
4628
4628
return false ;
4629
4629
}
4630
4630
return indexSettings .isSegRepEnabledOrRemoteNode () == false || indexSettings .getNumberOfReplicas () == 0 ;
@@ -5263,9 +5263,9 @@ enum ShardMigrationState {
5263
5263
}
5264
5264
5265
5265
static ShardMigrationState getShardMigrationState (IndexSettings indexSettings , boolean shouldSeed ) {
5266
- if (indexSettings .isRemoteNode () && indexSettings .isRemoteStoreEnabled ()) {
5266
+ if (indexSettings .isAssignedOnRemoteNode () && indexSettings .isRemoteStoreEnabled ()) {
5267
5267
return REMOTE_NON_MIGRATING ;
5268
- } else if (indexSettings .isRemoteNode ()) {
5268
+ } else if (indexSettings .isAssignedOnRemoteNode ()) {
5269
5269
return shouldSeed ? REMOTE_MIGRATING_UNSEEDED : REMOTE_MIGRATING_SEEDED ;
5270
5270
}
5271
5271
return ShardMigrationState .DOCREP_NON_MIGRATING ;
0 commit comments