-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Assign follower primary to nodes with remote cluster client role (#59375
) The primary shards of follower indices during the bootstrap need to be on nodes with the remote cluster client role as those nodes reach out to the corresponding leader shards on the remote cluster to copy Lucene segment files and renew the retention leases. This commit introduces a new allocation decider that ensures bootstrapping follower primaries are allocated to nodes with the remote cluster client role. Backport of #59375 Co-authored-by: Jason Tedor <jason@tedor.me>
- Loading branch information
1 parent
9a6da22
commit f79b114
Showing
5 changed files
with
365 additions
and
1 deletion.
There are no files selected for viewing
83 changes: 83 additions & 0 deletions
83
...src/internalClusterTest/java/org/elasticsearch/xpack/ccr/PrimaryFollowerAllocationIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.ccr; | ||
|
|
||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.cluster.routing.IndexShardRoutingTable; | ||
| import org.elasticsearch.cluster.routing.ShardRouting; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.xcontent.XContentType; | ||
| import org.elasticsearch.node.Node; | ||
| import org.elasticsearch.xpack.CcrIntegTestCase; | ||
| import org.elasticsearch.xpack.core.ccr.action.PutFollowAction; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.hamcrest.Matchers.in; | ||
|
|
||
| public class PrimaryFollowerAllocationIT extends CcrIntegTestCase { | ||
|
|
||
| @Override | ||
| protected boolean reuseClusters() { | ||
| return false; | ||
| } | ||
|
|
||
| public void testAllocateFollowerPrimaryToNodesWithRemoteClusterClientRole() throws Exception { | ||
| final String leaderIndex = "leader-allow-index"; | ||
| final String followerIndex = "follower-allow-index"; | ||
| final List<String> dataOnlyNodes = getFollowerCluster().startNodes(between(2, 3), | ||
| Settings.builder().put(Node.NODE_DATA_SETTING.getKey(), true).build()); | ||
| final List<String> dataAndRemoteNodes = getFollowerCluster().startNodes(between(1, 2), | ||
| Settings.builder().put(Node.NODE_DATA_SETTING.getKey(), true).put(Node.NODE_REMOTE_CLUSTER_CLIENT.getKey(), true).build()); | ||
| assertAcked(leaderClient().admin().indices().prepareCreate(leaderIndex) | ||
| .setSource(getIndexSettings(between(1, 2), between(0, 1)), XContentType.JSON)); | ||
| final PutFollowAction.Request putFollowRequest = putFollow(leaderIndex, followerIndex); | ||
| final PutFollowAction.Response response = followerClient().execute(PutFollowAction.INSTANCE, putFollowRequest).get(); | ||
| assertTrue(response.isFollowIndexShardsAcked()); | ||
| assertTrue(response.isIndexFollowingStarted()); | ||
| ensureFollowerGreen(followerIndex); | ||
| int numDocs = between(0, 20); | ||
| for (int i = 0; i < numDocs; i++) { | ||
| leaderClient().prepareIndex(leaderIndex, "_doc").setSource("f", i).get(); | ||
| } | ||
| // Follower primaries can be relocated to nodes without the remote cluster client role | ||
| followerClient().admin().indices().prepareUpdateSettings(followerIndex) | ||
| .setSettings(Settings.builder().put("index.routing.allocation.include._name", String.join(",", dataOnlyNodes))) | ||
| .get(); | ||
| assertBusy(() -> { | ||
| final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState().get().getState(); | ||
| for (IndexShardRoutingTable shardRoutingTable : state.routingTable().index(followerIndex)) { | ||
| for (ShardRouting shard : shardRoutingTable) { | ||
| assertNotNull(shard.currentNodeId()); | ||
| final DiscoveryNode assignedNode = state.nodes().get(shard.currentNodeId()); | ||
| assertThat(assignedNode.getName(), in(dataOnlyNodes)); | ||
| } | ||
| } | ||
| }); | ||
| assertIndexFullyReplicatedToFollower(leaderIndex, followerIndex); | ||
| // Follower primaries can be recovered from the existing copies on nodes without the remote cluster client role | ||
| getFollowerCluster().fullRestart(); | ||
| ensureFollowerGreen(followerIndex); | ||
| assertBusy(() -> { | ||
| final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState().get().getState(); | ||
| for (IndexShardRoutingTable shardRoutingTable : state.routingTable().index(followerIndex)) { | ||
| for (ShardRouting shard : shardRoutingTable) { | ||
| assertNotNull(shard.currentNodeId()); | ||
| final DiscoveryNode assignedNode = state.nodes().get(shard.currentNodeId()); | ||
| assertThat(assignedNode.getName(), in(dataOnlyNodes)); | ||
| } | ||
| } | ||
| }); | ||
| int moreDocs = between(0, 20); | ||
| for (int i = 0; i < moreDocs; i++) { | ||
| leaderClient().prepareIndex(leaderIndex, "_doc").setSource("f", i).get(); | ||
| } | ||
| assertIndexFullyReplicatedToFollower(leaderIndex, followerIndex); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...main/java/org/elasticsearch/xpack/ccr/allocation/CcrPrimaryFollowerAllocationDecider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.ccr.allocation; | ||
|
|
||
| import org.elasticsearch.cluster.metadata.IndexMetadata; | ||
| import org.elasticsearch.cluster.node.DiscoveryNodeRole; | ||
| import org.elasticsearch.cluster.routing.RecoverySource; | ||
| import org.elasticsearch.cluster.routing.RoutingNode; | ||
| import org.elasticsearch.cluster.routing.ShardRouting; | ||
| import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; | ||
| import org.elasticsearch.cluster.routing.allocation.decider.AllocationDecider; | ||
| import org.elasticsearch.cluster.routing.allocation.decider.Decision; | ||
| import org.elasticsearch.xpack.ccr.CcrSettings; | ||
|
|
||
| /** | ||
| * An allocation decider that ensures primary shards of follower indices that are being bootstrapped are assigned to nodes that have the | ||
| * remote cluster client role. This is necessary as those nodes reach out to the leader shards on the remote cluster to copy Lucene segment | ||
| * files and periodically renew retention leases during the bootstrap. | ||
| */ | ||
| public final class CcrPrimaryFollowerAllocationDecider extends AllocationDecider { | ||
| static final String NAME = "ccr_primary_follower"; | ||
|
|
||
| @Override | ||
| public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, RoutingAllocation allocation) { | ||
| final IndexMetadata indexMetadata = allocation.metadata().index(shardRouting.index()); | ||
| if (CcrSettings.CCR_FOLLOWING_INDEX_SETTING.get(indexMetadata.getSettings()) == false) { | ||
| return allocation.decision(Decision.YES, NAME, "shard is not a follower and is not under the purview of this decider"); | ||
| } | ||
| if (shardRouting.primary() == false) { | ||
| return allocation.decision(Decision.YES, NAME, "shard is a replica follower and is not under the purview of this decider"); | ||
| } | ||
| final RecoverySource recoverySource = shardRouting.recoverySource(); | ||
| if (recoverySource == null || recoverySource.getType() != RecoverySource.Type.SNAPSHOT) { | ||
| return allocation.decision(Decision.YES, NAME, | ||
| "shard is a primary follower but was bootstrapped already; hence is not under the purview of this decider"); | ||
| } | ||
| if (node.node().isRemoteClusterClient() == false) { | ||
| return allocation.decision(Decision.NO, NAME, "shard is a primary follower and being bootstrapped, but node does not have the " | ||
| + DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE.roleName() + " role"); | ||
| } | ||
| return allocation.decision(Decision.YES, NAME, | ||
| "shard is a primary follower and node has the " + DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE.roleName() + " role"); | ||
| } | ||
| } |
Oops, something went wrong.