Commit 9fbfe1a3 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Minor changes. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 4ce8001c

transfer_service/import_executor.py

+1 −1
Original line number Diff line number Diff line
@@ -227,4 +227,4 @@ class ImportExecutor(TaskExecutor): 
                    self.destQueue.extractJob()

                self.destQueue.insertJob(self.jobObj)

                self.srcQueue.extractJob()

                self.logger.info(f"Job {self.jobObj.jobId} MOVED from {self.srcQueue.name()} to {self.destQueue.name()}")
 
                self.logger.info(f"Job {self.jobObj.jobId} MOVED from '{self.srcQueue.name()}' to '{self.destQueue.name()}'")

transfer_service/retrieve_cleaner.py

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class RetrieveCleaner(TaskExecutor): 
                        i = 0

            self.destQueue.insertJob(self.jobObj)

            self.srcQueue.extractJob()

            self.logger.info(f"Job {self.jobObj.jobId} MOVED from {self.srcQueue.name()} to {self.destQueue.name()}")

            self.logger.info(f"Job {self.jobObj.jobId} MOVED from '{self.srcQueue.name()}' to '{self.destQueue.name()}'")

        

    def run(self):

        self.logger.info("Starting retrieve cleaner...")

transfer_service/retrieve_executor.py

+1 −1
Original line number Diff line number Diff line
@@ -337,4 +337,4 @@ class RetrieveExecutor(TaskExecutor): 
                    self.destQueue.extractJob()

                self.destQueue.insertJob(self.jobObj)

                self.srcQueue.extractJob()                    

                self.logger.info(f"Job {self.jobObj.jobId} MOVED from {self.srcQueue.name()} to {self.destQueue.name()}")                                
                self.logger.info(f"Job {self.jobObj.jobId} MOVED from '{self.srcQueue.name()}' to '{self.destQueue.name()}'")

transfer_service/retrieve_preprocessor.py

+20 −7
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ class RetrievePreprocessor(TaskExecutor): 
        super(RetrievePreprocessor, self).__init__()



    def execute(self):

        self.logger.info("Generating VOSpace node list")

        target = self.jobObj.jobInfo["transfer"]["target"].split("!vospace")[1]

        params = self.jobObj.jobInfo["transfer"]["view"]["param"]      

        if not params:
@@ -66,6 +67,7 @@ class RetrievePreprocessor(TaskExecutor): 
        your job has been QUEUED.



        Job ID: {self.jobObj.jobId}

        Job type: {self.jobObj.type}

        Owner ID: {self.jobObj.ownerId}



        You will be notified by email once the job is completed.
@@ -83,11 +85,22 @@ class RetrievePreprocessor(TaskExecutor): 
        self.setDestinationQueueName("read_ready")

        while True:

            self.wait()

            if self.destQueue.len() < self.maxReadyJobs and self.srcQueue.len() > 0:

            try:

                srcQueueLen = self.srcQueue.len()

                destQueueLen = self.destQueue.len()

            except:

                self.logger.exception("Cache error: failed to retrieve queue length.")

            else:

                if destQueueLen < self.maxReadyJobs and srcQueueLen > 0:

                    self.jobObj = self.srcQueue.getJob()

                    self.execute()

                    self.update()

                    try:

                        self.destQueue.insertJob(self.jobObj)

                        self.srcQueue.extractJob()

                    except Exception:

                        self.logger.exception(f"Failed to move job {self.jobObj.jobId} from '{self.srcQueue.name()}' to '{self.destQueue.name()}'")

                    else:                        

                        self.logger.info(f"Job {self.jobObj.jobId} MOVED from '{self.srcQueue.name()}' to '{self.destQueue.name()}'")

            finally:

                self.cleanup()
 
                self.logger.info(f"Job {self.jobObj.jobId} MOVED from {self.srcQueue.name()} to {self.destQueue.name()}")

transfer_service/store_executor.py

+1 −1
Original line number Diff line number Diff line
@@ -246,4 +246,4 @@ class StoreExecutor(TaskExecutor): 
                    self.destQueue.extractJob()

                self.destQueue.insertJob(self.jobObj)

                self.srcQueue.extractJob()

                self.logger.info(f"Job {self.jobObj.jobId} MOVED from {self.srcQueue.name()} to {self.destQueue.name()}")
 
                self.logger.info(f"Job {self.jobObj.jobId} MOVED from '{self.srcQueue.name()}' to '{self.destQueue.name()}'")