diff --git a/LTA/LTAIngest/ingest_config.py.in b/LTA/LTAIngest/ingest_config.py.in index 87d9043bb4185e0fa1d64858f28766551c3c6130..3ae0d647c5a1fb650772fd39da38bbdb131493b7 100644 --- a/LTA/LTAIngest/ingest_config.py.in +++ b/LTA/LTAIngest/ingest_config.py.in @@ -21,7 +21,7 @@ ltaClient = None host = socket.gethostname() ## Using netifaces module or something similar would be nicer, but it doesn't want to install in a custom dir ## So we use this hack -if 'lexar001' in host or 'lexar002' in host: +if 'lexar00' in host: host = host + '.offline.lofar' if 'gridftp01.target.rug.nl' in host: host = 'lotar2.staging.lofar' diff --git a/LTA/LTAIngest/master.py b/LTA/LTAIngest/master.py index ed52c927b3a126827c1a636faceea2a5c546a1ac..55e2b5c1eed86ded94e95af66029fa93e6157a17 100755 --- a/LTA/LTAIngest/master.py +++ b/LTA/LTAIngest/master.py @@ -205,7 +205,9 @@ class jobHandler(Process): self.update_job_msg.put((job, job['Status'], JobProducing, None)) job['Status'] = JobProducing self.active[job['ExportID']] = job - self.manager.get(job.get('slave_hosts')).put(job) ## sends it to the slave with the shortest queue of the possible slave_hosts + job_slave_hosts = job.get('slave_hosts') + slave_for_job = self.manager.get(job_slave_hosts) + slave_for_job.put(job) ## sends it to the slave with the shortest queue of the possible slave_hosts self.logger.debug("Job's started: %s (%i)" % (job['ExportID'], len(self.active))) first = True except Empty: pass @@ -263,8 +265,9 @@ class queueHandler(Process): job['destination'] = self.job_groups[job['job_group']].get_destination() sourcehost = job['Location'].split(':')[0] + self.logger.info("job: %s sourcehost=%s" % (fileName, sourcehost)) if 'cep4' in sourcehost.lower(): - job['slave_hosts'] = ['lexar003.lexar.control.lofar', 'lexar004.lexar.control.lofar'] + job['slave_hosts'] = ['lexar003.offline.lofar', 'lexar004.offline.lofar'] self.scheduled.put(job) # self.talker.put(job) ## Tell MoM we've done something @@ -376,7 +379,7 @@ class ltaMaster(): result = None length = sys.maxint - for k in self.slaves.keys(): + for k in slave_hosts: size = self.slaves[k].qsize() if length > size: result = self.slaves[k]