Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sequence number based replica allocation #46959

Merged
merged 14 commits into from
Oct 13, 2019
Merged

Sequence number based replica allocation #46959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
01f39cf
Sequence number based replica allocation
dnhatn Sep 22, 2019
13bb82b
Merge branch 'master' into replica-allocator
dnhatn Sep 30, 2019
17bfb34
feedback
dnhatn Sep 30, 2019
8c88b82
test name
dnhatn Oct 1, 2019
577ee74
Merge branch 'master' into replica-allocator
dnhatn Oct 9, 2019
a967456
yannick’s comments
dnhatn Oct 9, 2019
4562ab8
henning’s comments
dnhatn Oct 9, 2019
2ff795f
use persistent settings
dnhatn Oct 10, 2019
60c1a0d
Merge branch 'master' into replica-allocator
dnhatn Oct 10, 2019
2d78141
grammar :)
dnhatn Oct 10, 2019
d79e9c6
Merge branch 'master' into replica-allocator
dnhatn Oct 12, 2019
c744a76
retainingSeqNoForPrimary >= 0
dnhatn Oct 12, 2019
a299c0f
add test that prefers copy with highest matching operations
dnhatn Oct 12, 2019
dc7fb14
do not check for empty store again
dnhatn Oct 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test name
  • Loading branch information
@dnhatn
dnhatn committed Oct 1, 2019
commit 8c88b825bfd9f9b7bfeb6e62f956813ae6b97e9c
5 changes: 2 additions & 3 deletions server/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public void testFullClusterRestartPerformNoopRecovery() throws Exception {
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
.put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), randomIntBetween(10, 100) + "kb")
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, numOfReplicas)
.put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), randomIntBetween(5, 10) * 0.1)
.put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 0.5)
.put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms")
.put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms")));
ensureGreen(indexName);
Expand All @@ -229,8 +229,7 @@ public void testFullClusterRestartPerformNoopRecovery() throws Exception {
assertAcked(client().admin().cluster().prepareUpdateSettings()
.setTransientSettings(Settings.builder().put("cluster.routing.allocation.enable", "primaries").build()));
internalCluster().fullRestart();
// need to wait for events to ensure the reroute has happened since we perform it async when a new node joins.
client().admin().cluster().prepareHealth(indexName).setWaitForYellowStatus().setWaitForEvents(Priority.LANGUID).get();
ensureYellow(indexName);
assertAcked(client().admin().cluster().prepareUpdateSettings()
.setTransientSettings(Settings.builder().putNull("cluster.routing.allocation.enable").build()));
ensureGreen(indexName);
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public void testCancelRecoveryIfFoundCopyWithRetentionLease() {
assertThat(allocation.routingNodes().shardsWithState(ShardRoutingState.UNASSIGNED).get(0).shardId(), equalTo(shardId));
}

public void testNotCancellingRecoveryIfRetentionLeaseExistingRecovery() {
public void testNotCancellingRecoveryIfCurrentRecoveryHasRetentionLease() {
RoutingAllocation allocation = onePrimaryOnNode1And1ReplicaRecovering(yesAllocationDeciders());
List<RetentionLease> peerRecoveryRetentionLeasesOnPrimary = new ArrayList<>();
long retainingSeqNo = randomLongBetween(1, Long.MAX_VALUE);
Expand Down