Commit e94c233f authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Added 'nodeList' class field to store vospace nodes into job object when... 


Added 'nodeList' class field to store vospace nodes into job object when pushed on write_ready queue.

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

transfer_service/store_preprocessor.py

+9 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ class StorePreprocessor(TaskExecutor): 
        self.jobObj = None

        self.username = None

        self.userId = None

        self.nodeList = []

        super(StorePreprocessor, self).__init__()



    # Scan is performed only on the first level!
@@ -162,6 +163,7 @@ class StorePreprocessor(TaskExecutor): 
                cnode.setCreatorID(self.userId)

                if not self.dbConn.nodeExists(cnode):

                    self.dbConn.insertNode(cnode)

                    self.nodeList.append(basePath + '/' + nodeName)



        out.write("\n\n")
@@ -187,6 +189,7 @@ class StorePreprocessor(TaskExecutor): 
                    dnode.setContentMD5(self.md5calc.getMD5(file))

                    if not self.dbConn.nodeExists(dnode):

                        self.dbConn.insertNode(dnode)

                        self.nodeList.append(basePath + '/' + nodeName)



        out.write("\n")

        out.close()
@@ -200,11 +203,14 @@ class StorePreprocessor(TaskExecutor): 
            self.wait()

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

                self.jobObj = self.srcQueue.getJob()

                self.username = self.jobObj["jobInfo"]["userName"]

                self.username = self.jobObj.jobInfo["userName"]

                self.prepare(self.username)

                self.execute()

                self.srcQueue.moveJobTo(self.destQueue.name())

                print(f"Job {self.jobObj['jobId']} MOVED from {self.srcQueue.name()} to {self.destQueue.name()}")

                #self.srcQueue.moveJobTo(self.destQueue.name())

                self.jobObj.jobInfo["nodeList"] = self.nodeList

                self.srcQueue.extractJob()

                self.destQueue.insertJob(self.jobObj)

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



# Test

#sp = StorePreprocessor()