fix: Fixed error in the committing of data to ES and removal of tests

Author: rupozzi

src/DIRAC/DataManagementSystem/Agent/FTS3Agent.py

@@ -649,7 +649,7 @@ def execute(self):
         return S_OK()
 
     def endExecution(self):
-        self.dataOpSender.concludeSending()
+        return self.dataOpSender.concludeSending()
 
     def __sendAccounting(self, ftsJob):
 

src/DIRAC/DataManagementSystem/Client/DataManager.py

@@ -1877,4 +1877,4 @@ def getReplica(self, lfn, storageElementName, localPath=False):
         return self.__executeIfReplicaExists(storageElementName, lfn, "getFile", localPath=localPath)
 
     def __del__(self):
-        self.dataOpSender.concludeSending()
+        return self.dataOpSender.concludeSending()

src/DIRAC/MonitoringSystem/Client/DataOperationSender.py

@@ -47,8 +47,8 @@ def sendData(self, baseDict, commitFlag=False, delayedCommit=False, startTime=Fa
                 sLog.debug("Committing data operation to monitoring")
                 if not result["OK"]:
                     sLog.error("Could not commit data operation to monitoring", result["Message"])
-                    return result
-                sLog.debug("Done committing to monitoring")
+                else:
+                    sLog.debug("Done committing to monitoring")
 
         if "Accounting" in self.monitoringOption:
             self.dataOp.setValuesFromDict(baseDict)

src/DIRAC/MonitoringSystem/Client/Types/DataOperation.py

@@ -18,6 +18,7 @@ def __init__(self):
             "Destination",
             "Protocol",
             "FinalStatus",
+            "Channel",
         ]
 
         self.monitoringFields = [

src/DIRAC/StorageManagementSystem/Agent/StageMonitorAgent.py

@@ -19,7 +19,6 @@
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
 
 import re
-import time
 
 AGENT_NAME = "StorageManagement/StageMonitorAgent"
 
@@ -64,9 +63,7 @@ def monitorStageRequests(self):
         for storageElement, seReplicaIDs in seReplicas.items():
             self.__monitorStorageElementStageRequests(storageElement, seReplicaIDs, replicaIDs)
 
-        self.dataOpSender.concludeSending()
-
-        return S_OK()
+        return self.dataOpSender.concludeSending()
 
     def __monitorStorageElementStageRequests(self, storageElement, seReplicaIDs, replicaIDs):
         terminalReplicaIDs = {}

src/DIRAC/tests/Utilities/Accounting.py

@@ -1,28 +1,7 @@
 # pylint: disable=protected-access
-from DIRAC.AccountingSystem.Client.Types.DataOperation import DataOperation
 from DIRAC.AccountingSystem.Client.Types.StorageOccupancy import StorageOccupancy
 
 
-def createDataOperationAccountingRecord():
-    accountingDict = {}
-    accountingDict["OperationType"] = "putAndRegister"
-    accountingDict["User"] = "system"
-    accountingDict["Protocol"] = "DataManager"
-    accountingDict["RegistrationTime"] = 0.0
-    accountingDict["RegistrationOK"] = 0
-    accountingDict["RegistrationTotal"] = 0
-    accountingDict["Destination"] = "se"
-    accountingDict["TransferTotal"] = 1
-    accountingDict["TransferOK"] = 1
-    accountingDict["TransferSize"] = 1
-    accountingDict["TransferTime"] = 0.0
-    accountingDict["FinalStatus"] = "Successful"
-    accountingDict["Source"] = "testSite"
-    oDataOperation = DataOperation()
-    oDataOperation.setValuesFromDict(accountingDict)
-    return oDataOperation
-
-
 def createStorageOccupancyAccountingRecord():
     accountingDict = {}
     accountingDict["Site"] = "LCG.PIPPO.it"

tests/Integration/AccountingSystem/Test_DataStoreClient.py

@@ -14,27 +14,11 @@
 from DIRAC import gLogger
 
 from DIRAC.AccountingSystem.Client.DataStoreClient import gDataStoreClient
-from DIRAC.tests.Utilities.Accounting import createDataOperationAccountingRecord
 from DIRAC.tests.Utilities.Accounting import createStorageOccupancyAccountingRecord
 
 gLogger.setLevel("DEBUG")
 
 
-def test_addAndRemoveDataperation():
-
-    # just inserting one record
-    record = createDataOperationAccountingRecord()
-    record.setStartTime()
-    record.setEndTime()
-    res = gDataStoreClient.addRegister(record)
-    assert res["OK"]
-    res = gDataStoreClient.commit()
-    assert res["OK"]
-    # now removing that record
-    res = gDataStoreClient.remove(record)
-    assert res["OK"]
-
-
 def test_addAndRemoveStorageOccupancy():
 
     # just inserting one record

tests/Integration/AccountingSystem/Test_ReportsClient.py

@@ -19,46 +19,11 @@
 from DIRAC.AccountingSystem.Client.DataStoreClient import gDataStoreClient
 from DIRAC.AccountingSystem.Client.ReportsClient import ReportsClient
 
-from DIRAC.tests.Utilities.Accounting import createDataOperationAccountingRecord
 from DIRAC.tests.Utilities.Accounting import createStorageOccupancyAccountingRecord
 
 gLogger.setLevel("DEBUG")
 
 
-def test_addAndRemoveDataOperation():
-
-    # just inserting one record
-    record = createDataOperationAccountingRecord()
-    record.setStartTime()
-    record.setEndTime()
-    res = gDataStoreClient.addRegister(record)
-    assert res["OK"]
-    res = gDataStoreClient.commit()
-    assert res["OK"]
-
-    rc = ReportsClient()
-
-    res = rc.listReports("DataOperation")
-    assert res["OK"]
-
-    res = rc.listUniqueKeyValues("DataOperation")
-    assert res["OK"]
-
-    res = rc.getReport(
-        "DataOperation",
-        "Successful transfers",
-        datetime.datetime.utcnow(),
-        datetime.datetime.utcnow(),
-        {},
-        "Destination",
-    )
-    assert res["OK"]
-
-    # now removing that record
-    res = gDataStoreClient.remove(record)
-    assert res["OK"]
-
-
 def test_addAndRemoveStorageOccupancy():
 
     # just inserting one record