feat: added TornadoDataIntegrityHandler

Author: fstagni

docs/source/AdministratorGuide/ServerInstallations/scalingAndLimitations.rst

@@ -77,7 +77,7 @@ Services
 +--------------------+---------------------------------------------------------------------------------------------------+-------------+---------------------------------------------------------------------------+-----------+
 | Configuration      | :mod:`Configuration <DIRAC.ConfigurationSystem.Service.ConfigurationHandler>`                     | PARTIAL     | One master (rw) and slaves (ro). It's advised to have several CS slaves   | YES       +
 +--------------------+---------------------------------------------------------------------------------------------------+-------------+---------------------------------------------------------------------------+-----------+
-| DataManagement     | :mod:`DataIntegrity <DIRAC.DataManagementSystem.Service.DataIntegrityHandler>`                    | YES         |                                                                           |           +
+| DataManagement     | :mod:`DataIntegrity <DIRAC.DataManagementSystem.Service.DataIntegrityHandler>`                    | YES         |                                                                           | YES       +
 +                    +---------------------------------------------------------------------------------------------------+-------------+---------------------------------------------------------------------------+-----------+
 |                    | :mod:`FileCatalog <DIRAC.DataManagementSystem.Service.FileCatalogHandler>`                        | YES         |                                                                           | YES       +
 +                    +---------------------------------------------------------------------------------------------------+-------------+---------------------------------------------------------------------------+-----------+

src/DIRAC/DataManagementSystem/ConfigTemplate.cfg

@@ -8,6 +8,16 @@ Services
       Default = authenticated
     }
   }
+  ##BEGIN TornadoDataIntegrity
+  TornadoDataIntegrity
+  {
+    Protocol = https
+    Authorization
+    {
+      Default = authenticated
+    }
+  }
+  ##END
   ##BEGIN FTS3Manager
   FTS3Manager
   {
@@ -76,7 +86,6 @@ Services
       Default = authenticated
     }
   }
-  ######################
 
   ##BEGIN StorageElement
   StorageElement

src/DIRAC/DataManagementSystem/Service/DataIntegrityHandler.py

@@ -8,16 +8,13 @@
   the DISET framework
 
 """
-# imports
-import six
-
 # from DIRAC
 from DIRAC import S_OK
 from DIRAC.Core.DISET.RequestHandler import RequestHandler
 from DIRAC.DataManagementSystem.DB.DataIntegrityDB import DataIntegrityDB
 
 
-class DataIntegrityHandler(RequestHandler):
+class DataIntegrityHandlerMixin:
     """
     .. class:: DataIntegrityHandler
 
@@ -31,7 +28,7 @@ def initializeHandler(cls, serviceInfoDict):
         cls.dataIntegrityDB = DataIntegrityDB()
         return S_OK()
 
-    types_removeProblematic = [list(six.integer_types) + [list]]
+    types_removeProblematic = [[int, list]]
 
     def export_removeProblematic(self, fileID):
         """Remove the file with the supplied FileID from the database"""
@@ -57,7 +54,7 @@ def export_getProblematic(self):
             )
         return res
 
-    types_getPrognosisProblematics = [list(six.string_types)]
+    types_getPrognosisProblematics = [str]
 
     def export_getPrognosisProblematics(self, prognosis):
         """Get problematic files from the problematics table of the IntegrityDB"""
@@ -69,7 +66,7 @@ def export_getPrognosisProblematics(self, prognosis):
             )
         return res
 
-    types_setProblematicStatus = [list(six.integer_types), list(six.string_types)]
+    types_setProblematicStatus = [int, str]
 
     def export_setProblematicStatus(self, fileID, status):
         """Update the status of the problematics with the provided fileID"""
@@ -79,7 +76,7 @@ def export_setProblematicStatus(self, fileID, status):
             self.log.error("DataIntegrityHandler.setProblematicStatus: Failed to set status.", res["Message"])
         return res
 
-    types_incrementProblematicRetry = [list(six.integer_types)]
+    types_incrementProblematicRetry = [int]
 
     def export_incrementProblematicRetry(self, fileID):
         """Update the retry count for supplied file ID."""
@@ -91,7 +88,7 @@ def export_incrementProblematicRetry(self, fileID):
             )
         return res
 
-    types_insertProblematic = [list(six.string_types), dict]
+    types_insertProblematic = [str, dict]
 
     def export_insertProblematic(self, source, fileMetadata):
         """Insert problematic files into the problematics table of the IntegrityDB"""
@@ -111,7 +108,7 @@ def export_changeProblematicPrognosis(self, fileID, newPrognosis):
             self.log.error("DataIntegrityHandler.changeProblematicPrognosis: Failed to update.", res["Message"])
         return res
 
-    types_getTransformationProblematics = [list(six.integer_types)]
+    types_getTransformationProblematics = [int]
 
     def export_getTransformationProblematics(self, transID):
         """Get the problematics for a given transformation"""
@@ -148,3 +145,7 @@ def export_getDistinctPrognosis(self):
         else:
             self.log.error("DataIntegrityHandler.getDistinctPrognosis: Failed to get unique prognosis.", res["Message"])
         return res
+
+
+class DataIntegrityHandler(DataIntegrityHandlerMixin, RequestHandler):
+    pass

src/DIRAC/DataManagementSystem/Service/TornadoDataIntegrityHandler.py

@@ -0,0 +1,22 @@
+"""
+Service handler for DataIntegrity using https
+
+.. literalinclude:: ../ConfigTemplate.cfg
+  :start-after: ##BEGIN TornadoDataIntegrity
+  :end-before: ##END
+  :dedent: 2
+  :caption: TornadoDataIntegrity options
+
+"""
+
+from DIRAC import gLogger
+from DIRAC.Core.Tornado.Server.TornadoService import TornadoService
+from DIRAC.DataManagementSystem.Service.DataIntegrityHandler import DataIntegrityHandlerMixin
+
+sLog = gLogger.getSubLogger(__name__)
+
+
+class TornadoDataIntegrityHandler(DataIntegrityHandlerMixin, TornadoService):
+    """Tornado handler for the DataIntegrityHandler"""
+
+    log = sLog