[CCR] Renamed leader_cluster to remote_cluster (elastic#34776)

and also some occurrences of clusterAlias to remoteCluster. Closes elastic#34682

Author: martijnvg

x-pack/plugin/ccr/qa/multi-cluster-with-non-compliant-license/src/test/java/org/elasticsearch/xpack/ccr/CcrMultiClusterLicenseIT.java

@@ -25,7 +25,7 @@ public class CcrMultiClusterLicenseIT extends ESCCRRestTestCase {
  public void testFollow() {
  if ("follow".equals(targetCluster)) {
  final Request request = new Request("PUT", "/follower/_ccr/follow");
- request.setJsonEntity("{\"leader_cluster\": \"leader_cluster\", \"leader_index\": \"leader\"}");
+ request.setJsonEntity("{\"remote_cluster\": \"leader_cluster\", \"leader_index\": \"leader\"}");
  assertNonCompliantLicense(request);
  }
  }
@@ -34,7 +34,7 @@ public void testAutoFollow() throws Exception {
  assumeFalse("windows is the worst", Constants.WINDOWS);
  if ("follow".equals(targetCluster)) {
  final Request request = new Request("PUT", "/_ccr/auto_follow/test_pattern");
- request.setJsonEntity("{\"leader_index_patterns\":[\"*\"], \"leader_cluster\": \"leader_cluster\"}");
+ request.setJsonEntity("{\"leader_index_patterns\":[\"*\"], \"remote_cluster\": \"leader_cluster\"}");
  client().performRequest(request);
 
  // parse the logs and ensure that the auto-coordinator skipped coordination on the leader cluster

x-pack/plugin/ccr/qa/multi-cluster-with-security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java

@@ -132,13 +132,13 @@ public void testAutoFollowPatterns() throws Exception {
 
  {
  Request request = new Request("PUT", "/_ccr/auto_follow/test_pattern");
- request.setJsonEntity("{\"leader_index_patterns\": [\"logs-*\"], \"leader_cluster\": \"leader_cluster\"}");
+ request.setJsonEntity("{\"leader_index_patterns\": [\"logs-*\"], \"remote_cluster\": \"leader_cluster\"}");
  Exception e = expectThrows(ResponseException.class, () -> assertOK(client().performRequest(request)));
  assertThat(e.getMessage(), containsString("insufficient privileges to follow index [logs-*]"));
  }
 
  Request request = new Request("PUT", "/_ccr/auto_follow/test_pattern");
- request.setJsonEntity("{\"leader_index_patterns\": [\"logs-eu-*\"], \"leader_cluster\": \"leader_cluster\"}");
+ request.setJsonEntity("{\"leader_index_patterns\": [\"logs-eu-*\"], \"remote_cluster\": \"leader_cluster\"}");
  assertOK(client().performRequest(request));
 
  try (RestClient leaderClient = buildLeaderClient()) {

x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java

@@ -83,7 +83,7 @@ public void testAutoFollowPatterns() throws Exception {
  assumeFalse("Test should only run when both clusters are running", "leader".equals(targetCluster));
 
  Request request = new Request("PUT", "/_ccr/auto_follow/test_pattern");
- request.setJsonEntity("{\"leader_index_patterns\": [\"logs-*\"], \"leader_cluster\": \"leader_cluster\"}");
+ request.setJsonEntity("{\"leader_index_patterns\": [\"logs-*\"], \"remote_cluster\": \"leader_cluster\"}");
  assertOK(client().performRequest(request));
 
  try (RestClient leaderClient = buildLeaderClient()) {

x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/auto_follow.yml

@@ -23,21 +23,21 @@
  ccr.put_auto_follow_pattern:
  name: my_pattern
  body:
- leader_cluster: local
+ remote_cluster: local
  leader_index_patterns: ['logs-*']
  max_concurrent_read_batches: 2
  - is_true: acknowledged
 
  - do:
  ccr.get_auto_follow_pattern:
  name: my_pattern
- - match: { my_pattern.leader_cluster: 'local' }
+ - match: { my_pattern.remote_cluster: 'local' }
  - match: { my_pattern.leader_index_patterns: ['logs-*'] }
  - match: { my_pattern.max_concurrent_read_batches: 2 }
 
  - do:
  ccr.get_auto_follow_pattern: {}
- - match: { my_pattern.leader_cluster: 'local' }
+ - match: { my_pattern.remote_cluster: 'local' }
  - match: { my_pattern.leader_index_patterns: ['logs-*'] }
  - match: { my_pattern.max_concurrent_read_batches: 2 }
 

x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml

@@ -38,7 +38,7 @@
  ccr.follow:
  index: bar
  body:
- leader_cluster: local
+ remote_cluster: local
  leader_index: foo
  - is_true: follow_index_created
  - is_true: follow_index_shards_acked

x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/follow_stats.yml

@@ -38,7 +38,7 @@
  ccr.follow:
  index: bar
  body:
- leader_cluster: local
+ remote_cluster: local
  leader_index: foo
  - is_true: follow_index_created
  - is_true: follow_index_shards_acked

x-pack/plugin/ccr/qa/src/main/java/org/elasticsearch/xpack/ccr/ESCCRRestTestCase.java

@@ -73,7 +73,7 @@ protected static void followIndex(String leaderCluster, String leaderIndex, Stri
 
  protected static void followIndex(RestClient client, String leaderCluster, String leaderIndex, String followIndex) throws IOException {
  final Request request = new Request("PUT", "/" + followIndex + "/_ccr/follow");
- request.setJsonEntity("{\"leader_cluster\": \"" + leaderCluster + "\", \"leader_index\": \"" + leaderIndex +
+ request.setJsonEntity("{\"remote_cluster\": \"" + leaderCluster + "\", \"leader_index\": \"" + leaderIndex +
  "\", \"poll_timeout\": \"10ms\"}");
  assertOK(client.performRequest(request));
  }

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java

@@ -99,7 +99,7 @@ public class Ccr extends Plugin implements ActionPlugin, PersistentTaskPlugin, E
  public static final String CCR_CUSTOM_METADATA_LEADER_INDEX_SHARD_HISTORY_UUIDS = "leader_index_shard_history_uuids";
  public static final String CCR_CUSTOM_METADATA_LEADER_INDEX_UUID_KEY = "leader_index_uuid";
  public static final String CCR_CUSTOM_METADATA_LEADER_INDEX_NAME_KEY = "leader_index_name";
- public static final String CCR_CUSTOM_METADATA_LEADER_CLUSTER_NAME_KEY = "leader_cluster_name";
+ public static final String CCR_CUSTOM_METADATA_REMOTE_CLUSTER_NAME_KEY = "remote_cluster_name";
 
  private final boolean enabled;
  private final Settings settings;

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java

@@ -159,7 +159,7 @@ private void doAutoFollow() {
 
  @Override
  void getLeaderClusterState(final Map<String, String> headers,
- final String leaderClusterAlias,
+ final String remoteCluster,
  final BiConsumer<ClusterState, Exception> handler) {
  final ClusterStateRequest request = new ClusterStateRequest();
  request.clear();
@@ -168,7 +168,7 @@ void getLeaderClusterState(final Map<String, String> headers,
  ccrLicenseChecker.checkRemoteClusterLicenseAndFetchClusterState(
  client,
  headers,
- leaderClusterAlias,
+ remoteCluster,
  request,
  e -> handler.accept(null, e),
  leaderClusterState -> handler.accept(leaderClusterState, null));
@@ -245,27 +245,27 @@ void autoFollowIndices() {
  final int slot = i;
  final String autoFollowPattenName = entry.getKey();
  final AutoFollowPattern autoFollowPattern = entry.getValue();
- final String leaderCluster = autoFollowPattern.getLeaderCluster();
+ final String remoteCluster = autoFollowPattern.getRemoteCluster();
 
  Map<String, String> headers = autoFollowMetadata.getHeaders().get(autoFollowPattenName);
- getLeaderClusterState(headers, leaderCluster, (leaderClusterState, e) -> {
+ getLeaderClusterState(headers, remoteCluster, (leaderClusterState, e) -> {
  if (leaderClusterState != null) {
  assert e == null;
  final List<String> followedIndices = autoFollowMetadata.getFollowedLeaderIndexUUIDs().get(autoFollowPattenName);
- final List<Index> leaderIndicesToFollow = getLeaderIndicesToFollow(leaderCluster, autoFollowPattern,
+ final List<Index> leaderIndicesToFollow = getLeaderIndicesToFollow(remoteCluster, autoFollowPattern,
  leaderClusterState, followerClusterState, followedIndices);
  if (leaderIndicesToFollow.isEmpty()) {
  finalise(slot, new AutoFollowResult(autoFollowPattenName));
  } else {
  List<Tuple<String, AutoFollowPattern>> patternsForTheSameLeaderCluster = autoFollowMetadata.getPatterns()
  .entrySet().stream()
  .filter(item -> autoFollowPattenName.equals(item.getKey()) == false)
- .filter(item -> leaderCluster.equals(item.getValue().getLeaderCluster()))
+ .filter(item -> remoteCluster.equals(item.getValue().getRemoteCluster()))
  .map(item -> new Tuple<>(item.getKey(), item.getValue()))
  .collect(Collectors.toList());
 
  Consumer<AutoFollowResult> resultHandler = result -> finalise(slot, result);
- checkAutoFollowPattern(autoFollowPattenName, leaderCluster, autoFollowPattern, leaderIndicesToFollow, headers,
+ checkAutoFollowPattern(autoFollowPattenName, remoteCluster, autoFollowPattern, leaderIndicesToFollow, headers,
  patternsForTheSameLeaderCluster, resultHandler);
  }
  } else {
@@ -313,7 +313,7 @@ private void checkAutoFollowPattern(String autoFollowPattenName,
  }
 
  private void followLeaderIndex(String autoFollowPattenName,
- String leaderCluster,
+ String remoteCluster,
  Index indexToFollow,
  AutoFollowPattern pattern,
  Map<String,String> headers,
@@ -332,7 +332,7 @@ private void followLeaderIndex(String autoFollowPattenName,
  followRequest.setPollTimeout(pattern.getPollTimeout());
 
  PutFollowAction.Request request = new PutFollowAction.Request();
- request.setLeaderCluster(leaderCluster);
+ request.setRemoteCluster(remoteCluster);
  request.setLeaderIndex(indexToFollow.getName());
  request.setFollowRequest(followRequest);
 
@@ -357,7 +357,7 @@ private void finalise(int slot, AutoFollowResult result) {
  }
  }
 
- static List<Index> getLeaderIndicesToFollow(String clusterAlias,
+ static List<Index> getLeaderIndicesToFollow(String remoteCluster,
  AutoFollowPattern autoFollowPattern,
  ClusterState leaderClusterState,
  ClusterState followerClusterState,
@@ -409,12 +409,12 @@ static Function<ClusterState, ClusterState> recordLeaderIndexAsFollowFunction(St
  * Fetch the cluster state from the leader with the specified cluster alias
  *
  * @param headers the client headers
- * @param leaderClusterAlias the cluster alias of the leader
+ * @param remoteCluster the name of the leader cluster
  * @param handler the callback to invoke
  */
  abstract void getLeaderClusterState(
  Map<String, String> headers,
- String leaderClusterAlias,
+ String remoteCluster,
  BiConsumer<ClusterState, Exception> handler
  );
 

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowNodeTask.java

@@ -437,7 +437,7 @@ public synchronized ShardFollowNodeTaskStatus getStatus() {
  timeSinceLastFetchMillis = -1;
  }
  return new ShardFollowNodeTaskStatus(
- params.getLeaderCluster(),
+ params.getRemoteCluster(),
  params.getLeaderShardId().getIndexName(),
  params.getFollowShardId().getIndexName(),
  getFollowShardId().getId(),