Skip to content

[8.10] Support $ and / in ccr follow (#99892) #100294

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 1 commit into from
Oct 4, 2023
Merged

[8.10] Support $ and / in ccr follow (#99892) #100294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions docs/changelog/99892.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 99892
summary: Support $ and / in restore rename replacements
area: Snapshot/Restore
type: bug
issues:
- 99078
7 changes: 7 additions & 0 deletions ...plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,13 @@ public void testFollowNonExistentIndex() throws Exception {
);
}

public void testFollowWith$InIndexName() throws Exception {
String indexSettings = getIndexSettings(1, 0);
assertAcked(leaderClient().admin().indices().prepareCreate("test-leader$").setSource(indexSettings, XContentType.JSON).get());
followerClient().execute(PutFollowAction.INSTANCE, putFollow("test-leader$", "test-follower$")).actionGet();
ensureFollowerGreen("test-follower$");
}

public void testFollowIndexMaxOperationSizeInBytes() throws Exception {
final String leaderIndexSettings = getIndexSettings(1, between(0, 1));
assertAcked(leaderClient().admin().indices().prepareCreate("index1").setSource(leaderIndexSettings, XContentType.JSON));
Expand Down
3 changes: 2 additions & 1 deletion ...plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutFollowAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.function.BiConsumer;
import java.util.regex.Matcher;
import java.util.stream.Collectors;

import static org.elasticsearch.cluster.metadata.DataStream.BACKING_INDEX_PREFIX;
Expand Down Expand Up @@ -185,7 +186,7 @@ private void createFollowerIndex(
)
.indicesOptions(request.indicesOptions())
.renamePattern("^(.*)$")
.renameReplacement(request.getFollowerIndex())
.renameReplacement(Matcher.quoteReplacement(request.getFollowerIndex()))
.masterNodeTimeout(request.masterNodeTimeout())
.indexSettings(overrideSettings)
.quiet(true);
Expand Down