janhoy commented on code in PR #5347: URL: https://github.com/apache/solr/pull/5347#discussion_r4576052726
########## solr/core/src/test/org/apache/solr/cloud/SolrZkServerTest.java: ########## @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.cloud; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import org.apache.solr.SolrTestCase; +import org.apache.solr.common.SolrException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** Tests how the embedded ZooKeeper picks its client port. */ +public class SolrZkServerTest extends SolrTestCase { + + private static final String ZOO_CFG = + """ + tickTime=2000 + initLimit=10 + syncLimit=5 + """; + + private Path confHome; + + @Before + public void createConfHome() throws Exception { + confHome = createTempDir("zkConf"); + } + + @After + public void clearEmbeddedZkPort() { + System.clearProperty(SolrZkServer.EMBEDDED_ZK_PORT_PROPERTY); Review Comment: 🤖 Removed — SolrTestCase wraps each test in a SystemPropertiesRestoreRule, so the @After was redundant. ########## solr/bin/solr: ########## @@ -391,6 +391,7 @@ function print_usage() { echo " -z/--zk-host <zkHost> Zookeeper connection string; ignored when running in User Managed (--user-managed) mode." echo " If neither ZK_HOST is defined in solr.in.sh nor the -z parameter is specified," echo " an embedded ZooKeeper instance will be launched." + echo " It listens on SOLR_ZOOKEEPER_EMBEDDED_PORT if set, else the Solr port + 1000." Review Comment: 🤖 Yes, done. StartCommand -z said "embedded ZooKeeper on PORT+10000", which was never right, so it now names the setting with the same wording as the shell help, and the --fullhelp text matches too. Regenerated the two CLI doc pages that changed (solr-start, solr-restart; RestartCommand extends StartCommand) and left the other 40 alone. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
