lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [06/39] lucene-solr:jira/solr-11779: SOLR-12192: Error when ulimit is unlimited
Date Tue, 15 May 2018 20:04:23 GMT
SOLR-12192: Error when ulimit is unlimited


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/abb57c5c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/abb57c5c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/abb57c5c

Branch: refs/heads/jira/solr-11779
Commit: abb57c5c8166b25e8e26e3bde714d80f00b5cf27
Parents: 85c00e7
Author: Erick Erickson <erick@apache.org>
Authored: Tue May 8 09:54:40 2018 -0700
Committer: Erick Erickson <erick@apache.org>
Committed: Tue May 8 09:54:40 2018 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt | 2 ++
 solr/bin/solr    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abb57c5c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8b443f7..5e56af0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -223,6 +223,8 @@ Bug Fixes
   MiniSolrCloudCluster.deleteAllCollections will now first delete aliases since a collection
cannot be deleted if an
   alias refers to it.  (David Smiley)
 
+* SOLR-12192: Fixed a solr cli error message when ulimits are unlimited. (Martijn Koster)
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abb57c5c/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 68d1140..53cf84d 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1455,13 +1455,13 @@ if [ -z "$SOLR_ULIMIT_CHECKS" ] || [ "$SOLR_ULIMIT_CHECKS" != "false"
]; then
     if hash ulimit 2>/dev/null; then
        openFiles=$(ulimit -n)
        maxProcs=$(ulimit -u)
-       if [ $openFiles -lt "$SOLR_RECOMMENDED_OPEN_FILES" ]; then
+       if [ $openFiles != "unlimited" ] && [ $openFiles -lt "$SOLR_RECOMMENDED_OPEN_FILES"
]; then
            echo "*** [WARN] *** Your open file limit is currently $openFiles.  "
            echo " It should be set to $SOLR_RECOMMENDED_OPEN_FILES to avoid operational disruption.
"
            echo " If you no longer wish to see this warning, set SOLR_ULIMIT_CHECKS to false
in your profile or solr.in.sh"
        fi
 
-       if [ $maxProcs -lt "$SOLR_RECOMMENDED_MAX_PROCESSES" ]; then
+       if [ $maxProcs != "unlimited" ] && [ $maxProcs -lt "$SOLR_RECOMMENDED_MAX_PROCESSES"
]; then
            echo "*** [WARN] ***  Your Max Processes Limit is currently $maxProcs. "
            echo " It should be set to $SOLR_RECOMMENDED_MAX_PROCESSES to avoid operational
disruption. "
            echo " If you no longer wish to see this warning, set SOLR_ULIMIT_CHECKS to false
in your profile or solr.in.sh"


Mime
View raw message