[lucene-solr] branch branch_8_11 updated: SOLR-16191: Fix backport issues

[md...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch_8_11 by this push:
     new 97ff472bb29 SOLR-16191: Fix backport issues
97ff472bb29 is described below

commit 97ff472bb29ec4acc7c35d5e95355f40434c4b43
Author: Mike Drob <md...@apache.org>
AuthorDate: Sun Jun 12 14:51:59 2022 -0500

    SOLR-16191: Fix backport issues
---
 solr/bin/solr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index 3caa22f4c1d..bb53a8b17dc 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -720,7 +720,7 @@ function solr_pid_by_port() {
 # extract the value of the -Djetty.port parameter from a running Solr process
 function jetty_port() {
   SOLR_PID="$1"
-  SOLR_PROC=`ps auxww | grep -w $SOLR_PID | grep start\.jar | grep jetty\.port`
+  SOLR_PROC=`ps -o command='' -p "$SOLR_PID" | grep start\.jar | grep jetty\.port`
   IFS=' ' read -a proc_args <<< "$SOLR_PROC"
   for arg in "${proc_args[@]}"
     do
@@ -1938,7 +1938,7 @@ if [[ "$SCRIPT_CMD" == "start" ]]; then
 
   if [ -z "$SOLR_PID" ]; then
     # not found using the pid file ... but use ps to ensure not found
-    SOLR_PROC=`ps -o command='' -p "$SOLR_PID" | grep start\.jar | grep jetty\.port`
+    SOLR_PID=`ps auxww | grep start\.jar | awk "/\-Djetty\.port=$SOLR_PORT/"' {print $2}' | sort -r`
   fi
 
   if [ "$SOLR_PID" != "" ]; then