You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2025/01/29 20:17:58 UTC
(solr) branch branch_9x updated (d48869a77d6 -> 56dde3cc542)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from d48869a77d6 SOLR-17504: Ensure DirectUpdateHandlerWithUpdateLogTest always uses updateLog
new 22706cd3d9d Fix TestReplicationHandler (#3142)
new 56dde3cc542 Remove errant 'wt'-checking for file-fetching
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/java/org/apache/solr/handler/ReplicationHandler.java | 9 ---------
.../src/test/org/apache/solr/handler/TestReplicationHandler.java | 4 +---
2 files changed, 1 insertion(+), 12 deletions(-)
(solr) 01/02: Fix TestReplicationHandler (#3142)
Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 22706cd3d9da0f6a73a3d6004f583add5a5e1992
Author: Houston Putman <ho...@apache.org>
AuthorDate: Wed Jan 29 12:45:07 2025 -0600
Fix TestReplicationHandler (#3142)
Addresses a combination of SOLR-17306 and SOLR-17548.
(cherry picked from commit a5b0b98a79559021e44d00b43fff6c020c54f829)
---
.../core/src/test/org/apache/solr/handler/TestReplicationHandler.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
index 9f622add070..49a21656ae6 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -70,7 +70,6 @@ import org.apache.solr.core.CachingDirectoryFactory;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.StandardDirectoryFactory;
-import org.apache.solr.core.snapshots.SolrSnapshotMetaDataManager;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.handler.admin.api.ReplicationAPIBase;
import org.apache.solr.security.AllowListUrlChecker;
@@ -1086,8 +1085,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {
@Override
public boolean accept(File dir, String name) {
File f = new File(dir, name);
- return f.isDirectory()
- && !SolrSnapshotMetaDataManager.SNAPSHOT_METADATA_DIR.equals(name);
+ return f.isDirectory() && !name.startsWith("snapshot");
}
});
return list.length;
(solr) 02/02: Remove errant 'wt'-checking for file-fetching
Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 56dde3cc5429562fa6d309749cf263166c6c98b8
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Wed Dec 4 12:27:59 2024 -0500
Remove errant 'wt'-checking for file-fetching
(cherry picked from commit 4510baf059f6e5e22b677f3982fa25fa81d074aa)
---
.../src/java/org/apache/solr/handler/ReplicationHandler.java | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index 4d7e4a34f22..c6a134e5cdf 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -75,7 +75,6 @@ import org.apache.solr.client.api.model.IndexVersionResponse;
import org.apache.solr.client.api.model.SolrJerseyResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
@@ -342,14 +341,6 @@ public class ReplicationHandler extends RequestHandlerBase
return;
}
- if (solrParams.getParams(CommonParams.WT) == null) {
- reportErrorOnResponse(
- rsp,
- "Missing wt parameter",
- new SolrException(SolrException.ErrorCode.BAD_REQUEST, "wt not specified in request"));
- return;
- }
-
coreReplicationAPI.fetchFile(
fileName,
dirType,