Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ The TS is a standard DIRAC system, and therefore it is composed by components in
| Tables_in_TransformationDB |
+------------------------------+
| AdditionalParameters |
| DataFiles |
| TaskInputs |
| TransformationFileTasks |
| TransformationFiles |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ A technical drawing explaining the interactions between the various components f
| Tables_in_TransformationDB |
+------------------------------+
| AdditionalParameters |
| DataFiles |
| TaskInputs |
| TransformationFileTasks |
| TransformationFiles |
Expand Down
19 changes: 2 additions & 17 deletions src/DIRAC/Resources/Catalog/TSCatalogClient.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"""
from DIRAC import S_OK
from DIRAC.Core.Utilities.List import breakListIntoChunks
from DIRAC.Resources.Catalog.Utilities import checkCatalogArguments
from DIRAC.Resources.Catalog.FileCatalogClientBase import FileCatalogClientBase
from DIRAC.Resources.Catalog.Utilities import checkCatalogArguments


class TSCatalogClient(FileCatalogClientBase):

"""Exposes the catalog functionality available in the DIRAC/TransformationHandler"""

# List of common File Catalog methods implemented by this client
WRITE_METHODS = FileCatalogClientBase.WRITE_METHODS + ["addFile", "removeFile", "setMetadata"]
WRITE_METHODS = FileCatalogClientBase.WRITE_METHODS + ["addFile", "setMetadata"]

NO_LFN_METHODS = ["setMetadata"]

Expand All @@ -25,21 +25,6 @@ def addFile(self, lfns, force=False):
rpcClient = self._getRPC()
return rpcClient.addFile(lfns, force)

@checkCatalogArguments
def removeFile(self, lfns):
rpcClient = self._getRPC()
successful = {}
failed = {}
listOfLists = breakListIntoChunks(lfns, 100)
for fList in listOfLists:
res = rpcClient.removeFile(fList)
if not res["OK"]:
return res
successful.update(res["Value"]["Successful"])
failed.update(res["Value"]["Failed"])
resDict = {"Successful": successful, "Failed": failed}
return S_OK(resDict)

def setMetadata(self, path, metadatadict):
"""Set metadata parameter for the given path

Expand Down
23 changes: 2 additions & 21 deletions src/DIRAC/TransformationSystem/Client/TransformationCLI.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

DIRAC.initialize() # Initialize configuration

from DIRAC.Core.Base.CLI import CLI
from DIRAC.Core.Base.API import API
from DIRAC.Core.Base.CLI import CLI
from DIRAC.Core.Utilities.Subprocess import shellCall
from DIRAC.Resources.Catalog.FileCatalog import FileCatalog
from DIRAC.TransformationSystem.Client import TransformationFilesStatus
from DIRAC.TransformationSystem.Client.Transformation import Transformation
from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
from DIRAC.Resources.Catalog.FileCatalog import FileCatalog


def printDict(dictionary):
Expand Down Expand Up @@ -563,25 +563,6 @@ def do_addFile(self, args):
for lfn in sorted(res["Value"]["Successful"]):
print(f"added {lfn}")

def do_removeFile(self, args):
"""Remove file from transformation DB

usage: removeFile <lfn> [lfn]
"""
argss = args.split()
if not len(argss) > 0:
print("no files supplied")
return
res = self.transClient.removeFile(argss)
if not res["OK"]:
print(f"failed to remove any files: {res['Message']}")
return
for lfn in sorted(res["Value"]["Failed"]):
error = res["Value"]["Failed"][lfn]
print(f"failed to remove {lfn}: {error}")
for lfn in sorted(res["Value"]["Successful"]):
print(f"removed {lfn}")

def do_addReplica(self, args):
"""Add new replica to the transformation DB

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class TransformationClient(Client):
File/directory manipulation methods (the remainder of the interface can be found below)

getFileSummary(lfns)
exists(lfns)

Web monitoring tools

Expand Down
Loading
Loading