[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3473] trunk/py/scripts/tools/bi_farm: hopefully fix issue rendering on nodes logged in as root, making files others can't delete
Campbell Barton
ideasman42 at gmail.com
Fri Jun 8 10:19:38 CEST 2012
Revision: 3473
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3473
Author: campbellbarton
Date: 2012-06-08 08:19:36 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
hopefully fix issue rendering on nodes logged in as root, making files others can't delete
Modified Paths:
--------------
trunk/py/scripts/tools/bi_farm/exr_header_collate.py
trunk/py/scripts/tools/bi_farm/new_blender_setup.py
trunk/py/scripts/tools/bi_farm/new_node_command.sh
trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh
trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh
Modified: trunk/py/scripts/tools/bi_farm/exr_header_collate.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/exr_header_collate.py 2012-06-07 18:28:35 UTC (rev 3472)
+++ trunk/py/scripts/tools/bi_farm/exr_header_collate.py 2012-06-08 08:19:36 UTC (rev 3473)
@@ -23,8 +23,8 @@
import os
import subprocess
import time
+from render_dirs import REND_DIR
-DIR = "/render/mango/frames/"
BIGNUM = 100000000.0
@@ -75,7 +75,7 @@
def update_render_times(dirname, all_rendertimes, size=(None, None)):
- dirname_full = os.path.join(DIR, dirname)
+ dirname_full = os.path.join(REND_DIR, dirname)
if not os.path.isdir(dirname_full):
print("NOT A DIR:", dirname_full)
return
Modified: trunk/py/scripts/tools/bi_farm/new_blender_setup.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_blender_setup.py 2012-06-07 18:28:35 UTC (rev 3472)
+++ trunk/py/scripts/tools/bi_farm/new_blender_setup.py 2012-06-08 08:19:36 UTC (rev 3473)
@@ -26,6 +26,8 @@
import math
import base64
+from render_dirs import REND_DIR
+
#try:
# import finals_config
#except:
@@ -101,7 +103,7 @@
rd.image_settings.file_format = 'OPEN_EXR'
rd.image_settings.color_depth = '16'
rd.image_settings.use_preview = True
- rd.filepath = "/render/mango/frames/%s/%s_######" % (output_fname, fname)
+ rd.filepath = os.path.join(REND_DIR, output_fname, "%s_######" % fname)
rd.use_file_extension = True
rd.use_placeholder = False
rd.use_overwrite = False
Modified: trunk/py/scripts/tools/bi_farm/new_node_command.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_command.sh 2012-06-07 18:28:35 UTC (rev 3472)
+++ trunk/py/scripts/tools/bi_farm/new_node_command.sh 2012-06-08 08:19:36 UTC (rev 3473)
@@ -1,5 +1,6 @@
#!/bin/bash
# wrapper so we can do a simple killall to stop any a command
+umask 0002
echo $@
$@
Modified: trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh 2012-06-07 18:28:35 UTC (rev 3472)
+++ trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh 2012-06-08 08:19:36 UTC (rev 3473)
@@ -9,7 +9,9 @@
# do this first to signal that new jobs shouldnt spawn once blender is killed
rm $BUSY
-pkill -P $(pgrep -f new_node_command.sh)
+# ignore error incase 'new_node_command.sh' isn't running
+pkill -P $(pgrep -f new_node_command.sh) 2> /dev/null
+
#killall -9 blender_farm
killall -9 blender
Modified: trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh 2012-06-07 18:28:35 UTC (rev 3472)
+++ trunk/py/scripts/tools/bi_farm/new_node_update_frames.sh 2012-06-08 08:19:36 UTC (rev 3473)
@@ -25,10 +25,10 @@
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 --background -noaudio $BLEND --python $FARM_DIR/new_blender_setup.py -- $OUTPUT_BLEND $FRAME $QUALITY &
-# no background for testing...
-# $FARM_DIR/new_node_command.sh nice -n 19 $FARM_DIR/blender_farm.sh -noaudio $BLEND --python $FARM_DIR/new_blender_setup.py -- $OUTPUT_BLEND $FRAME $QUALITY &
+ # -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 --background -noaudio $BLEND --python $FARM_DIR/new_blender_setup.py -- $OUTPUT_BLEND $FRAME $QUALITY &
+ # no background for testing...
+ # $FARM_DIR/new_node_command.sh nice -n 19 $FARM_DIR/blender_farm.sh -noaudio $BLEND --python $FARM_DIR/new_blender_setup.py -- $OUTPUT_BLEND $FRAME $QUALITY &
done
wait
More information about the Bf-extensions-cvs
mailing list