diff --git a/castor/db/oracleJob.sql b/castor/db/oracleJob.sql index 6cf2d7d0440d432d89f36cff958697848cc4d2bc..68f056559d8970c4dd34810131da540099a40ed2 100644 --- a/castor/db/oracleJob.sql +++ b/castor/db/oracleJob.sql @@ -1075,7 +1075,7 @@ PROCEDURE userTransferToSchedule(srId OUT INTEGER, srSubReqId OUT V reqType OUT INTEGER, reqEuid OUT INTEGER, reqEgid OUT INTEGER, srOpenFlags OUT VARCHAR2, clientIp OUT INTEGER, clientPort OUT INTEGER, - clientSecure OUT INTEGER, reqCreationTime OUT INTEGER) AS + reqCreationTime OUT INTEGER) AS cfId NUMBER; -- Cursor to select the next candidate for submission to the scheduler ordered -- by creation time. @@ -1161,9 +1161,9 @@ BEGIN CastorFile.id, CastorFile.fileId, CastorFile.nsHost, SvcClass.name, SvcClass.id, Request.type, Request.reqId, Request.euid, Request.egid, Request.direction, Client.ipAddress, Client.port, - Client.secure, Request.creationTime + Request.creationTime INTO cfId, cfFileId, cfNsHost, reqSvcClass, svcClassId, reqType, reqId, reqEuid, reqEgid, - srOpenFlags, clientIp, clientPort, clientSecure, reqCreationTime + srOpenFlags, clientIp, clientPort, reqCreationTime FROM SubRequest, CastorFile, SvcClass, Client, (SELECT /*+ INDEX(StagePutRequest PK_StagePutRequest_Id) */ id, euid, egid, reqid, client, creationTime, diff --git a/castor/scheduler/transfer.py b/castor/scheduler/transfer.py index b02d4df9a2a27fd209e0ff44dc107e223a179059..b25687b236d256d2b67b290d7e6a67517fb6d95c 100644 --- a/castor/scheduler/transfer.py +++ b/castor/scheduler/transfer.py @@ -214,9 +214,8 @@ class Transfer(BaseTransfer): configuration = castor_tools.castorConf() def __init__(self, transferId, reqId, fileId, euid, egid, svcClassName, creationTime, - protocol, srId, reqType, flags, clientIpAddress, clientPort, - clientSecure, diskServer='', mountPoint='', submissionTime=0, - destDcPath='', moverFd=-1): + protocol, srId, reqType, flags, clientIpAddress='', clientPort=0, + diskServer='', mountPoint='', submissionTime=0, destDcPath='', moverFd=-1): '''constructor''' super(Transfer, self).__init__(transferId, reqId, fileId, euid, egid, svcClassName, creationTime, TransferType.STD, diskServer, mountPoint, submissionTime) @@ -226,7 +225,6 @@ class Transfer(BaseTransfer): self.flags = flags self.clientIpAddress = clientIpAddress self.clientPort = clientPort - self.clientSecure = clientSecure self.destDcPath = destDcPath self.moverFd = moverFd diff --git a/castor/scheduler/transfermanager/dispatcher.py b/castor/scheduler/transfermanager/dispatcher.py index 0a38dd6dbff2a7e4bf28b019a6af1ea939370c24..55479cf316e755552380b894b16781ef8bce6f98 100644 --- a/castor/scheduler/transfermanager/dispatcher.py +++ b/castor/scheduler/transfermanager/dispatcher.py @@ -338,17 +338,15 @@ class UserDispatcherThread(AbstractDispatcherThread): srOpenFlags = stcur.var(cx_Oracle.STRING) clientIp = stcur.var(cx_Oracle.NUMBER) clientPort = stcur.var(cx_Oracle.NUMBER) - clientSecure = stcur.var(cx_Oracle.NUMBER) reqCreationTime = stcur.var(cx_Oracle.NUMBER) - stTransferToSchedule = 'BEGIN userTransferToSchedule(:srId, :srSubReqId , :srProtocol, :destFilesystems, :reqId, :cfFileId, :cfNsHost, :reqSvcClass, :reqType, :reqEuid, :reqEgid, :srOpenFlags, :clientIp, :clientPort, :clientSecure, :reqCreationTime); END;' # pylint: disable=C0301 + stTransferToSchedule = 'BEGIN userTransferToSchedule(:srId, :srSubReqId , :srProtocol, :destFilesystems, :reqId, :cfFileId, :cfNsHost, :reqSvcClass, :reqType, :reqEuid, :reqEgid, :srOpenFlags, :clientIp, :clientPort, :reqCreationTime); END;' # pylint: disable=C0301 # infinite loop over the polling of the DB while self.running: # see whether there is something to do # note that this will hang until something comes or the internal timeout is reached stcur.execute(stTransferToSchedule, (srId, srSubReqId, srProtocol, destFilesystems, reqId, cfFileId, cfNsHost, reqSvcClass, reqType, reqEuid, reqEgid, - srOpenFlags, clientIp, clientPort, clientSecure, - reqCreationTime)) + srOpenFlags, clientIp, clientPort, reqCreationTime)) # in case of timeout, we may have nothing to do if srId.getvalue() != None: # errors are handled internally and there are no exception others than @@ -361,8 +359,7 @@ class UserDispatcherThread(AbstractDispatcherThread): srProtocol.getvalue(), srId.getvalue(), int(reqType.getvalue()), srOpenFlags.getvalue(), inttoip(int(clientIp.getvalue())), - int(clientPort.getvalue()), int(clientSecure.getvalue())), - destFilesystems.getvalue()))) + int(clientPort.getvalue()), destFilesystems.getvalue()))) # if maxNbTransfersScheduledPerSecond is given, request throttling is active # What it does is keep a count of the number of scheduled request in the current second # and wait the rest of the second if it reached the limit