Skip to content

Commit f33db50

Browse files
authored
Fix build due to multiple commits to same file causing compilation failure (#13019)
Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>
1 parent 8def8cb commit f33db50

File tree

9 files changed

+14
-13
lines changed

9 files changed

+14
-13
lines changed

server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ protected long primaryOperationSize(BulkShardRequest request) {
442442

443443
@Override
444444
public ReplicationMode getReplicationMode(IndexShard indexShard) {
445-
if (indexShard.indexSettings().isRemoteNode()) {
445+
if (indexShard.indexSettings().isAssignedOnRemoteNode()) {
446446
return ReplicationMode.PRIMARY_TERM_VALIDATION;
447447
}
448448
return super.getReplicationMode(indexShard);

server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ public void performOn(
356356
* @return the overridden replication mode.
357357
*/
358358
public ReplicationMode getReplicationMode(IndexShard indexShard) {
359-
if (indexShard.indexSettings().isRemoteNode()) {
359+
if (indexShard.indexSettings().isAssignedOnRemoteNode()) {
360360
return ReplicationMode.NO_REPLICATION;
361361
}
362362
return ReplicationMode.FULL_REPLICATION;
@@ -642,7 +642,7 @@ public void handleException(TransportException exp) {
642642
primaryRequest.getPrimaryTerm(),
643643
initialRetryBackoffBound,
644644
retryTimeout,
645-
indexShard.indexSettings().isRemoteNode()
645+
indexShard.indexSettings().isAssignedOnRemoteNode()
646646
? new ReplicationModeAwareProxy<>(
647647
getReplicationMode(indexShard),
648648
clusterState.getNodes(),

server/src/main/java/org/opensearch/index/seqno/GlobalCheckpointSyncAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected void shardOperationOnReplica(Request shardRequest, IndexShard replica,
135135
private void maybeSyncTranslog(final IndexShard indexShard) throws IOException {
136136
if (indexShard.getTranslogDurability() == Translog.Durability.REQUEST
137137
&& indexShard.getLastSyncedGlobalCheckpoint() < indexShard.getLastKnownGlobalCheckpoint()
138-
&& indexShard.indexSettings().isRemoteNode() == false) {
138+
&& indexShard.indexSettings().isAssignedOnRemoteNode() == false) {
139139
indexShard.sync();
140140
}
141141
}

server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,8 @@ private void addPeerRecoveryRetentionLeaseForSolePrimary() {
13781378
final ShardRouting primaryShard = routingTable.primaryShard();
13791379
final String leaseId = getPeerRecoveryRetentionLeaseId(primaryShard);
13801380
if (retentionLeases.get(leaseId) == null) {
1381-
if (replicationGroup.getReplicationTargets().equals(Collections.singletonList(primaryShard)) || indexSettings.isRemoteNode()) {
1381+
if (replicationGroup.getReplicationTargets().equals(Collections.singletonList(primaryShard))
1382+
|| indexSettings.isAssignedOnRemoteNode()) {
13821383
assert primaryShard.allocationId().getId().equals(shardAllocationId) : routingTable.assignedShards()
13831384
+ " vs "
13841385
+ shardAllocationId;

server/src/main/java/org/opensearch/index/shard/CheckpointRefreshListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected boolean performAfterRefreshWithPermit(boolean didRefresh) {
4343
if (didRefresh
4444
&& shard.state() == IndexShardState.STARTED
4545
&& shard.getReplicationTracker().isPrimaryMode()
46-
&& shard.indexSettings.isRemoteNode() == false) {
46+
&& shard.indexSettings.isAssignedOnRemoteNode() == false) {
4747
publisher.publish(shard, shard.getLatestReplicationCheckpoint());
4848
}
4949
return true;

server/src/main/java/org/opensearch/index/shard/IndexShard.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3520,8 +3520,8 @@ public void updateGlobalCheckpointOnReplica(final long globalCheckpoint, final S
35203520
* When remote translog is enabled for an index, replication operation is limited to primary term validation and does not
35213521
* update local checkpoint at replica, so the local checkpoint at replica can be less than globalCheckpoint.
35223522
*/
3523-
assert (state() != IndexShardState.POST_RECOVERY && state() != IndexShardState.STARTED) || indexSettings.isRemoteNode()
3524-
: "supposedly in-sync shard copy received a global checkpoint ["
3523+
assert (state() != IndexShardState.POST_RECOVERY && state() != IndexShardState.STARTED)
3524+
|| indexSettings.isAssignedOnRemoteNode() : "supposedly in-sync shard copy received a global checkpoint ["
35253525
+ globalCheckpoint
35263526
+ "] "
35273527
+ "that is higher than its local checkpoint ["

server/src/main/java/org/opensearch/indices/replication/SegmentReplicationSourceFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SegmentReplicationSourceFactory(
3838
}
3939

4040
public SegmentReplicationSource get(IndexShard shard) {
41-
if (shard.indexSettings().isRemoteNode()) {
41+
if (shard.indexSettings().isAssignedOnRemoteNode()) {
4242
return new RemoteStoreReplicationSource(shard);
4343
} else {
4444
return new PrimaryShardReplicationSource(

server/src/main/java/org/opensearch/indices/replication/checkpoint/PublishCheckpointAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected void doExecute(Task task, PublishCheckpointRequest request, ActionList
9898

9999
@Override
100100
public ReplicationMode getReplicationMode(IndexShard indexShard) {
101-
if (indexShard.indexSettings().isRemoteNode()) {
101+
if (indexShard.indexSettings().isAssignedOnRemoteNode()) {
102102
return ReplicationMode.FULL_REPLICATION;
103103
}
104104
return super.getReplicationMode(indexShard);
@@ -201,7 +201,7 @@ protected void shardOperationOnReplica(PublishCheckpointRequest request, IndexSh
201201
logger.trace(() -> new ParameterizedMessage("Checkpoint {} received on replica {}", request, replica.shardId()));
202202
// Condition for ensuring that we ignore Segrep checkpoints received on Docrep shard copies.
203203
// This case will hit iff the replica hosting node is not remote enabled and replication type != SEGMENT
204-
if (replica.indexSettings().isRemoteNode() == false && replica.indexSettings().isSegRepLocalEnabled() == false) {
204+
if (replica.indexSettings().isAssignedOnRemoteNode() == false && replica.indexSettings().isSegRepLocalEnabled() == false) {
205205
logger.trace("Received segrep checkpoint on a docrep shard copy during an ongoing remote migration. NoOp.");
206206
return new ReplicaResult();
207207
}

test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,13 @@ public synchronized void startAll() throws IOException {
344344

345345
public synchronized DiscoveryNodes generateFakeDiscoveryNodes() {
346346
DiscoveryNodes.Builder builder = new DiscoveryNodes.Builder();
347-
if (primary.indexSettings() != null && primary.indexSettings().isRemoteNode()) {
347+
if (primary.indexSettings() != null && primary.indexSettings().isAssignedOnRemoteNode()) {
348348
builder.add(IndexShardTestUtils.getFakeRemoteEnabledNode(primary.routingEntry().currentNodeId()));
349349
} else {
350350
builder.add(IndexShardTestUtils.getFakeDiscoNode(primary.routingEntry().currentNodeId()));
351351
}
352352
for (IndexShard replica : replicas) {
353-
if (replica.indexSettings() != null && replica.indexSettings().isRemoteNode()) {
353+
if (replica.indexSettings() != null && replica.indexSettings().isAssignedOnRemoteNode()) {
354354
builder.add(IndexShardTestUtils.getFakeRemoteEnabledNode(replica.routingEntry().currentNodeId()));
355355
} else {
356356
builder.add(IndexShardTestUtils.getFakeDiscoNode(replica.routingEntry().currentNodeId()));

0 commit comments

Comments
 (0)