Skip to content

Commit a5b0b98

Browse files
Fix TestReplicationHandler (#3142)
Addresses a combination of SOLR-17306 and SOLR-17548.
1 parent 3be16e2 commit a5b0b98

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.nio.charset.StandardCharsets;
2828
import java.nio.file.Files;
2929
import java.nio.file.Path;
30+
import java.nio.file.StandardCopyOption;
3031
import java.util.ArrayList;
3132
import java.util.Properties;
3233
import java.util.concurrent.TimeUnit;
@@ -56,7 +57,8 @@ public final class ReplicationTestHelper {
5657
public static JettySolrRunner createAndStartJetty(SolrInstance instance) throws Exception {
5758
Files.copy(
5859
Path.of(SolrTestCaseJ4.TEST_HOME(), "solr.xml"),
59-
Path.of(instance.getHomeDir(), "solr.xml"));
60+
Path.of(instance.getHomeDir(), "solr.xml"),
61+
StandardCopyOption.REPLACE_EXISTING);
6062
Properties nodeProperties = new Properties();
6163
nodeProperties.setProperty("solr.data.dir", instance.getDataDir());
6264
JettyConfig jettyConfig = JettyConfig.builder().setPort(0).build();

solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
import org.apache.solr.core.CoreContainer;
7171
import org.apache.solr.core.SolrCore;
7272
import org.apache.solr.core.StandardDirectoryFactory;
73-
import org.apache.solr.core.snapshots.SolrSnapshotMetaDataManager;
7473
import org.apache.solr.embedded.JettySolrRunner;
7574
import org.apache.solr.handler.admin.api.ReplicationAPIBase;
7675
import org.apache.solr.security.AllowListUrlChecker;
@@ -1037,8 +1036,7 @@ private int indexDirCount(String ddir) {
10371036
@Override
10381037
public boolean accept(File dir, String name) {
10391038
File f = new File(dir, name);
1040-
return f.isDirectory()
1041-
&& !SolrSnapshotMetaDataManager.SNAPSHOT_METADATA_DIR.equals(name);
1039+
return f.isDirectory() && !name.startsWith("snapshot");
10421040
}
10431041
});
10441042
return list.length;

0 commit comments

Comments
 (0)