##// END OF EJS Templates
Added pipes.quote for batch system lauchers. Fixes bug where LSF would not launch engines or controller.
Guy Haskin Fernald -
Show More
@@ -22,6 +22,7 b' Authors:'
22 import copy
22 import copy
23 import logging
23 import logging
24 import os
24 import os
25 import pipes
25 import stat
26 import stat
26 import sys
27 import sys
27 import time
28 import time
@@ -1141,7 +1142,7 b' class PBSControllerLauncher(PBSLauncher, BatchClusterAppMixin):'
1141 #PBS -V
1142 #PBS -V
1142 #PBS -N ipcontroller
1143 #PBS -N ipcontroller
1143 %s --log-to-file --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1144 %s --log-to-file --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1144 """%(' '.join(ipcontroller_cmd_argv)))
1145 """%(' '.join(map(pipes.quote, ipcontroller_cmd_argv))))
1145
1146
1146
1147
1147 def start(self):
1148 def start(self):
@@ -1157,7 +1158,7 b' class PBSEngineSetLauncher(PBSLauncher, BatchClusterAppMixin):'
1157 #PBS -V
1158 #PBS -V
1158 #PBS -N ipengine
1159 #PBS -N ipengine
1159 %s --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1160 %s --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1160 """%(' '.join(ipengine_cmd_argv)))
1161 """%(' '.join(map(pipes.quote,ipengine_cmd_argv))))
1161
1162
1162 def start(self, n):
1163 def start(self, n):
1163 """Start n engines by profile or profile_dir."""
1164 """Start n engines by profile or profile_dir."""
@@ -1181,7 +1182,7 b' class SGEControllerLauncher(SGELauncher, BatchClusterAppMixin):'
1181 #$ -S /bin/sh
1182 #$ -S /bin/sh
1182 #$ -N ipcontroller
1183 #$ -N ipcontroller
1183 %s --log-to-file --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1184 %s --log-to-file --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1184 """%(' '.join(ipcontroller_cmd_argv)))
1185 """%(' '.join(map(pipes.quote, ipcontroller_cmd_argv))))
1185
1186
1186 def start(self):
1187 def start(self):
1187 """Start the controller by profile or profile_dir."""
1188 """Start the controller by profile or profile_dir."""
@@ -1195,7 +1196,7 b' class SGEEngineSetLauncher(SGELauncher, BatchClusterAppMixin):'
1195 #$ -S /bin/sh
1196 #$ -S /bin/sh
1196 #$ -N ipengine
1197 #$ -N ipengine
1197 %s --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1198 %s --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1198 """%(' '.join(ipengine_cmd_argv)))
1199 """%(' '.join(map(pipes.quote, ipengine_cmd_argv))))
1199
1200
1200 def start(self, n):
1201 def start(self, n):
1201 """Start n engines by profile or profile_dir."""
1202 """Start n engines by profile or profile_dir."""
@@ -1249,7 +1250,7 b' class LSFControllerLauncher(LSFLauncher, BatchClusterAppMixin):'
1249 #BSUB -oo ipcontroller.o.%%J
1250 #BSUB -oo ipcontroller.o.%%J
1250 #BSUB -eo ipcontroller.e.%%J
1251 #BSUB -eo ipcontroller.e.%%J
1251 %s --log-to-file --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1252 %s --log-to-file --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1252 """%(' '.join(ipcontroller_cmd_argv)))
1253 """%(' '.join(map(pipes.quote,ipcontroller_cmd_argv))))
1253
1254
1254 def start(self):
1255 def start(self):
1255 """Start the controller by profile or profile_dir."""
1256 """Start the controller by profile or profile_dir."""
@@ -1264,7 +1265,7 b' class LSFEngineSetLauncher(LSFLauncher, BatchClusterAppMixin):'
1264 #BSUB -oo ipengine.o.%%J
1265 #BSUB -oo ipengine.o.%%J
1265 #BSUB -eo ipengine.e.%%J
1266 #BSUB -eo ipengine.e.%%J
1266 %s --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1267 %s --profile-dir="{profile_dir}" --cluster-id="{cluster_id}"
1267 """%(' '.join(ipengine_cmd_argv)))
1268 """%(' '.join(map(pipes.quote, ipengine_cmd_argv))))
1268
1269
1269 def start(self, n):
1270 def start(self, n):
1270 """Start n engines by profile or profile_dir."""
1271 """Start n engines by profile or profile_dir."""
General Comments 0
You need to be logged in to leave comments. Login now