Skip to content

Commit 6ec39f8

Browse files
committed
Correct arg names when update mapping/settings from leader (elastic#38063)
These two arguments are not named incorrectly and caused confusion.
1 parent aebf197 commit 6ec39f8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,21 +133,21 @@ void start(
133133
}
134134

135135
// updates follower mapping, this gets us the leader mapping version and makes sure that leader and follower mapping are identical
136-
updateMapping(0L, followerMappingVersion -> {
136+
updateMapping(0L, leaderMappingVersion -> {
137137
synchronized (ShardFollowNodeTask.this) {
138-
currentMappingVersion = followerMappingVersion;
138+
currentMappingVersion = leaderMappingVersion;
139139
}
140-
updateSettings(followerSettingsVersion -> {
140+
updateSettings(leaderSettingsVersion -> {
141141
synchronized (ShardFollowNodeTask.this) {
142-
currentSettingsVersion = followerSettingsVersion;
142+
currentSettingsVersion = leaderSettingsVersion;
143143
}
144144
LOGGER.info(
145145
"{} following leader shard {}, follower global checkpoint=[{}], mapping version=[{}], settings version=[{}]",
146146
params.getFollowShardId(),
147147
params.getLeaderShardId(),
148148
followerGlobalCheckpoint,
149-
followerMappingVersion,
150-
followerSettingsVersion);
149+
leaderMappingVersion,
150+
leaderSettingsVersion);
151151
coordinateReads();
152152
});
153153
});

0 commit comments

Comments
 (0)