Update of /cvsroot/fink/pdb/solr/solr/bin
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14014/solr/solr/bin
Modified Files:
abc abo backup backupcleaner commit optimize readercycle
rsyncd-disable rsyncd-enable rsyncd-start scripts-util
snapcleaner snapinstaller snappuller snappuller-disable
snappuller-enable snapshooter
Log Message:
pdb updates of various kinds
Index: readercycle
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/readercycle,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- readercycle 28 Nov 2007 03:25:46 -0000 1.1
+++ readercycle 19 Mar 2009 16:41:47 -0000 1.2
@@ -104,7 +104,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
Index: abc
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/abc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- abc 28 Nov 2007 03:25:46 -0000 1.1
+++ abc 19 Mar 2009 16:41:47 -0000 1.2
@@ -117,7 +117,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -131,13 +131,18 @@
logExit failed 1
fi
-# check status of commit request
+# check status of commit request - original format
echo $rs | grep '<result.*status="0"' > /dev/null 2>&1
if [[ $? != 0 ]]
then
- logMessage commit request to Solr at ${curl_url} failed:
- logMessage $rs
- logExit failed 2
+# check status of commit request - new format
+ echo $rs | grep '<lst name="responseHeader"><int name="status">0</int>' >
/dev/null 2>&1
+ if [[ $? != 0 ]]
+ then
+ logMessage commit request to Solr at ${curl_url} failed:
+ logMessage $rs
+ logExit failed 2
+ fi
fi
# successful commit creates a snapshot file synchronously
@@ -170,7 +175,16 @@
# make a backup using hard links into temporary location
# then move it into place atomically
-cp -lr ${lastsnap} ${data_dir}/${temp}
+if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
+ cd ${lastsnap}
+ find . -print|cpio -pdlmu ${data_dir}/${temp} 1>/dev/null 2>&1
+ cd ${orig_dir}
+else
+ cp -lr ${lastsnap} ${data_dir}/${temp}
+fi
mv ${data_dir}/${temp} ${data_dir}/${name}
logExit ended 0
Index: backupcleaner
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/backupcleaner,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- backupcleaner 28 Nov 2007 03:25:46 -0000 1.1
+++ backupcleaner 19 Mar 2009 16:41:47 -0000 1.2
@@ -95,7 +95,7 @@
/bin/rm -rf $1
}
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
Index: snapcleaner
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/snapcleaner,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snapcleaner 28 Nov 2007 03:25:47 -0000 1.1
+++ snapcleaner 19 Mar 2009 16:41:47 -0000 1.2
@@ -91,7 +91,13 @@
function remove
{
- syncing=`ps -fwwwu ${user}|grep -w rsync|grep -v grep|grep -w $1`
+ if [[ "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+ then
+ syncing=`ps -www -U ${user} |grep -w rsync|grep -v grep|grep -w $1`
+ else
+ syncing=`ps -fwwwu ${user}|grep -w rsync|grep -v grep|grep -w $1`
+ fi
+
if [[ -n $syncing ]]
then
logMessage $1 not removed - rsync in progress
@@ -101,7 +107,7 @@
fi
}
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
Index: snappuller-enable
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/snappuller-enable,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snappuller-enable 28 Nov 2007 03:25:47 -0000 1.1
+++ snappuller-enable 19 Mar 2009 16:41:47 -0000 1.2
@@ -60,7 +60,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage enabled by $oldwhoami
logMessage command: $0 $@
Index: snapshooter
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/snapshooter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snapshooter 28 Nov 2007 03:25:48 -0000 1.1
+++ snapshooter 19 Mar 2009 16:41:47 -0000 1.2
@@ -36,10 +36,11 @@
-u specify user to sudo to before running script
-v increase verbosity
-V output debugging info
+ -c only take snapshot if different than previous
"
# parse args
-while getopts d:u:vV OPTION
+while getopts d:u:vVc OPTION
do
case $OPTION in
d)
@@ -54,6 +55,9 @@
V)
debug="V"
;;
+ c)
+ check=1
+ ;;
*)
echo "$USAGE"
exit 1
@@ -74,7 +78,7 @@
data_dir=${solr_root}/${data_dir}
fi
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -95,6 +99,20 @@
logExit aborted 1
fi
+if [[ ${check} ]]
+then
+ previous=`find ${data_dir} -name snapshot.\* | sort -r | head -1`
+ if [[ -d ${previous} ]]
+ then
+ differences=`diff -q ${data_dir}/index ${previous} | wc -l`
+ if [[ ${differences} -lt 1 ]]
+ then
+ logMessage Snap would be same as last, exiting
+ logExit aborted 1
+ fi
+ fi
+fi
+
# clean up after INT/TERM
trap 'echo cleaning up, please wait ...;/bin/rm -rf ${name} ${temp};logExit
aborted 13' INT TERM
@@ -102,7 +120,16 @@
# take a snapshot using hard links into temporary location
# then move it into place atomically
-cp -lr ${data_dir}/index ${temp}
+if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+then
+ orig_dir=$(pwd)
+ mkdir ${temp}
+ cd ${data_dir}/index
+ find . -print|cpio -pdlmu ${temp} 1>/dev/null 2>&1
+ cd ${orig_dir}
+else
+ cp -lr ${data_dir}/index ${temp}
+fi
mv ${temp} ${name}
logExit ended 0
Index: optimize
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/optimize,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- optimize 28 Nov 2007 03:25:46 -0000 1.1
+++ optimize 19 Mar 2009 16:41:47 -0000 1.2
@@ -104,7 +104,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -117,13 +117,18 @@
logExit failed 1
fi
-# check status of optimize request
+# check status of optimize request - original format
rc=`echo $rs|cut -f2 -d'"'`
if [[ $? != 0 ]]
then
- logMessage optimize request to Solr at ${curl_url} failed:
- logMessage $rs
- logExit failed 2
+# check status of optimize request - new format
+ echo $rs | grep '<lst name="responseHeader"><int name="status">0</int>' >
/dev/null 2>&1
+ if [[ $? != 0 ]]
+ then
+ logMessage optimize request to Solr at ${curl_url} failed:
+ logMessage $rs
+ logExit failed 2
+ fi
fi
logExit ended 0
Index: snapinstaller
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/snapinstaller,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snapinstaller 28 Nov 2007 03:25:47 -0000 1.1
+++ snapinstaller 19 Mar 2009 16:41:47 -0000 1.2
@@ -104,7 +104,7 @@
master_status_dir=${solr_root}/${master_status_dir}
fi
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -141,9 +141,20 @@
# install using hard links into temporary directory
# remove original index and then atomically copy new one into place
logMessage installing snapshot ${name}
-cp -lr ${name}/ ${data_dir}/index.tmp$$
-/bin/rm -rf ${data_dir}/index
-mv -f ${data_dir}/index.tmp$$ ${data_dir}/index
+if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/index.tmp$$ && \
+ cd ${name} && \
+ find . -print|cpio -pdlmu ${data_dir}/index.tmp$$ 1>/dev/null 2>&1 && \
+ /bin/rm -rf ${data_dir}/index && \
+ mv -f ${data_dir}/index.tmp$$ ${data_dir}/index
+ cd ${orig_dir}
+else
+ cp -lr ${name}/ ${data_dir}/index.tmp$$ && \
+ /bin/rm -rf ${data_dir}/index && \
+ mv -f ${data_dir}/index.tmp$$ ${data_dir}/index
+fi
# update distribution stats
echo ${name} > ${solr_root}/logs/snapshot.current
Index: snappuller
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/snappuller,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snappuller 28 Nov 2007 03:25:47 -0000 1.1
+++ snappuller 19 Mar 2009 16:41:47 -0000 1.2
@@ -156,7 +156,7 @@
scp -q -o StrictHostKeyChecking=no ${solr_root}/logs/snappuller.status
${master_host}:${master_status_dir}/snapshot.status.`uname -n`
}
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -164,7 +164,7 @@
if [[ ! -f ${solr_root}/logs/snappuller-enabled ]]
then
logMessage snappuller disabled
- exit 1
+ exit 2
fi
# make sure we can ssh to master
@@ -200,7 +200,16 @@
# take a snapshot of current index so that only modified files will be rsync-ed
# put the snapshot in the 'work-in-progress" directory to prevent it from
# being installed while the copying is still in progress
-cp -lr ${data_dir}/index ${data_dir}/${name}-wip
+if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${name}-wip
+ cd ${data_dir}/index
+ find . -print|cpio -pdlmu ${data_dir}/${name}-wip 1>/dev/null 2>&1
+ cd ${orig_dir}
+else
+ cp -lr ${data_dir}/index ${data_dir}/${name}-wip
+fi
# force rsync of segments and .del files since we are doing size-only
if [[ -n ${sizeonly} ]]
then
@@ -214,9 +223,15 @@
ssh -o StrictHostKeyChecking=no ${master_host} mkdir -p ${master_status_dir}
# start new distribution stats
-rsyncStart=`date`
+rsyncStart=`date +'%Y-%m-%d %H:%M:%S'`
+if [[ "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+then
+ startTimestamp=`date -j -f '%Y-%m-%d %H:%M:%S' "$rsyncStart"
+'%Y%m%d-%H%M%S'`
+ rsyncStartSec=`date -j -f '%Y-%m-%d %H:%M:%S' "$rsyncStart" +'%s'`
+else
startTimestamp=`date -d "$rsyncStart" +'%Y%m%d-%H%M%S'`
rsyncStartSec=`date -d "$rsyncStart" +'%s'`
+fi
startStatus="rsync of `basename ${name}` started:$startTimestamp"
echo ${startStatus} > ${solr_root}/logs/snappuller.status
pushStatus
@@ -226,9 +241,15 @@
${stats} rsync://${master_host}:${rsyncd_port}/solr/${name}/
${data_dir}/${name}-wip
rc=$?
-rsyncEnd=`date`
+rsyncEnd=`date +'%Y-%m-%d %H:%M:%S'`
+if [[ "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+then
+ endTimestamp=`date -j -f '%Y-%m-%d %H:%M:%S' "$rsyncEnd" +'%Y%m%d-%H%M%S'`
+ rsyncEndSec=`date -j -f '%Y-%m-%d %H:%M:%S' "$rsyncEnd" +'%s'`
+else
endTimestamp=`date -d "$rsyncEnd" +'%Y%m%d-%H%M%S'`
rsyncEndSec=`date -d "$rsyncEnd" +'%s'`
+fi
elapsed=`expr $rsyncEndSec - $rsyncStartSec`
if [[ $rc != 0 ]]
then
Index: snappuller-disable
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/snappuller-disable,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snappuller-disable 28 Nov 2007 03:25:47 -0000 1.1
+++ snappuller-disable 19 Mar 2009 16:41:47 -0000 1.2
@@ -60,7 +60,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage disabled by $oldwhoami
logMessage command: $0 $@
Index: rsyncd-disable
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/rsyncd-disable,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rsyncd-disable 28 Nov 2007 03:25:46 -0000 1.1
+++ rsyncd-disable 19 Mar 2009 16:41:47 -0000 1.2
@@ -60,7 +60,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage disabled by $oldwhoami
logMessage command: $0 $@
Index: commit
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/commit,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- commit 28 Nov 2007 03:25:46 -0000 1.1
+++ commit 19 Mar 2009 16:41:47 -0000 1.2
@@ -103,7 +103,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -116,13 +116,18 @@
logExit failed 1
fi
-# check status of commit request
+# check status of commit request - original format
echo $rs | grep '<result.*status="0"' > /dev/null 2>&1
if [[ $? != 0 ]]
then
- logMessage commit request to Solr at ${curl_url} failed:
- logMessage $rs
- logExit failed 2
+# check status of commit request - new format
+ echo $rs | grep '<lst name="responseHeader"><int name="status">0</int>' >
/dev/null 2>&1
+ if [[ $? != 0 ]]
+ then
+ logMessage commit request to Solr at ${curl_url} failed:
+ logMessage $rs
+ logExit failed 2
+ fi
fi
logExit ended 0
Index: rsyncd-start
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/rsyncd-start,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rsyncd-start 28 Nov 2007 03:25:47 -0000 1.1
+++ rsyncd-start 19 Mar 2009 16:41:47 -0000 1.2
@@ -98,7 +98,7 @@
if [[ ! -f ${solr_root}/logs/rsyncd-enabled ]]
then
logMessage rsyncd disabled
- exit 1
+ exit 2
fi
if \
Index: abo
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/abo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- abo 28 Nov 2007 03:25:46 -0000 1.1
+++ abo 19 Mar 2009 16:41:47 -0000 1.2
@@ -117,7 +117,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -131,13 +131,18 @@
logExit failed 1
fi
-# check status of optimize request
+# check status of optimize request - original format
echo $rs | grep '<result.*status="0"' > /dev/null 2>&1
if [[ $? != 0 ]]
then
- logMessage optimize request to Solr at ${curl_url} failed:
- logMessage $rs
- logExit failed 2
+# check status of optimize request - new format
+ echo $rs | grep '<lst name="responseHeader"><int name="status">0</int>' >
/dev/null 2>&1
+ if [[ $? != 0 ]]
+ then
+ logMessage optimize request to Solr at ${curl_url} failed:
+ logMessage $rs
+ logExit failed 2
+ fi
fi
# successful optimize creates a snapshot file synchronously
@@ -170,7 +175,16 @@
# make a backup using hard links into temporary location
# then move it into place atomically
-cp -lr ${lastsnap} ${data_dir}/${temp}
+if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD"]]
+then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
+ cd ${lastsnap}
+ find . -print|cpio -pdlmu ${data_dir}/${temp} 1>/dev/null 2>&1
+ cd ${orig_dir}
+else
+ cp -lr ${lastsnap} ${data_dir}/${temp}
+fi
mv ${data_dir}/${temp} ${data_dir}/${name}
logExit ended 0
Index: backup
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/backup,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- backup 28 Nov 2007 03:25:46 -0000 1.1
+++ backup 19 Mar 2009 16:41:47 -0000 1.2
@@ -74,7 +74,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage started by $oldwhoami
logMessage command: $0 $@
@@ -101,7 +101,16 @@
# make a backup using hard links into temporary location
# then move it into place atomically
-cp -lr ${data_dir}/index ${data_dir}/${temp}
+if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
+ cd ${data_dir}/index
+ find . -print|cpio -pdlmu ${data_dir}/${temp} 1>/dev/null 2>&1
+ cd ${orig_dir}
+else
+ cp -lr ${data_dir}/index ${data_dir}/${temp}
+fi
mv ${data_dir}/${temp} ${data_dir}/${name}
logExit ended 0
Index: scripts-util
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/scripts-util,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scripts-util 28 Nov 2007 03:25:47 -0000 1.1
+++ scripts-util 19 Mar 2009 16:41:47 -0000 1.2
@@ -21,6 +21,7 @@
# set up variables
prog=${0##*/}
+OS=`uname`
# source the config file if present
confFile=${solr_root}/conf/scripts.conf
@@ -48,7 +49,17 @@
if [[ "${oldwhoami}" == "" ]]
then
- oldwhoami=`ps h -Hfp $(pgrep -g0 ${0##*/}) | tail -1|cut -f1 -d" "`
+ oldwhoami=`ps h -Hfp $(pgrep -f -g0 $0) | tail -1|cut -f1 -d" "`
+ fi
+}
+
+function setStartTime
+{
+ if [[ "${OS}" == "SunOS" ]]
+ then
+ start=`perl -e "print time;"`
+ else
+ start=`date +"%s"`
fi
}
@@ -68,7 +79,12 @@
function logExit
{
- end=`date +"%s"`
+ if [[ "${OS}" == "SunOS" ]]
+ then
+ end=`perl -e "print time;"`
+ else
+ end=`date +"%s"`
+ fi
diff=`expr $end - $start`
echo "$(timeStamp) $1 (elapsed time: $diff sec)">>$log
exit $2
Index: rsyncd-enable
===================================================================
RCS file: /cvsroot/fink/pdb/solr/solr/bin/rsyncd-enable,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rsyncd-enable 28 Nov 2007 03:25:46 -0000 1.1
+++ rsyncd-enable 19 Mar 2009 16:41:47 -0000 1.2
@@ -59,7 +59,7 @@
fixUser "$@"
-start=`date +"%s"`
+setStartTime
logMessage enabled by $oldwhoami
logMessage command: $0 $@
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
