@@ -408,7 +408,7 @@ public IndexShard(
408
408
logger ,
409
409
threadPool ,
410
410
this ::getEngine ,
411
- indexSettings .isRemoteNode (),
411
+ indexSettings .isAssignedOnRemoteNode (),
412
412
() -> getRemoteTranslogUploadBufferInterval (remoteStoreSettings ::getClusterRemoteTranslogBufferInterval )
413
413
);
414
414
this .mapperService = mapperService ;
@@ -1476,7 +1476,7 @@ public SegmentsStats segmentStats(boolean includeSegmentFileSizes, boolean inclu
1476
1476
SegmentsStats segmentsStats = getEngine ().segmentsStats (includeSegmentFileSizes , includeUnloadedSegments );
1477
1477
segmentsStats .addBitsetMemoryInBytes (shardBitsetFilterCache .getMemorySizeInBytes ());
1478
1478
// Populate remote_store stats only if the index is remote store backed
1479
- if (indexSettings ().isRemoteNode ()) {
1479
+ if (indexSettings ().isAssignedOnRemoteNode ()) {
1480
1480
segmentsStats .addRemoteSegmentStats (
1481
1481
new RemoteSegmentStats (remoteStoreStatsTrackerFactory .getRemoteSegmentTransferTracker (shardId ).stats ())
1482
1482
);
@@ -1498,7 +1498,7 @@ public FieldDataStats fieldDataStats(String... fields) {
1498
1498
public TranslogStats translogStats () {
1499
1499
TranslogStats translogStats = getEngine ().getTranslogStats ();
1500
1500
// Populate remote_store stats only if the index is remote store backed
1501
- if (indexSettings .isRemoteNode ()) {
1501
+ if (indexSettings .isAssignedOnRemoteNode ()) {
1502
1502
translogStats .addRemoteTranslogStats (
1503
1503
new RemoteTranslogStats (remoteStoreStatsTrackerFactory .getRemoteTranslogTransferTracker (shardId ).stats ())
1504
1504
);
@@ -1537,7 +1537,7 @@ public void flush(FlushRequest request) {
1537
1537
* {@link org.opensearch.index.translog.TranslogDeletionPolicy} for details
1538
1538
*/
1539
1539
public void trimTranslog () {
1540
- if (indexSettings .isRemoteNode ()) {
1540
+ if (indexSettings .isAssignedOnRemoteNode ()) {
1541
1541
return ;
1542
1542
}
1543
1543
verifyNotClosed ();
@@ -2059,7 +2059,7 @@ public void close(String reason, boolean flushEngine, boolean deleted) throws IO
2059
2059
ToDo : Fix this https://github.com/opensearch-project/OpenSearch/issues/8003
2060
2060
*/
2061
2061
public RemoteSegmentStoreDirectory getRemoteDirectory () {
2062
- assert indexSettings .isRemoteNode ();
2062
+ assert indexSettings .isAssignedOnRemoteNode ();
2063
2063
assert remoteStore .directory () instanceof FilterDirectory : "Store.directory is not an instance of FilterDirectory" ;
2064
2064
FilterDirectory remoteStoreDirectory = (FilterDirectory ) remoteStore .directory ();
2065
2065
FilterDirectory byteSizeCachingStoreDirectory = (FilterDirectory ) remoteStoreDirectory .getDelegate ();
@@ -2072,7 +2072,7 @@ public RemoteSegmentStoreDirectory getRemoteDirectory() {
2072
2072
* is in sync with local
2073
2073
*/
2074
2074
public boolean isRemoteSegmentStoreInSync () {
2075
- assert indexSettings .isRemoteNode ();
2075
+ assert indexSettings .isAssignedOnRemoteNode ();
2076
2076
try {
2077
2077
RemoteSegmentStoreDirectory directory = getRemoteDirectory ();
2078
2078
if (directory .readLatestMetadataFile () != null ) {
@@ -2111,7 +2111,7 @@ public void waitForRemoteStoreSync() {
2111
2111
Calls onProgress on seeing an increased file count on remote
2112
2112
*/
2113
2113
public void waitForRemoteStoreSync (Runnable onProgress ) {
2114
- assert indexSettings .isRemoteNode ();
2114
+ assert indexSettings .isAssignedOnRemoteNode ();
2115
2115
RemoteSegmentStoreDirectory directory = getRemoteDirectory ();
2116
2116
int segmentUploadeCount = 0 ;
2117
2117
if (shardRouting .primary () == false ) {
@@ -2285,7 +2285,7 @@ public long recoverLocallyAndFetchStartSeqNo(boolean localTranslog) {
2285
2285
* @return the starting sequence number from which the recovery should start.
2286
2286
*/
2287
2287
private long recoverLocallyUptoLastCommit () {
2288
- assert indexSettings .isRemoteNode () : "Remote translog store is not enabled" ;
2288
+ assert indexSettings .isAssignedOnRemoteNode () : "Remote translog store is not enabled" ;
2289
2289
long seqNo ;
2290
2290
validateLocalRecoveryState ();
2291
2291
@@ -3555,7 +3555,7 @@ assert getLocalCheckpoint() == primaryContext.getCheckpointStates().get(allocati
3555
3555
}
3556
3556
3557
3557
private void postActivatePrimaryMode () {
3558
- if (indexSettings .isRemoteNode ()) {
3558
+ if (indexSettings .isAssignedOnRemoteNode ()) {
3559
3559
// We make sure to upload translog (even if it does not contain any operations) to remote translog.
3560
3560
// This helps to get a consistent state in remote store where both remote segment store and remote
3561
3561
// translog contains data.
@@ -4025,7 +4025,7 @@ public boolean enableUploadToRemoteTranslog() {
4025
4025
}
4026
4026
4027
4027
private boolean hasOneRemoteSegmentSyncHappened () {
4028
- assert indexSettings .isRemoteNode ();
4028
+ assert indexSettings .isAssignedOnRemoteNode ();
4029
4029
// We upload remote translog only after one remote segment upload in case of migration
4030
4030
RemoteSegmentStoreDirectory rd = getRemoteDirectory ();
4031
4031
AtomicBoolean segment_n_uploaded = new AtomicBoolean (false );
@@ -4639,7 +4639,7 @@ public final boolean isSearchIdle() {
4639
4639
public final boolean isSearchIdleSupported () {
4640
4640
// If the index is remote store backed, then search idle is not supported. This is to ensure that async refresh
4641
4641
// task continues to upload to remote store periodically.
4642
- if (isRemoteTranslogEnabled () || indexSettings .isRemoteNode ()) {
4642
+ if (isRemoteTranslogEnabled () || indexSettings .isAssignedOnRemoteNode ()) {
4643
4643
return false ;
4644
4644
}
4645
4645
return indexSettings .isSegRepEnabledOrRemoteNode () == false || indexSettings .getNumberOfReplicas () == 0 ;
@@ -5269,9 +5269,9 @@ enum ShardMigrationState {
5269
5269
}
5270
5270
5271
5271
static ShardMigrationState getShardMigrationState (IndexSettings indexSettings , boolean shouldSeed ) {
5272
- if (indexSettings .isRemoteNode () && indexSettings .isRemoteStoreEnabled ()) {
5272
+ if (indexSettings .isAssignedOnRemoteNode () && indexSettings .isRemoteStoreEnabled ()) {
5273
5273
return REMOTE_NON_MIGRATING ;
5274
- } else if (indexSettings .isRemoteNode ()) {
5274
+ } else if (indexSettings .isAssignedOnRemoteNode ()) {
5275
5275
return shouldSeed ? REMOTE_MIGRATING_UNSEEDED : REMOTE_MIGRATING_SEEDED ;
5276
5276
}
5277
5277
return ShardMigrationState .DOCREP_NON_MIGRATING ;
0 commit comments