svn commit: r529471 - in /lucene/solr/trunk: CHANGES.txt src/scripts/backupcleaner src/scripts/snapcleaner src/scripts/snapinstaller src/scripts/snappuller

[yo...@apache.org]

Author: yonik
Date: Mon Apr 16 19:25:28 2007
New Revision: 529471

URL: http://svn.apache.org/viewvc?view=rev&rev=529471
Log:
avoid recursive find, test for maxdepth support, filter snapshot names on master: SOLR-207

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/scripts/backupcleaner
    lucene/solr/trunk/src/scripts/snapcleaner
    lucene/solr/trunk/src/scripts/snapinstaller
    lucene/solr/trunk/src/scripts/snappuller

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?view=diff&rev=529471&r1=529470&r2=529471
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Mon Apr 16 19:25:28 2007
@@ -218,6 +218,11 @@
 
 10. SOLR-198: RunExecutableListener always waited for the process to
     finish, even when wait="false" was set. (Koji Sekiguchi via yonik)
+
+11. SOLR-207: Changed distribution scripts to remove recursive find
+    and avoid use of "find -maxdepth" on platforms where it is not
+    supported. (yonik)
+
  
 Other Changes
  1. Updated to Lucene 2.1

Modified: lucene/solr/trunk/src/scripts/backupcleaner
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/backupcleaner?view=diff&rev=529471&r1=529470&r2=529471
==============================================================================
--- lucene/solr/trunk/src/scripts/backupcleaner (original)
+++ lucene/solr/trunk/src/scripts/backupcleaner Mon Apr 16 19:25:28 2007
@@ -105,8 +105,16 @@
 
 if [[ -n ${days} ]]
 then
+    #is maxdepth supported?
+    find ${data_dir} -maxdepth 0 -name foobar >/dev/null 2>&1
+    if [ $? = 0 ]; then
+      maxdepth="-maxdepth 1"
+    else
+      unset maxdepth
+    fi
+  
     logMessage cleaning up backups more than ${days} days old
-    for i in `find ${data_dir} -name "backup.*" -maxdepth 1 -mtime +${days} -print`
+    for i in `find ${data_dir} ${maxdepth} -name 'backup.*' -mtime +${days} -print`
     do
         remove $i
     done

Modified: lucene/solr/trunk/src/scripts/snapcleaner
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snapcleaner?view=diff&rev=529471&r1=529470&r2=529471
==============================================================================
--- lucene/solr/trunk/src/scripts/snapcleaner (original)
+++ lucene/solr/trunk/src/scripts/snapcleaner Mon Apr 16 19:25:28 2007
@@ -111,8 +111,16 @@
 
 if [[ -n ${days} ]]
 then
+    #is maxdepth supported?
+    find ${data_dir} -maxdepth 0 -name foobar >/dev/null 2>&1
+    if [ $? = 0 ]; then
+      maxdepth="-maxdepth 1"
+    else
+      unset maxdepth
+    fi
+
     logMessage cleaning up snapshots more than ${days} days old
-    for i in `find ${data_dir} -name "snapshot.*" -maxdepth 1 -mtime +${days} -print`
+    for i in `find ${data_dir} ${maxdepth} -name 'snapshot.*' -mtime +${days} -print`
     do
         remove $i
     done

Modified: lucene/solr/trunk/src/scripts/snapinstaller
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snapinstaller?view=diff&rev=529471&r1=529470&r2=529471
==============================================================================
--- lucene/solr/trunk/src/scripts/snapinstaller (original)
+++ lucene/solr/trunk/src/scripts/snapinstaller Mon Apr 16 19:25:28 2007
@@ -110,7 +110,7 @@
 logMessage command: $0 $@
 
 # get directory name of latest snapshot
-name=`find ${data_dir} -name snapshot.* -print|grep -v wip|sort -r|head -1`
+name=`ls ${data_dir}|grep 'snapshot\.'|grep -v wip|sort -r|head -1`
 
 # clean up after INT/TERM
 trap 'echo "caught INT/TERM, exiting now but partial installation may have already occured";/bin/rm -rf ${data_dir"/index.tmp$$;logExit aborted 13' INT TERM
@@ -121,6 +121,8 @@
     logMessage no shapshot available
     logExit ended 0
 fi
+
+name=${data_dir}/${name}
 
 # has snapshot already been installed
 if [[ ${name} == `cat ${solr_root}/logs/snapshot.current 2>/dev/null` ]]

Modified: lucene/solr/trunk/src/scripts/snappuller
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/scripts/snappuller?view=diff&rev=529471&r1=529470&r2=529471
==============================================================================
--- lucene/solr/trunk/src/scripts/snappuller (original)
+++ lucene/solr/trunk/src/scripts/snappuller Mon Apr 16 19:25:28 2007
@@ -178,7 +178,7 @@
 # get directory name of latest snapshot if not specified on command line
 if [[ -z ${snap_name} ]]
 then
-    snap_name=`ssh -o StrictHostKeyChecking=no ${master_host} "find ${master_data_dir} -name snapshot.\* -print"|grep -v wip|sort -r|head -1`
+    snap_name=`ssh -o StrictHostKeyChecking=no ${master_host} "ls ${master_data_dir}|grep 'snapshot\.'|grep -v wip|sort -r|head -1"`
 fi
 if [[ "${snap_name}" == "" ]]
 then