Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions changelog/unreleased/SOLR-18527.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title: >
Add a step-by-step tutorial and a bin/solr start -e secure example for configuring
a two-node SolrCloud cluster with self-signed PKCS12 certificates, HTTPS, Basic Authentication,
and ZooKeeper digest accounts and ACLs.
type: added
authors:
- name: Eric Pugh
links:
- name: SOLR-18527
url: https://issues.apache.org/jira/browse/SOLR-18527
12 changes: 12 additions & 0 deletions solr/bin/solr
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ function print_usage() {
echo " -e/--example <name> Name of the example to run; available examples:"
echo " cloud: SolrCloud example"
echo " techproducts: Comprehensive example illustrating many of Solr's core capabilities"
echo " secure: Two-node HTTPS example with Basic Authentication and ZooKeeper ACLs"
Comment thread
epugh marked this conversation as resolved.
Resolved
echo " schemaless: Schema-less example (schema is inferred from data during indexing)"
echo " films: Example of starting with _default configset and adding explicit fields dynamically"
echo ""
Expand Down Expand Up @@ -636,6 +637,17 @@ fi

# Everything below here is to support start, stop and restart.

if [[ "$SCRIPT_CMD" == "start" ]]; then
Comment thread
epugh marked this conversation as resolved.
Resolved
# This has to re-scan the raw args rather than reuse $EXAMPLE (set further below by the
# full option-parsing loop): the ulimit check right below this runs before that loop does.
for example_arg in "$@"; do
if [[ "$example_arg" == "-e" || "$example_arg" == "--example" ]]; then
Comment thread
epugh marked this conversation as resolved.
Resolved
export SOLR_ULIMIT_CHECKS=false
break
fi
done
fi

#Check current Ulimits for Open Files and Max Processes. Warn if they are below the recommended values.

: "${SOLR_RECOMMENDED_MAX_PROCESSES:=65000}"
Expand Down
Loading
Loading