Changeset 27126

Timestamp:

2013-03-26T09:14:31+13:00 (11 years ago)

Author:

jmt12

Message:

Extra clean up commands (like removing cached versions of video processing) and a call to flush_caches.pl to try and clear disk and DNS caches

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/hadoop_import.pl (modified) (4 diffs)

gs2-extensions/parallel-building/trunk/src/bin/script/hadoop_import.pl

@@ -78 +78 @@
 }
 # - clear out the archives regardless
+print " * Clearing existing archives directory for this collection... ";
 if (-e $gs_archives_dir)
 {
@@ -85 +86 @@
 if (&hdfsTest('d', 0, $hdfs_output_dir))
 {
-  print " * Clearing existing archives directory for this collection... ";
   &hdfsCommand('rmr', $hdfs_output_dir);
-  print "Done!\n";
 }
 # - clear out any old logs
@@ -93 +92 @@
 {
   &shellCommand('rm /tmp/greenstone/*.*');
+  &shellCommand('rm /tmp/gsimport*');
 }
 if ($is_rocks_cluster)
 {
   &shellCommand('rocks run host "rm /tmp/greenstone/*.*"');
-}
+  &shellCommand('rocks run host "rm /tmp/gsimport*"');
+}
+print "Done!\n";
+
+# - flush DNS cache too, so we are playing on a level field
+&shellCommand('flush_caches.pl');
+&shellCommand('rocks run host "flush_caches.pl"');
 
 # 3. Special case for *Server type infodbs (namely TDBServer and GDBMServer)
@@ -187 +193 @@
 print " * Cleaning up temporary files... ";
 &shellCommand('rm -rf /tmp/greenstone');
+&shellCommand('rm -rf /tmp/gsimport*');
 if ($is_rocks_cluster)
 {
   &shellCommand('rocks run host "rm -rf /tmp/greenstone"');
+  &shellCommand('rocks run host "rm -rf /tmp/gsimport*"');
 }
 print "Done!\n";