You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/19 00:13:36 UTC
[15/50] [abbrv] lucene-solr:jira/solr-10233: SOLR-10223: Allow
running examples as root on Linux with -force option
SOLR-10223: Allow running examples as root on Linux with -force option
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b5aa0da6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b5aa0da6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b5aa0da6
Branch: refs/heads/jira/solr-10233
Commit: b5aa0da6ff56da40df42853564b1c3404cd29444
Parents: 318e546
Author: Jan Høydahl <ja...@apache.org>
Authored: Thu May 18 11:26:19 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Thu May 18 11:26:19 2017 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/bin/solr | 1 +
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 9 +++++++--
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5aa0da6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b1584ee..92e8d8d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -115,6 +115,8 @@ Bug Fixes
* SOLR-10413: v2 API: parsed JSON type should be coerced to expected type (Cao Manh Dat, Noble Paul)
+* SOLR-10223: Allow running examples as root on Linux with -force option (janhoy)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5aa0da6/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 621ac96..b7bf142 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1469,6 +1469,7 @@ if [ $# -gt 0 ]; then
;;
-force)
FORCE=true
+ PASS_TO_RUN_EXAMPLE+=" -force"
shift
;;
--)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b5aa0da6/solr/core/src/java/org/apache/solr/util/SolrCLI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index 833e3b4..97fdf1e 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2550,6 +2550,10 @@ public class SolrCLI {
.withLongOpt("serverDir")
.create('d'),
OptionBuilder
+ .withArgName("FORCE")
+ .withDescription("Force option in case Solr is run as root")
+ .create("force"),
+ OptionBuilder
.withArgName("DIR")
.hasArg()
.isRequired(false)
@@ -2918,6 +2922,7 @@ public class SolrCLI {
String zkHostArg = (zkHost != null) ? " -z "+zkHost : "";
String memArg = (memory != null) ? " -m "+memory : "";
String cloudModeArg = cloudMode ? "-cloud " : "";
+ String forceArg = cli.hasOption("force") ? " -force" : "";
String addlOpts = cli.getOptionValue('a');
String addlOptsArg = (addlOpts != null) ? " -a \""+addlOpts+"\"" : "";
@@ -2936,8 +2941,8 @@ public class SolrCLI {
solrHome = solrHome.substring(cwdPath.length()+1);
String startCmd =
- String.format(Locale.ROOT, "%s start %s -p %d -s \"%s\" %s %s %s %s %s",
- callScript, cloudModeArg, port, solrHome, hostArg, zkHostArg, memArg, extraArgs, addlOptsArg);
+ String.format(Locale.ROOT, "%s start %s -p %d -s \"%s\" %s %s %s %s %s %s",
+ callScript, cloudModeArg, port, solrHome, hostArg, zkHostArg, memArg, forceArg, extraArgs, addlOptsArg);
startCmd = startCmd.replaceAll("\\s+", " ").trim(); // for pretty printing
echo("\nStarting up Solr on port " + port + " using command:");