[solr] branch main updated: SOLR-15366 Add debug output

[md...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 251eb2c  SOLR-15366 Add debug output
251eb2c is described below

commit 251eb2c6e723ad75ada78a47cb6e94d35e338665
Author: Mike Drob <md...@apache.org>
AuthorDate: Thu Apr 22 16:53:51 2021 -0500

    SOLR-15366 Add debug output
---
 solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java  | 1 +
 solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
index 35ce634..9f8f2b1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
+++ b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
@@ -107,6 +107,7 @@ public class KerberosTestServices {
   private static MiniKdc getKdc(File workDir) throws Exception {
     Properties conf = MiniKdc.createConf();
     conf.setProperty("kdc.port", "0");
+    conf.setProperty("debug", "true");
     return new MiniKdc(conf, workDir);
   }
 
diff --git a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
index f1875d6..e8a5515 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
@@ -34,6 +34,7 @@ import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkACLProvider;
 import org.apache.solr.util.BadZookeeperThreadsFilter;
 import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.client.ZooKeeperSaslClient;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -85,6 +86,8 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
     System.setProperty("zkHost", zkServer.getZkAddress());
 
     try (SolrZkClient zkClient = new SolrZkClientWithACLs(zkServer.getZkHost(), AbstractZkTestCase.TIMEOUT)) {
+      ZooKeeperSaslClient saslClient = zkClient.getSolrZooKeeper().getConnection().zooKeeperSaslClient;
+      assumeFalse("Could not set up ZK with SASL", saslClient.isFailed());
       zkClient.makePath("/solr", false, true);
     }
     setupZNodes();