From f64bf9d9d428190e7a794d4dbdb1fdefda2da33a Mon Sep 17 00:00:00 2001 From: Thanayut Seethongchuen Date: Mon, 16 Oct 2023 18:09:15 +0200 Subject: [PATCH] Fix keep all successfully transferred files to publish container. (#7949) --- .../ASO/Rucio/Actions/MonitorLockStatus.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/python/ASO/Rucio/Actions/MonitorLockStatus.py b/src/python/ASO/Rucio/Actions/MonitorLockStatus.py index 08f4ba8002..22e01887c5 100644 --- a/src/python/ASO/Rucio/Actions/MonitorLockStatus.py +++ b/src/python/ASO/Rucio/Actions/MonitorLockStatus.py @@ -35,14 +35,16 @@ def execute(self): self.updateRESTFileDocsStateToDone(newDoneFileDocs) self.transfer.updateOKLocks([x['name'] for x in newDoneFileDocs]) - # Filter only files need to publish - needToPublishFileDocs = self.filterFilesNeedToPublish(okFileDocs) - self.logger.debug(f'needToPublishFileDocs: {needToPublishFileDocs}') - # Register transfer complete replicas to publish container. - # Note that replicas that already add to publish container will do - # nothing but return fileDoc containing the block name replica belongs - # to. - publishedFileDocs = self.registerToPublishContainer(needToPublishFileDocs) + # NOTE: See https://github.com/dmwm/CRABServer/issues/7940 + ## Filter only files need to publish + #needToPublishFileDocs = self.filterFilesNeedToPublish(okFileDocs) + #self.logger.debug(f'needToPublishFileDocs: {needToPublishFileDocs}') + ## Register transfer complete replicas to publish container. + ## Note that replicas that already add to publish container will do + ## nothing but return fileDoc containing the block name replica belongs + ## to. + #publishedFileDocs = self.registerToPublishContainer(needToPublishFileDocs) + publishedFileDocs = self.registerToPublishContainer(okFileDocs) self.logger.debug(f'publishedFileDocs: {publishedFileDocs}') # skip filedocs that already update it status to rest. newPublishFileDocs = [doc for doc in publishedFileDocs if not doc['dataset'] in self.transfer.bookkeepingBlockComplete]