Merge branch 'testing'

transfer_service/config/vos_ts.conf.sample

@@ -80,8 +80,8 @@ max_terminated_jobs = 8
 ; maximum number of jobs within the 'clean' ('read' only) queue, default is 8
 max_clean_jobs = 8
 ; minimum time interval in seconds between two consecutive checks on 
-; job queues, default is 15 s, minimum allowed is 10 s
-exec_wait_time = 15
+; job queues, default is 10 s, minimum allowed is 5 s
+exec_wait_time = 10
 
 [transfer]
 ; split data to be retrieved in blocks of a given size

transfer_service/task_executor.py

@@ -23,8 +23,8 @@ class TaskExecutor(Process):
         self.maxTerminatedJobs = params.getint("max_terminated_jobs")
         self.maxCleanJobs = params.getint("max_clean_jobs")
         self.execWaitTime = params.getint("exec_wait_time")
-        if self.execWaitTime < 10:
-            self.execWaitTime = 10
+        if self.execWaitTime < 5:
+            self.execWaitTime = 5
         self.srcQueue = None
         self.destQueue = None
         super(TaskExecutor, self).__init__()