Merge pull request #4014 from qunox/parallel2

Parallel2
dmwm · Feb 12, 2014 · feb8e0c · feb8e0c
2 parents 6d82203 + 0656b99
commit feb8e0c
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 149 deletions.
diff --git a/src/python/CRABClient/Commands/getcommand.py b/src/python/CRABClient/Commands/getcommand.py
@@ -24,7 +24,7 @@ def __call__(self, **argv):
             self.dest = os.path.join(self.requestarea, 'results')
 
         # Destination is a URL.
-        if re.match("^[a-z]+://", self.dest): 
+        if re.match("^[a-z]+://", self.dest):
             if not self.dest.endswith("/"):
                 self.dest += "/"
         #Creating the destination directory if necessary
@@ -62,7 +62,7 @@ def __call__(self, **argv):
         cpresults = []
 #        for workflow in dictresult['result']: TODO re-enable this when we will have resubmissions
         workflow = dictresult['result']        #TODO assigning workflow to dictresult. for the moment we have only one wf
-        arglist = ['-d', self.dest, '-i', workflow, '-t', self.options.task, '-p', self.proxyfilename]
+        arglist = ['-d', self.dest, '-i', workflow, '-t', self.options.task, '-p', self.proxyfilename, '-l',self.options.nparallel, '-w',self.options.waittime]
         if len(workflow) > 0:
             if self.dump:
                 for fileInfo in workflow:

diff --git a/src/python/CRABClient/Commands/getlog.py b/src/python/CRABClient/Commands/getlog.py
@@ -29,6 +29,12 @@ def setOptions(self):
         self.parser.add_option( '-q', '--quantity',
                                 dest = 'quantity',
                                 help = 'The number of logs you want to retrieve (or "all"). Ignored if --jobids is used.' )
+        self.parser.add_option( '-l', '--parallel',
+                                dest = 'nparallel',
+                                help = 'Number of parallel download, default is 10 parallel download',)
+        self.parser.add_option( '-w', '--wait',
+                                dest = 'waittime',
+                                help = 'Increase the sendreceive-timeout in second',)
         getcommand.setOptions(self)
 
     """

diff --git a/src/python/CRABClient/Commands/getoutput.py b/src/python/CRABClient/Commands/getoutput.py
@@ -25,4 +25,10 @@ def setOptions(self):
         self.parser.add_option( '-q', '--quantity',
                                 dest = 'quantity',
                                 help = 'The number of output files you want to retrieve (or "all"). Ignored if --jobids is used.' )
+        self.parser.add_option( '-l', '--parallel',
+                                dest = 'nparallel',
+                                help = 'Number of parallel download, default is 10 parallel download',)
+        self.parser.add_option( '-w', '--wait',
+                                dest = 'waittime',
+                                help = 'Increase the sendreceive-timeout in second',)
         getcommand.setOptions(self)