Loading transfer_service/group_rw_rpc_server.py +7 −15 Original line number Diff line number Diff line Loading @@ -57,25 +57,17 @@ class GroupRwRPCServer(RedisRPCServer): vospacePath = requestBody["vospacePath"] groupname = requestBody["groupName"] self.logger.info(f"groupName: {groupname}") #groupInDb = self.dbConn.userExists(groupname) #groupInfo = self.systemUtils.userInfo(groupname) #if not groupInfo or not groupInDb: # response = { "responseType": "ERROR", # "errorCode": 2, # "errorMsg": "The group does not exist or is not registered in the database." } # return response #groupId = self.dbConn.getUserId(groupname) # TODO: Check if GMS group exists creatorId = self.dbConn.getCreatorId(vospacePath) self.logger.info(f"creatorId: {creatorId}") if not self.dbConn.nodeExists(vospacePath): response = { "responseType": "ERROR", "errorCode": 3, "errorCode": 2, "errorMsg": "VOSpace path not found." } elif self.groupRwReadyQueue.len() >= self.maxReadyJobs: response = { "responseType": "ERROR", "errorCode": 4, "errorCode": 3, "errorMsg": "'group_rw_ready' queue is full, please, retry later." } else: jobObj = Job() Loading @@ -83,14 +75,14 @@ class GroupRwRPCServer(RedisRPCServer): jobInfo = requestBody.copy() jobObj.setInfo(jobInfo) jobObj.setPhase("QUEUED") jobObj.setOwnerId("3354") jobObj.setOwnerId(creatorId) self.dbConn.insertJob(jobObj) self.groupRwReadyQueue.insertJob(jobObj) response = { "responseType": f"{jobType}_STARTED" } else: response = { "responseType": "ERROR", "errorCode": 5, "errorCode": 4, "errorMsg": "Unkown request type." } return response Loading Loading
transfer_service/group_rw_rpc_server.py +7 −15 Original line number Diff line number Diff line Loading @@ -57,25 +57,17 @@ class GroupRwRPCServer(RedisRPCServer): vospacePath = requestBody["vospacePath"] groupname = requestBody["groupName"] self.logger.info(f"groupName: {groupname}") #groupInDb = self.dbConn.userExists(groupname) #groupInfo = self.systemUtils.userInfo(groupname) #if not groupInfo or not groupInDb: # response = { "responseType": "ERROR", # "errorCode": 2, # "errorMsg": "The group does not exist or is not registered in the database." } # return response #groupId = self.dbConn.getUserId(groupname) # TODO: Check if GMS group exists creatorId = self.dbConn.getCreatorId(vospacePath) self.logger.info(f"creatorId: {creatorId}") if not self.dbConn.nodeExists(vospacePath): response = { "responseType": "ERROR", "errorCode": 3, "errorCode": 2, "errorMsg": "VOSpace path not found." } elif self.groupRwReadyQueue.len() >= self.maxReadyJobs: response = { "responseType": "ERROR", "errorCode": 4, "errorCode": 3, "errorMsg": "'group_rw_ready' queue is full, please, retry later." } else: jobObj = Job() Loading @@ -83,14 +75,14 @@ class GroupRwRPCServer(RedisRPCServer): jobInfo = requestBody.copy() jobObj.setInfo(jobInfo) jobObj.setPhase("QUEUED") jobObj.setOwnerId("3354") jobObj.setOwnerId(creatorId) self.dbConn.insertJob(jobObj) self.groupRwReadyQueue.insertJob(jobObj) response = { "responseType": f"{jobType}_STARTED" } else: response = { "responseType": "ERROR", "errorCode": 5, "errorCode": 4, "errorMsg": "Unkown request type." } return response Loading