(solr) branch branch_9x updated: fix MoveReplicaHdfsFailoverTest after SOLR-16962 (#2525)

[magibney]

This is an automated email from the ASF dual-hosted git repository.

magibney pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 1e6e6c7774e fix MoveReplicaHdfsFailoverTest after SOLR-16962 (#2525)
1e6e6c7774e is described below

commit 1e6e6c7774e681bfc1d1455932413247f17dccb7
Author: Michael Gibney <mich...@michaelgibney.net>
AuthorDate: Wed Jun 19 07:22:02 2024 -0400

    fix MoveReplicaHdfsFailoverTest after SOLR-16962 (#2525)
    
    the changes made by SOLR-16962 to ZkController and MoveReplicaCmd
    resolve the conflation of ulog and tlog dir, and remove some
    related hacky compensations for this conflation. The nightly test
    MoveReplicaHdfsFailoverTest was still compensating for this issue
    when it no longer needs to, and was thus failing.
    
    (cherry picked from commit 4a12f8a4b58eb01e59bd8b50b44912aa3167b6d0)
---
 .../src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java
 
b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java
index d6500b3f87e..f80f3242130 100644
--- 
a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java
+++ 
b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/MoveReplicaHdfsFailoverTest.java
@@ -91,7 +91,6 @@ public class MoveReplicaHdfsFailoverTest extends 
SolrCloudTestCase {
             .setNode(cluster.getJettySolrRunner(0).getNodeName())
             .process(cluster.getSolrClient());
 
-    ulogDir += "/tlog";
     ZkStateReader zkStateReader = cluster.getZkStateReader();
     assertTrue(ClusterStateUtil.waitForAllActiveAndLiveReplicas(zkStateReader, 
120000));