Permalink
Browse files

Default values in gwd returned to expected. Also scheduling now defau…

…lted to 15s.

Rubygems dependency removed and error log supressed (issue #72).


git-svn-id: http://svn.gridway.org/gridway/trunk@208 9b4b2aa8-92f0-458a-8103-c3834d721760
  • Loading branch information...
1 parent a10198d commit 5562dbcfea73d94cb04038c92d32703003b417f5 alorca committed Dec 16, 2009
Showing with 33 additions and 34 deletions.
  1. +31 −24 etc/gwd.conf
  2. +1 −1 src/em_mad/gw_em_mad_ssh.sh
  3. +0 −4 src/ssh/ruby/gw_em_mad_ssh.rb
  4. +0 −4 src/ssh/ruby/gw_tm_mad_ssh.rb
  5. +1 −1 src/tm_mad/gw_tm_mad_ssh.sh
View
@@ -4,15 +4,13 @@
# Syntax
# VARIABLE = "VALUE"
# '#' Comments
+#
#*******************************************************************************
-
-#-------------------------------------------------------------------------------
# Daemon port and number of connections
-#-------------------------------------------------------------------------------
-
+#
GWD_PORT = 6725
MAX_NUMBER_OF_CLIENTS = 25
-
+#
#-------------------------------------------------------------------------------
# Size of pools
#
@@ -27,17 +25,16 @@ MAX_NUMBER_OF_CLIENTS = 25
#
# NUMBER_OF_USERS: The number of differnt users. (Default value is 30)
#
-#-------------------------------------------------------------------------------
-
-NUMBER_OF_ARRAYS = 200
-NUMBER_OF_JOBS = 5000
+#
+NUMBER_OF_ARRAYS = 20
+NUMBER_OF_JOBS = 200
NUMBER_OF_HOSTS = 100
NUMBER_OF_USERS = 30
-
+#
#-------------------------------------------------------------------------------
# Intervals
#
-# SCHEDULING_INTERVAL : Period between two scheduling actions. (Default is 30
+# SCHEDULING_INTERVAL : Period between two scheduling actions. (Default is 15
# seconds)
#
# DISCOVERY_INTERVAL: How often the information manager searches the Grid for
@@ -48,13 +45,13 @@ NUMBER_OF_USERS = 30
#
# POLL_INTERVAL: How often the underlying grid middleware is query about
# job state. (Default is 60 seconds)
-#-------------------------------------------------------------------------------
-
-SCHEDULING_INTERVAL = 30
-DISCOVERY_INTERVAL = 900
-MONITORING_INTERVAL = 300
-POLL_INTERVAL = 180
-
+#
+#
+SCHEDULING_INTERVAL = 15
+DISCOVERY_INTERVAL = 300
+MONITORING_INTERVAL = 180
+POLL_INTERVAL = 60
+#
#-------------------------------------------------------------------------------
# Middleware Access Drivers (MADs)
#
@@ -83,31 +80,42 @@ POLL_INTERVAL = 180
# <tm_mad_name> is the TM MAD to be used with the hosts managed by this IM MAD.
# <em_mad_name> is the EM MAD to be used with the hosts managed by this IM MAD.
# (rsl|rsl_nsh|rsl2) is the type of RSL to use with this EM MAD
+#
#-------------------------------------------------------------------------------
# YOU CAN CONFIGURE SEVERAL TESTBEDS
#-------------------------------------------------------------------------------
-
#
# Example MAD Configuration for pre-WS testbeds
#
#IM_MAD = mds2:gw_im_mad_static:-l etc/im_examples/host.list:gridftp:prews
#EM_MAD = prews:gw_em_mad_prews::rsl
#TM_MAD = gridftp:gw_tm_mad_ftp:
-
+#
#
# Example MAD Configuration for EGEE testbed
#
#IM_MAD = mds2_glue:gw_im_mad_mds2_glue:-l etc/im_examples/host_glue.list -q (GlueCEAccessControlBaseRule=*swetest):dummy:prews_nsh
#EM_MAD = prews_nsh:gw_em_mad_prews::rsl_nsh
#TM_MAD = dummy:gw_tm_mad_dummy:-g
-
+#
+# Example gilda and pheno VO from EGEE infrastructure coming from LDAP
+#IM_MAD = mds2_gilda_it:gw_im_mad_egee_ldap:-s lcg-bdii.cern.ch -q (GlueCEStateStatus=Production)(|(GlueCEAccessControlBaseRule=VO\:gilda)(GlueCEAccessControlBaseRule=VO\:pheno)):dummy:prews_nsh
+#EM_MAD = prews_nsh:gw_em_mad_prews::rsl_nsh
+#TM_MAD = dummy:gw_tm_mad_dummy:-g
+#
#
# Example MAD Configuration for WS testbeds
#
#IM_MAD = mds4:gw_im_mad_mds4_thr:-s cygnus.dacya.ucm.es:gridftp:ws
#EM_MAD = ws:gw_em_mad_ws::rsl2
#TM_MAD = gridftp:gw_tm_mad_ftp:
-
+#
+#
+# Example ssh MAD
+#IM_MAD = static:gw_im_mad_static:-l etc/ssh_hosts.list:ssh_tm:ssh
+#EM_MAD = ssh:gw_em_mad_ssh::rsl2
+#TM_MAD = ssh_tm:gw_tm_mad_ssh:
+#
#-------------------------------------------------------------------------------
# Scheduler module
#
@@ -121,7 +129,6 @@ POLL_INTERVAL = 180
# <sched_name> is used for logging.
# <path_to_sched> is a path to the Scheduler executable. Use an absolute path or
# include it in the PATH variable.
-#-------------------------------------------------------------------------------
-
+#
# Default scheduler for GridWay.Configure the scheduling policies in sched.conf
DM_SCHED = builtin:gw_sched:
@@ -11,4 +11,4 @@ setup_globus
cd_var
mad_debug
-ruby $GW_LOCATION/libexec/ruby/gw_em_mad_ssh.rb 2>$GW_LOCATION/var/gw_em_mad_ssh.err.log
+ruby $GW_LOCATION/libexec/ruby/gw_em_mad_ssh.rb
@@ -17,10 +17,6 @@
$:<<(ENV['GW_LOCATION']+'/libexec/ruby')
-begin
- require "rubygems"
-end
-
require 'gwmad'
require 'rslparser'
require 'sshresource'
@@ -17,10 +17,6 @@
$:<<(ENV['GW_LOCATION']+'/libexec/ruby')
-begin
- require "rubygems"
-end
-
require 'pp'
require 'gwmad'
require 'net/ssh'
@@ -27,4 +27,4 @@ setup_globus
cd_var
mad_debug
-ruby $GW_LOCATION/libexec/ruby/gw_tm_mad_ssh.rb 2>$GW_LOCATION/var/gw_tm_mad_ssh.err.log
+ruby $GW_LOCATION/libexec/ruby/gw_tm_mad_ssh.rb

0 comments on commit 5562dbc

Please sign in to comment.