fix: removed Broker field and OutputReady flag

fstagni · Feb 9, 2024 · ca3f394 · ca3f394
1 parent 9562d2c
commit ca3f394
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/src/DIRAC/Interfaces/scripts/dirac_admin_get_job_pilots.py b/src/DIRAC/Interfaces/scripts/dirac_admin_get_job_pilots.py
@@ -11,7 +11,6 @@
                                                           'GridType': 'gLite',
                                                           'Jobs': [1848L],
                                                           'LastUpdateTime': datetime.datetime(2011, 2, 21, 12, 39, 10),
-                                                          'OutputReady': 'True',
                                                           'VO': 'biomed',
                                                           'PilotJobReference': 'https://marlb.in2p3.fr:9000/biq6KT45Q',
                                                           'PilotStamp': '',

diff --git a/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.py b/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.py
@@ -354,11 +354,7 @@ def storePilotOutput(self, pilotRef, output, error):
         if not result["OK"]:
             return S_ERROR("Failed to escape error string")
         e_error = result["Value"]
-        req = "INSERT INTO PilotOutput (PilotID,StdOutput,StdError) VALUES (%d,%s,%s)" % (pilotID, e_output, e_error)
-        result = self._update(req)
-        if not result["OK"]:
-            return result
-        req = "UPDATE PilotAgents SET OutputReady='True' where PilotID=%d" % pilotID
+        req = f"INSERT INTO PilotOutput (PilotID,StdOutput,StdError) VALUES ({pilotID}, {e_output}, {e_error})"
         return self._update(req)
 
     ##########################################################################################

diff --git a/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql b/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql
@@ -34,15 +34,13 @@ CREATE TABLE `PilotAgents` (
   `DestinationSite` VARCHAR(128) NOT NULL DEFAULT 'NotAssigned',
   `Queue` VARCHAR(128) NOT NULL DEFAULT 'Unknown',
   `GridSite` VARCHAR(128) NOT NULL DEFAULT 'Unknown',
-  `Broker` VARCHAR(128) NOT NULL DEFAULT 'Unknown',
   `VO` VARCHAR(128) NOT NULL,
   `GridType` VARCHAR(32) NOT NULL DEFAULT 'LCG',
   `BenchMark` DOUBLE NOT NULL DEFAULT 0.0,
   `SubmissionTime` DATETIME DEFAULT NULL,
   `LastUpdateTime` DATETIME DEFAULT NULL,
   `Status` VARCHAR(32) NOT NULL DEFAULT 'Unknown',
   `StatusReason` VARCHAR(255) NOT NULL DEFAULT 'Unknown',
-  `OutputReady` ENUM('True','False') NOT NULL DEFAULT 'False',
   `AccountingSent` ENUM('True','False') NOT NULL DEFAULT 'False',
   PRIMARY KEY (`PilotID`),
   KEY `PilotJobReference` (`PilotJobReference`),