git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d704398
)
Bugfix in AddSlicetoNodes.
author
Sandrine Avakian
<sandrine.avakian@inria.fr>
Thu, 26 Apr 2012 15:36:34 +0000
(17:36 +0200)
committer
Sandrine Avakian
<sandrine.avakian@inria.fr>
Thu, 26 Apr 2012 15:36:34 +0000
(17:36 +0200)
sfa/senslab/slabdriver.py
patch
|
blob
|
history
diff --git
a/sfa/senslab/slabdriver.py
b/sfa/senslab/slabdriver.py
index
740b996
..
5742da8
100644
(file)
--- a/
sfa/senslab/slabdriver.py
+++ b/
sfa/senslab/slabdriver.py
@@
-674,9
+674,8
@@
class SlabDriver(Driver):
except KeyError:
#Running on default parameters
#XP immediate , 10 mins
except KeyError:
#Running on default parameters
#XP immediate , 10 mins
- slot = {'date':None,'start_time':None, 'timezone':None,'duration':'00:10:00' }#10 min
- reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20
- reqdict['script_path'] = "/bin/sleep 620" #+20 sec
+ slot = {'date':None,'start_time':None, 'timezone':None,'duration':None }#10 min
+
reqdict['property'] ="network_address in ("
for node in added_nodes:
reqdict['property'] ="network_address in ("
for node in added_nodes:
@@
-721,7
+720,9
@@
class SlabDriver(Driver):
reqdict['resource']+= ",walltime=" + str(walltime[0]) + ":" + str(walltime[1]) + ":" + str(walltime[2])
reqdict['script_path'] = "/bin/sleep " + str(sleep_walltime)
reqdict['resource']+= ",walltime=" + str(walltime[0]) + ":" + str(walltime[1]) + ":" + str(walltime[2])
reqdict['script_path'] = "/bin/sleep " + str(sleep_walltime)
-
+ else:
+ reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20
+ reqdict['script_path'] = "/bin/sleep 620" #+20 sec
#In case of a scheduled experiment (not immediate)
#To run an XP immediately, don't specify date and time in RSpec
#They will be set to None.
#In case of a scheduled experiment (not immediate)
#To run an XP immediately, don't specify date and time in RSpec
#They will be set to None.