Skip to content

Commit ae572d6

Browse files
Add UPDATED response, adjust logic per code review
1 parent be18795 commit ae572d6

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,10 @@ synchronized void updateRemoteCluster(
436436
remote = new RemoteClusterConnection(config, transportService, remoteClusterCredentialsManager);
437437
connectionMap.put(clusterAlias, remote);
438438
remote.ensureConnected(listener.map(ignored -> RemoteClusterConnectionStatus.RECONNECTED));
439+
} else if (remote.isSkipUnavailable() != config.skipUnavailable()) {
440+
remote.setSkipUnavailable(config.skipUnavailable());
441+
listener.onResponse(RemoteClusterConnectionStatus.UPDATED);
439442
} else {
440-
if (crossProjectEnabled == false) {
441-
remote.setSkipUnavailable(config.skipUnavailable());
442-
}
443443
// No changes to connection configuration.
444444
listener.onResponse(RemoteClusterConnectionStatus.UNCHANGED);
445445
}
@@ -449,7 +449,8 @@ enum RemoteClusterConnectionStatus {
449449
CONNECTED,
450450
DISCONNECTED,
451451
RECONNECTED,
452-
UNCHANGED
452+
UNCHANGED,
453+
UPDATED
453454
}
454455

455456
/**

0 commit comments

Comments
 (0)