Skip to content

[v7r0] Cancel FTS3 Operation if the RMS request does not exist #4644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atsareg merged 2 commits into from
Jun 28, 2020
Merged

[v7r0] Cancel FTS3 Operation if the RMS request does not exist #4644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e32252b
RMS/DMS: cancel FTS operations if the matching RMS request does not e…
chaen Jun 15, 2020
62d7195
gitignore: ignore env file for vscode
chaen Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ tests/CI/SERVERCONFIG

# VSCode
.vscode
.env

# docs
# this is auto generated
Expand Down
38 changes: 25 additions & 13 deletions DataManagementSystem/Agent/FTS3Agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,24 +354,36 @@ def _treatOperation(self, operation):
continueOperationProcessing = True

# Check the status of the associated RMS Request.
# If it is canceled then we will not create new FTS3Jobs, and mark
# If it is canceled or does not exist anymore then we will not create new FTS3Jobs, and mark
# this as FTS3Operation canceled.

if operation.rmsReqID:
res = ReqClient().getRequestStatus(operation.rmsReqID)
if not res['OK']:
log.error("Could not get request status", res)
return operation, res
rmsReqStatus = res['Value']

if rmsReqStatus == 'Canceled':
log.info(
"The RMS Request is canceled, canceling the FTS3Operation",
"rmsReqID: %s, FTS3OperationID: %s" %
(operation.rmsReqID,
operation.operationID))
operation.status = 'Canceled'
continueOperationProcessing = False
# If the Request does not exist anymore
if cmpError(res, errno.ENOENT):
log.info(
"The RMS Request does not exist anymore, canceling the FTS3Operation",
"rmsReqID: %s, FTS3OperationID: %s" %
(operation.rmsReqID,
operation.operationID))
operation.status = 'Canceled'
continueOperationProcessing = False
else:
log.error("Could not get request status", res)
return operation, res

else:
rmsReqStatus = res['Value']

if rmsReqStatus == 'Canceled':
log.info(
"The RMS Request is canceled, canceling the FTS3Operation",
"rmsReqID: %s, FTS3OperationID: %s" %
(operation.rmsReqID,
operation.operationID))
operation.status = 'Canceled'
continueOperationProcessing = False

if continueOperationProcessing:
res = operation.prepareNewJobs(
Expand Down
Loading