Skip to content

Correct argument names in update mapping/settings from leader #38063

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

Merged
merged 2 commits into from
Jan 31, 2019
Merged

Correct argument names in update mapping/settings from leader #38063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47535bd
Correct arg names when update mapping/settings from leader
dnhatn Jan 31, 2019
6e61dc1
Merge branch 'master' into mapping-name
dnhatn Jan 31, 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
12 changes: 6 additions & 6 deletions x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/ShardFollowNodeTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,21 @@ void start(
}

// updates follower mapping, this gets us the leader mapping version and makes sure that leader and follower mapping are identical
updateMapping(0L, followerMappingVersion -> {
updateMapping(0L, leaderMappingVersion -> {
synchronized (ShardFollowNodeTask.this) {
currentMappingVersion = followerMappingVersion;
currentMappingVersion = leaderMappingVersion;
}
updateSettings(followerSettingsVersion -> {
updateSettings(leaderSettingsVersion -> {
synchronized (ShardFollowNodeTask.this) {
currentSettingsVersion = followerSettingsVersion;
currentSettingsVersion = leaderSettingsVersion;
}
LOGGER.info(
"{} following leader shard {}, follower global checkpoint=[{}], mapping version=[{}], settings version=[{}]",
params.getFollowShardId(),
params.getLeaderShardId(),
followerGlobalCheckpoint,
followerMappingVersion,
followerSettingsVersion);
leaderMappingVersion,
leaderSettingsVersion);
coordinateReads();
});
});
Expand Down