Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

work on BigJob/Condor

reset minimimum requirement for agent bootstrap to 2.4 for OSG
  • Loading branch information...
commit e287d8888ca976cb5d5cc859005d82b2ed5f8f32 1 parent 3f57147
@drelu drelu authored
View
9 bigjob/bigjob_manager.py
@@ -326,7 +326,7 @@ def start_pilot_job(self,
# or another external scheduler
)
logger.debug("Adaptor specific modifications: " + str(lrms_saga_url.scheme))
- if is_bliss:
+ if is_bliss and lrms_saga_url.scheme.startswith("condor")==False:
bootstrap_script = self.__escape_bliss(bootstrap_script)
else:
if lrms_saga_url.scheme == "gram":
@@ -351,11 +351,14 @@ def start_pilot_job(self,
jd.executable = "/usr/bin/env"
jd.arguments = ["python", os.path.basename(condor_bootstrap_filename)]
+ if pilot_compute_description.has_key("candidate_hosts"):
+ jd.candidate_hosts = pilot_compute_description["candidate_hosts"]
bj_file_transfers = []
file_transfer_spec = condor_bootstrap_filename + " > " + os.path.basename(condor_bootstrap_filename)
bj_file_transfers.append(file_transfer_spec)
output_file_name = "output-" + str(self.uuid) + ".tar.gz"
- output_file_transfer_spec = os.path.join(self.working_directory, output_file_name) +" < " + output_file_name
+ #output_file_transfer_spec = os.path.join(self.working_directory, output_file_name) +" < " + output_file_name
+ output_file_transfer_spec = output_file_name +" < " + output_file_name
#output_file_transfer_spec = os.path.join(self.working_directory, "output.tar.gz") +" < output.tar.gz"
logger.debug("Output transfer: " + output_file_transfer_spec)
bj_file_transfers.append(output_file_transfer_spec)
@@ -1102,4 +1105,4 @@ def __init__(self):
accessor=self.__class__.input_data)
self._register_rw_vec_attribute(name="OutputData",
accessor=self.__class__.output_data)
-
+
View
4 bootstrap/bigjob-bootstrap.py
@@ -22,7 +22,7 @@
try:
import subprocess
except ImportError:
- if sys.version_info <= (2, 5):
+ if sys.version_info <= (2, 4):
print('ERROR: %s' % sys.exc_info()[1])
print('ERROR: this script requires Python 2.6 or greater; or at least the subprocess module.')
print('If you copy subprocess.py from a newer version of Python this script will probably work')
@@ -46,7 +46,7 @@
is_win = (sys.platform == 'win32')
abiflags = getattr(sys, 'abiflags', '')
-if sys.version_info <= (2, 5):
+if sys.version_info <= (2, 4):
print('ERROR: %s' % sys.exc_info()[1])
print('ERROR: This script requires Python 2.6 or greater.')
sys.exit(-1)
View
7 pilot/scheduler/data_compute_affinity_scheduler.py
@@ -28,9 +28,10 @@ def schedule_pilot_data(self, data_unit_description=None):
if data_unit_description.has_key("affinity_datacenter_label") and data_unit_description.has_key("affinity_machine_label"):
for i in self.pilot_data:
pilot_data_description = i.pilot_data_description
- if data_unit_description["affinity_datacenter_label"] == pilot_data_description["affinity_datacenter_label"]\
- and data_unit_description["affinity_machine_label"] == pilot_data_description["affinity_machine_label"]:
- candidate_pilot_data.append(i)
+ if pilot_data_description.has_key("affinity_machine_label") and pilot_data_description.has_key("affinity_datacenter_label"):
+ if data_unit_description["affinity_datacenter_label"] == pilot_data_description["affinity_datacenter_label"]\
+ and data_unit_description["affinity_machine_label"] == pilot_data_description["affinity_machine_label"]:
+ candidate_pilot_data.append(i)
if len(candidate_pilot_data) == 0:
# No PD with requested affinity found
Please sign in to comment.
Something went wrong with that request. Please try again.