(solr) branch branch_9x updated: SOLR-17112 - bin/solr script doesn't do ps properly on some systems (#2225)

[ep...@apache.org]

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

epugh 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 edd07bb41f9 SOLR-17112 - bin/solr script doesn't do ps properly on some systems (#2225)
edd07bb41f9 is described below

commit edd07bb41f9e771d102f210aab4bbda0ebfbd165
Author: Vincenzo D'Amore <46...@users.noreply.github.com>
AuthorDate: Fri Jan 26 15:27:46 2024 +0100

    SOLR-17112 - bin/solr script doesn't do ps properly on some systems (#2225)
    
    ---------
    
    Co-authored-by: Eric Pugh <ep...@opensourceconnections.com>
---
 solr/CHANGES.txt | 3 ++-
 solr/bin/solr    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b15aaad4145..6095d152234 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -4,7 +4,6 @@ This file lists Solr's raw release notes with details of every change to Solr.
 Most people will find the solr-upgrade-notes.adoc file more approachable.
 https://github.com/apache/solr/blob/main/solr/solr-ref-guide/modules/upgrade-notes/pages/solr-upgrade-notes.adoc
 
-
 ==================  9.6.0 ==================
 New Features
 ---------------------
@@ -130,6 +129,8 @@ Bug Fixes
 * SOLR-17120: Fix NullPointerException in UpdateLog.applyOlderUpdates that can occur if there are multiple partial
   updates of the same document in separate requests using commitWithin. (Calvin Smith, Christine Poerschke)
 
+* SOLR-17112: bin/solr script doesn't do ps properly on some systems. (Vincenzo D'Amore via Eric Pugh)
+
 Dependency Upgrades
 ---------------------
 * SOLR-17012: Update Apache Hadoop to 3.3.6 and Apache Curator to 5.5.0 (Kevin Risden)
diff --git a/solr/bin/solr b/solr/bin/solr
index a6af5efdb7e..331c8e54461 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -771,7 +771,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 -f -p "$SOLR_PID" | grep start\.jar | grep jetty\.port)
+  SOLR_PROC=$(ps -fww -p "$SOLR_PID" | grep start\.jar | grep jetty\.port)
   IFS=' ' read -a proc_args <<< "$SOLR_PROC"
   for arg in "${proc_args[@]}"
     do