Merge remote-tracking branch 'upstream/main' into pr/2907

apache · Dec 19, 2024 · b4937aa · b4937aa
2 parents 4e43fed + 61609b1
commit b4937aa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -273,6 +273,9 @@ Bug Fixes
 
 * SOLR-17574: Fix AllowListUrlChecker when liveNodes changes. Remove ClusterState.getHostAllowList (Bruno Roustant, David Smiley)
 
+* SOLR-17595: Fix two issues in Solr CLI that prevent Solr from starting with the techproducts example and from
+  correctly parsing arguments on Windows that start with -D and have multiple values separated by "," or spaces. (Christos Malliaridis)
+
 Dependency Upgrades
 ---------------------
 (No changes)

diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
@@ -665,7 +665,6 @@ goto repeat_passthru
 
 :end_passthru
 set "PASSTHRU=%PASSTHRU_KEY%=%PASSTHRU_VALUES%"
-echo "Passing through %PASSTHRU%"
 
 IF NOT "%SOLR_OPTS%"=="" (
   set "SOLR_OPTS=%SOLR_OPTS% %PASSTHRU%"
@@ -861,8 +860,7 @@ IF NOT EXIST "%SOLR_HOME%\" (
   )
 )
 
-@REM This is quite hacky, but examples rely on a different log4j2.xml
-@REM so that we can write logs for examples to %SOLR_HOME%\..\logs
+@REM Handle overriding where logs are written to
 IF [%SOLR_LOGS_DIR%] == [] (
   set "SOLR_LOGS_DIR=%SOLR_SERVER_DIR%\logs"
 ) ELSE (

diff --git a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
@@ -352,7 +352,9 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
               collectionName,
               "--type",
               "application/xml",
-              exampledocsDir.toAbsolutePath() + "/*.xml"
+              "--filetypes",
+              "xml",
+              exampledocsDir.toAbsolutePath().toString()
             };
         PostTool postTool = new PostTool();
         CommandLine postToolCli = SolrCLI.parseCmdLine(postTool, args);

diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -1517,12 +1517,11 @@ private Long readIntervalNs(String interval) {
 
   public static final String FETCH_FROM_LEADER = "fetchFromLeader";
 
-  // in case of TLOG replica, if leaderVersion = zero, don't do commit
-  // otherwise updates from current tlog won't be copied over properly to the new tlog, leading to
-  // data
-  // loss
-  // don't commit on leader version zero for PULL replicas as PULL should only get its index
-  // state from leader
+  // In case of TLOG replica, if leaderVersion = zero, don't do commit
+  // otherwise updates from current tlog won't be copied over properly to the new tlog,
+  // leading to data loss.
+  // Don't commit on leader version zero for PULL replicas as PULL should only get its index
+  // state from leader.
   public static final String SKIP_COMMIT_ON_LEADER_VERSION_ZERO = "skipCommitOnLeaderVersionZero";
 
   public static final String MESSAGE = "message";