You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2010/08/27 16:10:12 UTC
svn commit: r990160 - in /lucene/dev/trunk/solr: ./ src/scripts/
Author: koji
Date: Fri Aug 27 14:10:11 2010
New Revision: 990160
URL: http://svn.apache.org/viewvc?rev=990160&view=rev
Log:
SOLR-2046: add common functions to scripts-util
Removed:
lucene/dev/trunk/solr/src/scripts/readercycle
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/src/scripts/abc
lucene/dev/trunk/solr/src/scripts/abo
lucene/dev/trunk/solr/src/scripts/backup
lucene/dev/trunk/solr/src/scripts/backupcleaner
lucene/dev/trunk/solr/src/scripts/commit
lucene/dev/trunk/solr/src/scripts/optimize
lucene/dev/trunk/solr/src/scripts/rsyncd-disable
lucene/dev/trunk/solr/src/scripts/rsyncd-enable
lucene/dev/trunk/solr/src/scripts/rsyncd-start
lucene/dev/trunk/solr/src/scripts/rsyncd-stop
lucene/dev/trunk/solr/src/scripts/scripts-util
lucene/dev/trunk/solr/src/scripts/snapcleaner
lucene/dev/trunk/solr/src/scripts/snapinstaller
lucene/dev/trunk/solr/src/scripts/snappuller
lucene/dev/trunk/solr/src/scripts/snappuller-disable
lucene/dev/trunk/solr/src/scripts/snappuller-enable
lucene/dev/trunk/solr/src/scripts/snapshooter
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Aug 27 14:10:11 2010
@@ -83,6 +83,8 @@ Upgrading from Solr 1.4
backward compatible, it should be trivial to migrate as the SpellingOptions class
just encapsulates the parameters that were passed in to the methods before the change. (gsingers)
+* readercycle script was removed. (SOLR-2046)
+
Detailed Change List
----------------------
@@ -274,8 +276,9 @@ Optimizations
multi-valued fields) when facet.limit is both high, and a high enough
percentage of the number of unique terms in the field. Extreme cases
yield speedups over 3x. (yonik)
-
+* SOLR-2046: add common functions to scripts-util. (koji)
+
Bug Fixes
----------------------
Modified: lucene/dev/trunk/solr/src/scripts/abc
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/abc?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/abc (original)
+++ lucene/dev/trunk/solr/src/scripts/abc Fri Aug 27 14:10:11 2010
@@ -33,13 +33,13 @@ log=${solr_root}/logs/${prog}.log
# define usage string
USAGE="\
-usage: $prog [-h hostname] [-p port] [-d dir] [-w webappname] [-u username] [-U url] [-v] [-V]
+usage: $prog [-h hostname] [-p port] [-d dir] [-w webapp_name] [-u username] [-U url] [-v] [-V]
-h specify Solr hostname (defaults to localhost)
-p specify Solr port number
-w specify name of Solr webapp (defaults to solr)
-u specify user to sudo to before running script
-U specify full update url (overrides -h,-p,-w parameters)
- -d specify directory holding index data
+ -d specify directory holding index data (defaults to data)
-v increase verbosity
-V output debugging info
"
@@ -80,40 +80,9 @@ done
[[ -n $debug ]] && set -x
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
-
-if [[ -n ${solr_url} ]]
-then
- curl_url=${solr_url}
-else
- if [[ -z ${solr_port} ]]
- then
- echo "Solr port number missing in $confFile or command line."
- echo "$USAGE"
- exit 1
- fi
-
- # use default hostname if not specified
- if [[ -z ${solr_hostname} ]]
- then
- solr_hostname=localhost
- fi
+dataDir
- # use default webapp name if not specified
- if [[ -z ${webapp_name} ]]
- then
- webapp_name=solr
- fi
- curl_url=http://${solr_hostname}:${solr_port}/${webapp_name}/update
-fi
+curlUrl
fixUser "$@"
Modified: lucene/dev/trunk/solr/src/scripts/abo
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/abo?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/abo (original)
+++ lucene/dev/trunk/solr/src/scripts/abo Fri Aug 27 14:10:11 2010
@@ -22,7 +22,6 @@ orig_dir=$(pwd)
cd ${0%/*}/..
solr_root=$(pwd)
cd ${orig_dir}
-curl_url=""
unset solr_hostname solr_port data_dir webapp_name user verbose debug solr_url
. ${solr_root}/bin/scripts-util
@@ -80,40 +79,9 @@ done
[[ -n $debug ]] && set -x
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
-
-if [[ -n ${solr_url} ]]
-then
- curl_url=${solr_url}
-else
- if [[ -z ${solr_port} ]]
- then
- echo "Solr port number missing in $confFile or command line."
- echo "$USAGE"
- exit 1
- fi
-
- # use default hostname if not specified
- if [[ -z ${solr_hostname} ]]
- then
- solr_hostname=localhost
- fi
+dataDir
- # use default webapp name if not specified
- if [[ -z ${webapp_name} ]]
- then
- webapp_name=solr
- fi
- curl_url=http://${solr_hostname}:${solr_port}/${webapp_name}/update
-fi
+curlUrl
fixUser "$@"
@@ -175,7 +143,7 @@ trap 'echo cleaning up, please wait ...;
# make a backup using hard links into temporary location
# then move it into place atomically
-if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD"]]
+if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
then
orig_dir=$(pwd)
mkdir ${data_dir}/${temp}
Modified: lucene/dev/trunk/solr/src/scripts/backup
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/backup?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/backup (original)
+++ lucene/dev/trunk/solr/src/scripts/backup Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/${prog}.log
# define usage string
USAGE="\
-usage: $prog [-d dir] [-u username] [-v]
+usage: $prog [-d dir] [-u username] [-v] [-V]
-d specify directory holding index data
-u specify user to sudo to before running script
-v increase verbosity
@@ -62,15 +62,7 @@ done
[[ -n $debug ]] && set -x
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
+dataDir
fixUser "$@"
Modified: lucene/dev/trunk/solr/src/scripts/backupcleaner
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/backupcleaner?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/backupcleaner (original)
+++ lucene/dev/trunk/solr/src/scripts/backupcleaner Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/${prog}.log
# define usage string
USAGE="\
-usage: $prog -D <days> | -N <num> [-d dir] [-u username] [-v]
+usage: $prog -D <days> | -N <num> [-d dir] [-u username] [-v] [-V]
-D <days> cleanup backups more than <days> days old
-N <num> keep the most recent <num> number of backups and
cleanup up the remaining ones that are not being pulled
@@ -79,15 +79,7 @@ fi
fixUser "$@"
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
+dataDir
function remove
{
Modified: lucene/dev/trunk/solr/src/scripts/commit
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/commit?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/commit (original)
+++ lucene/dev/trunk/solr/src/scripts/commit Fri Aug 27 14:10:11 2010
@@ -22,7 +22,6 @@ orig_dir=$(pwd)
cd ${0%/*}/..
solr_root=$(pwd)
cd ${orig_dir}
-curl_url=""
unset solr_hostname solr_port webapp_name user verbose debug solr_url
. ${solr_root}/bin/scripts-util
@@ -76,30 +75,7 @@ done
[[ -n $debug ]] && set -x
-if [[ -n ${solr_url} ]]
-then
- curl_url=${solr_url}
-else
- if [[ -z ${solr_port} ]]
- then
- echo "Solr port number missing in $confFile or command line."
- echo "$USAGE"
- exit 1
- fi
-
- # use default hostname if not specified
- if [[ -z ${solr_hostname} ]]
- then
- solr_hostname=localhost
- fi
-
- # use default webapp name if not specified
- if [[ -z ${webapp_name} ]]
- then
- webapp_name=solr
- fi
- curl_url=http://${solr_hostname}:${solr_port}/${webapp_name}/update
-fi
+curlUrl
fixUser "$@"
Modified: lucene/dev/trunk/solr/src/scripts/optimize
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/optimize?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/optimize (original)
+++ lucene/dev/trunk/solr/src/scripts/optimize Fri Aug 27 14:10:11 2010
@@ -22,7 +22,6 @@ orig_dir=$(pwd)
cd ${0%/*}/..
solr_root=$(pwd)
cd ${orig_dir}
-curl_url=""
unset solr_hostname solr_port webapp_name user verbose debug solr_url
. ${solr_root}/bin/scripts-util
@@ -33,7 +32,7 @@ log=${solr_root}/logs/${prog}.log
# define usage string
USAGE="\
-usage: $prog [-h hostname] [-p port] [-u username] [-U url] [-v] [-V]
+usage: $prog [-h hostname] [-p port] [-w webapp_name] [-u username] [-U url] [-v] [-V]
-h specify Solr hostname (defaults to localhost)
-p specify Solr port number
-w specify name of Solr webapp (defaults to solr)
@@ -44,7 +43,6 @@ usage: $prog [-h hostname] [-p port] [-u
"
# parse args
-originalargs="$@"
while getopts h:p:w:u:U:vV OPTION
do
case $OPTION in
@@ -77,30 +75,7 @@ done
[[ -n $debug ]] && set -x
-if [[ -n ${solr_url} ]]
-then
- curl_url=${solr_url}
-else
- if [[ -z ${solr_port} ]]
- then
- echo "Solr port number missing in $confFile or command line."
- echo "$USAGE"
- exit 1
- fi
-
- # use default hostname if not specified
- if [[ -z ${solr_hostname} ]]
- then
- solr_hostname=localhost
- fi
-
- # use default webapp name if not specified
- if [[ -z ${webapp_name} ]]
- then
- webapp_name=solr
- fi
- curl_url=http://${solr_hostname}:${solr_port}/${webapp_name}/update
-fi
+curlUrl
fixUser "$@"
Modified: lucene/dev/trunk/solr/src/scripts/rsyncd-disable
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/rsyncd-disable?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/rsyncd-disable (original)
+++ lucene/dev/trunk/solr/src/scripts/rsyncd-disable Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/rsyncd.log
# define usage string
USAGE="\
-usage: $prog [-u username] [-v]
+usage: $prog [-u username] [-v] [-V]
-u specify user to sudo to before running script
-v increase verbosity
-V output debugging info
Modified: lucene/dev/trunk/solr/src/scripts/rsyncd-enable
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/rsyncd-enable?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/rsyncd-enable (original)
+++ lucene/dev/trunk/solr/src/scripts/rsyncd-enable Fri Aug 27 14:10:11 2010
@@ -30,7 +30,7 @@ log=${solr_root}/logs/rsyncd.log
# define usage string
USAGE="\
-usage: $prog [-u username] [-v]
+usage: $prog [-u username] [-v] [-V]
-u specify user to sudo to before running script
-v increase verbosity
-V output debugging info
Modified: lucene/dev/trunk/solr/src/scripts/rsyncd-start
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/rsyncd-start?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/rsyncd-start (original)
+++ lucene/dev/trunk/solr/src/scripts/rsyncd-start Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/rsyncd.log
# define usage string
USAGE="\
-usage: $prog [-d dir] [-p portnum] [-u username] [-v]
+usage: $prog [-d dir] [-p portnum] [-u username] [-v] [-V]
-d specify directory holding index data
-p specify rsyncd port number
-u specify user to sudo to before running script
@@ -82,15 +82,7 @@ then
fi
fi
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
+dataDir
logMessage started by $oldwhoami
logMessage command: $0 $@
Modified: lucene/dev/trunk/solr/src/scripts/rsyncd-stop
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/rsyncd-stop?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/rsyncd-stop (original)
+++ lucene/dev/trunk/solr/src/scripts/rsyncd-stop Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/rsyncd.log
# define usage string
USAGE="\
-usage: $prog [-u username] [-v]
+usage: $prog [-u username] [-v] [-V]
-u specify user to sudo to before running script
-v increase verbosity
-V output debugging info
Modified: lucene/dev/trunk/solr/src/scripts/scripts-util
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/scripts-util?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/scripts-util (original)
+++ lucene/dev/trunk/solr/src/scripts/scripts-util Fri Aug 27 14:10:11 2010
@@ -68,6 +68,48 @@ function timeStamp
date +'%Y/%m/%d %H:%M:%S'
}
+function curlUrl
+{
+ curl_url=""
+ if [[ -n ${solr_url} ]]
+ then
+ curl_url=${solr_url}
+ else
+ if [[ -z ${solr_port} ]]
+ then
+ echo "Solr port number missing in $confFile or command line."
+ echo "$USAGE"
+ exit 1
+ fi
+
+ # use default hostname if not specified
+ if [[ -z ${solr_hostname} ]]
+ then
+ solr_hostname=localhost
+ fi
+
+ # use default webapp name if not specified
+ if [[ -z ${webapp_name} ]]
+ then
+ webapp_name=solr
+ fi
+ curl_url=http://${solr_hostname}:${solr_port}/${webapp_name}/update
+ fi
+}
+
+function dataDir
+{
+ # use default value for data_dir if not specified
+ # relative path starts at ${solr_root}
+ if [[ -z ${data_dir} ]]
+ then
+ data_dir=${solr_root}/data
+ elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
+ then
+ data_dir=${solr_root}/${data_dir}
+ fi
+}
+
function logMessage
{
echo $(timeStamp) $@>>$log
Modified: lucene/dev/trunk/solr/src/scripts/snapcleaner
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/snapcleaner?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/snapcleaner (original)
+++ lucene/dev/trunk/solr/src/scripts/snapcleaner Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/${prog}.log
# define usage string
USAGE="\
-usage: $prog -D <days> | -N <num> [-d dir] [-u username] [-v]
+usage: $prog -D <days> | -N <num> [-d dir] [-u username] [-v] [-V]
-D <days> cleanup snapshots more than <days> days old
-N <num> keep the most recent <num> number of snapshots and
cleanup up the remaining ones that are not being pulled
@@ -79,15 +79,7 @@ fi
fixUser "$@"
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
+dataDir
function remove
{
Modified: lucene/dev/trunk/solr/src/scripts/snapinstaller
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/snapinstaller?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/snapinstaller (original)
+++ lucene/dev/trunk/solr/src/scripts/snapinstaller Fri Aug 27 14:10:11 2010
@@ -36,7 +36,7 @@ PIDFILE="${LOCKDIR}/PID"
# define usage string
USAGE="\
-usage: $prog [-M master] [-S sdir] [-d dir] [-u username] [-v]
+usage: $prog [-M master] [-S sdir] [-d dir] [-u username] [-v] [-V]
-M master specify hostname of master server from where to pull index
snapshot
-S specify directory holding snapshot status on master server
@@ -92,15 +92,7 @@ fi
fixUser "$@"
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
+dataDir
# assume relative path to start at ${solr_root}
if [[ "`echo ${master_status_dir}|cut -c1`" != "/" ]]
Modified: lucene/dev/trunk/solr/src/scripts/snappuller
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/snappuller?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/snappuller (original)
+++ lucene/dev/trunk/solr/src/scripts/snappuller Fri Aug 27 14:10:11 2010
@@ -32,7 +32,7 @@ log=${solr_root}/logs/${prog}.log
# define usage string
USAGE="\
-usage: $prog [-M master] [-P portnum] [-D mdir] [-S sdir] [-n snapshot] [-d dir] [-u username] [-svz]
+usage: $prog [-M master] [-P portnum] [-D mdir] [-S sdir] [-n snapshot] [-d dir] [-u username] [-svVz]
-M master specify hostname of master server from where to pull index
snapshot
-P port specify rsyncd port number of master server from where to
@@ -130,15 +130,7 @@ fi
fixUser "$@"
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
+dataDir
# assume relative path to start at ${solr_root}
if [[ "`echo ${master_data_dir}|cut -c1`" != "/" ]]
Modified: lucene/dev/trunk/solr/src/scripts/snappuller-disable
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/snappuller-disable?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/snappuller-disable (original)
+++ lucene/dev/trunk/solr/src/scripts/snappuller-disable Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/snappuller.log
# define usage string
USAGE="\
-usage: $prog [-u username] [-v]
+usage: $prog [-u username] [-v] [-V]
-u specify user to sudo to before running script
-v increase verbosity
-V output debugging info
Modified: lucene/dev/trunk/solr/src/scripts/snappuller-enable
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/snappuller-enable?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/snappuller-enable (original)
+++ lucene/dev/trunk/solr/src/scripts/snappuller-enable Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/snappuller.log
# define usage string
USAGE="\
-usage: $prog [-u username] [-v]
+usage: $prog [-u username] [-v] [-V]
-u specify user to sudo to before running script
-v increase verbosity
-V output debugging info
Modified: lucene/dev/trunk/solr/src/scripts/snapshooter
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/scripts/snapshooter?rev=990160&r1=990159&r2=990160&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/scripts/snapshooter (original)
+++ lucene/dev/trunk/solr/src/scripts/snapshooter Fri Aug 27 14:10:11 2010
@@ -31,7 +31,7 @@ log=${solr_root}/logs/${prog}.log
# define usage string
USAGE="\
-usage: $prog [-d dir] [-u username] [-v]
+usage: $prog [-d dir] [-u username] [-v] [-V] [-c]
-d specify directory holding index data
-u specify user to sudo to before running script
-v increase verbosity
@@ -68,15 +68,7 @@ done
fixUser "$@"
-# use default value for data_dir if not specified
-# relative path starts at ${solr_root}
-if [[ -z ${data_dir} ]]
-then
- data_dir=${solr_root}/data
-elif [[ "`echo ${data_dir}|cut -c1`" != "/" ]]
-then
- data_dir=${solr_root}/${data_dir}
-fi
+dataDir
setStartTime