[Swift-commit] r2803 - in usertools/cio: bin libexec/falkon

[noreply at svn.ci.uchicago.edu]

Author: aespinosa
Date: 2009-04-01 16:46:46 -0500 (Wed, 01 Apr 2009)
New Revision: 2803

Removed:
   usertools/cio/bin/hashserver.rb
Modified:
   usertools/cio/bin/ciologic-bgp.sh
   usertools/cio/libexec/falkon/cobaltrun.job
   usertools/cio/libexec/falkon/falkon-start-bgp.sh
Log:
Bug fixes on ciologi startup regarding spawning background processes

Modified: usertools/cio/bin/ciologic-bgp.sh
===================================================================
--- usertools/cio/bin/ciologic-bgp.sh	2009-04-01 21:30:01 UTC (rev 2802)
+++ usertools/cio/bin/ciologic-bgp.sh	2009-04-01 21:46:46 UTC (rev 2803)
@@ -51,7 +51,6 @@
 address:127.0.0.1 rwlda
 EOF
 
-  $CHIRPROOT/bin/chirp_server -r /dev/shm/share 
 
   # Enable striping
   cat /dev/shm/share/.__acl > /dev/shm/share/stripe/.__acl
@@ -64,8 +63,9 @@
 
   mkdir -p /chirp
   $CHIRPROOT/bin/chirp_fuse -a address /chirp
+  ln -sf /chirp/`get_ip $rank` /dataifs
 
-  ln -sf /chirp/`get_ip $rank` /dataifs
+  $CHIRPROOT/bin/chirp_server -r /dev/shm/share
 }
 
 # function: ifs_slave [head]

Deleted: usertools/cio/bin/hashserver.rb
===================================================================
--- usertools/cio/bin/hashserver.rb	2009-04-01 21:30:01 UTC (rev 2802)
+++ usertools/cio/bin/hashserver.rb	2009-04-01 21:46:46 UTC (rev 2803)
@@ -1,26 +0,0 @@
-#!/home/espinosa/local/bin/ruby
-
-require 'drb'
-
-class HashServer
-  attr_reader :file
-
-  def initialize
-    @file = Hash.new([])
-  end
-
-  def put(fname, rank)
-    @file[fname].push(rank)
-  end
-
-  def get(fname)
-    @file[fname][ rand( @file[fname].size ) ]
-  end
-
-end
-
-server = HashServer.new
-
-DRb.start_service('druby://*:9000', server)
-DRb.thread.join
-

Modified: usertools/cio/libexec/falkon/cobaltrun.job
===================================================================
--- usertools/cio/libexec/falkon/cobaltrun.job	2009-04-01 21:30:01 UTC (rev 2802)
+++ usertools/cio/libexec/falkon/cobaltrun.job	2009-04-01 21:46:46 UTC (rev 2803)
@@ -1 +1 @@
-./falkon-start-bgp-cio.sh default 64 15 4 1 3
+./falkon-start-bgp.sh default 64 15 4 1 3

Modified: usertools/cio/libexec/falkon/falkon-start-bgp.sh
===================================================================
--- usertools/cio/libexec/falkon/falkon-start-bgp.sh	2009-04-01 21:30:01 UTC (rev 2802)
+++ usertools/cio/libexec/falkon/falkon-start-bgp.sh	2009-04-01 21:46:46 UTC (rev 2803)
@@ -44,7 +44,6 @@
 fi 
 if [ -n "$6" ];then
    STR=$6
-   echo true
 fi 
 
 cp ${FALKON_HOME}/bin/zoid-user-script.sh ${HOME}/zoid-user-script.sh