[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3460] trunk/py/scripts/tools/bi_farm: commit commands that the slaves run

Campbell Barton ideasman42 at gmail.com
Wed Jun 6 09:25:15 CEST 2012


Revision: 3460
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3460
Author:   campbellbarton
Date:     2012-06-06 07:25:13 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
commit commands that the slaves run

Added Paths:
-----------
    trunk/py/scripts/tools/bi_farm/new_gen_avi.py
    trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh
    trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh
    trunk/py/scripts/tools/bi_farm/new_node_update_movie.sh

Added: trunk/py/scripts/tools/bi_farm/new_gen_avi.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_gen_avi.py	                        (rev 0)
+++ trunk/py/scripts/tools/bi_farm/new_gen_avi.py	2012-06-06 07:25:13 UTC (rev 3460)
@@ -0,0 +1,12 @@
+#!/shared/software/python/bin/python3.2
+import master_avi_gen
+import os
+from render_dirs import FARM_DIR
+from render_dirs import GEN_AVI_BUSY
+
+busypath = os.path.join(FARM_DIR, GEN_AVI_BUSY)
+
+os.system("echo \"Generating avi's\" > %s" % busypath)
+master_avi_gen.generate('192.168.4.71', user='guest')
+os.system("rm %s" % busypath)
+


Property changes on: trunk/py/scripts/tools/bi_farm/new_gen_avi.py
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh	                        (rev 0)
+++ trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh	2012-06-06 07:25:13 UTC (rev 3460)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+PATH=$PATH:$FARM_DIR
+export IP=`ip.sh`
+BUSY=$FARM_DIR/logs/$IP.busy
+
+echo "Cleaning..." > $BUSY
+
+# do this first to signal that new jobs shouldnt spawn once blender is killed
+rm $BUSY
+
+pkill -P $(pgrep -f new_node_command.sh)
+#killall -9 blender_farm
+killall -9 blender
+
+rm -rf /tmp/mango_farm*
+


Property changes on: trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh	                        (rev 0)
+++ trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh	2012-06-06 07:25:13 UTC (rev 3460)
@@ -0,0 +1,35 @@
+#!/bin/bash
+PATH=$PATH:$FARM_DIR
+export IP=`ip.sh`
+BUSY=$FARM_DIR/logs/$IP.busy
+
+touch $BUSY
+
+mkdir /tmp/mango_farm
+
+if [ ! -f $BUSY ] ; then
+	echo "busy file removed, exiting early"
+	exit 0
+fi
+
+BLEND=$1
+OUTPUT_BLEND=$2
+QUALITY=$3
+
+shift
+shift
+shift
+
+# get info on the file we're rendering
+echo "Rendering "${BLEND/\/media\/data\/mango_farm_svn\//}" "$* > $BUSY
+
+for FRAME in $*
+do
+# -a doesnt work. TODO, find out why, render with operator until then.
+$FARM_DIR/new_node_command.sh nice -n 19 $FARM_DIR/blender_farm.sh -b -noaudio $BLEND -P $FARM_DIR/new_blender_setup.py -- $OUTPUT_BLEND $FRAME $QUALITY &
+#$FARM_DIR/new_node_command.sh nice -n 19 $FARM_DIR/blender_farm.sh -noaudio $BLEND -P $FARM_DIR/new_blender_setup.py -- $OUTPUT_BLEND $FRAME $QUALITY &
+done
+
+wait
+
+rm $BUSY


Property changes on: trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/py/scripts/tools/bi_farm/new_node_update_movie.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_update_movie.sh	                        (rev 0)
+++ trunk/py/scripts/tools/bi_farm/new_node_update_movie.sh	2012-06-06 07:25:13 UTC (rev 3460)
@@ -0,0 +1,30 @@
+#!/bin/bash
+FARM_DIR=/shared/software/render_farm
+PATH=$PATH:$FARM_DIR
+export IP=`ip.sh`
+BUSY=$FARM_DIR/logs/$IP.busy
+SVN_IP="192.168.3.14"
+
+DIR="/media/data/mango_farm_svn"
+REV=$1
+
+echo "Updating SVN Production Files to "$REV > $BUSY
+
+if [ -d $DIR ]; then
+	cd $DIR
+	svn cleanup --config-dir=$FARM_DIR/svn_config
+    # TEMP DISABLE, for physics bake
+	svn revert --config-dir=$FARM_DIR/svn_config -R .
+	
+	
+	# HACK: XXX, run a different update that removes corrupt dirs
+	### $FARM_DIR/new_node_command.sh svn up --config-dir=$FARM_DIR/svn_config --force -r$REV
+	$FARM_DIR/new_node_command.sh /shared/software/python/bin/python3 $FARM_DIR/svn_force_update.py /usr/bin/svn up --config-dir=$FARM_DIR/svn_config --force -r$REV
+	
+else
+	# $FARM_DIR/new_node_command.sh svn co --config-dir=$FARM_DIR/svn_config --force -r$REV svn://$SVN_IP/mango/pro $DIR/pro
+    #$FARM_DIR/new_node_command.sh svn co --config-dir=$FARM_DIR/svn_config --force -r$REV file:///svnroot/mango/pro $DIR/pro
+    $FARM_DIR/new_node_command.sh svn co --config-dir=$FARM_DIR/svn_config --force -r$REV svn://$SVN_IP/mango $DIR
+fi
+
+rm $BUSY


Property changes on: trunk/py/scripts/tools/bi_farm/new_node_update_movie.sh
___________________________________________________________________
Added: svn:executable
   + *



More information about the Bf-extensions-cvs mailing list