Merge pull request #5725 from DIRACGridBot/cherry-pick-2-572fafe16-integration

[sweep:integration] fix: ElasticJobParametersDB: get in output all entries

Author: fstagni

src/DIRAC/WorkloadManagementSystem/DB/ElasticJobParametersDB.py

@@ -63,6 +63,7 @@ def __init__(self):
             self.log.always("Index created:", self.indexName)
 
         self.dslSearch = self._Search(self.indexName)
+        self.dslSearch.extra(track_total_hits=True)
 
     def getJobParameters(self, jobID, paramList=None):
         """Get Job Parameters defined for jobID.
@@ -99,7 +100,7 @@ def getJobParameters(self, jobID, paramList=None):
 
         s = self.dslSearch.query("bool", filter=self._Q("term", JobID=jobID))
 
-        res = s.execute()
+        res = s.scan()
 
         for hit in res:
             name = hit.Name
@@ -142,7 +143,7 @@ def setJobParameters(self, jobID, parameters):
         self.log.debug("Inserting parameters", "in %s: for job %s : %s" % (self.indexName, jobID, parameters))
 
         parametersListDict = [
-            {"JobID": jobID, "Name": parName, "Value": parValue, "_id": str(parName) + str(parValue)}
+            {"JobID": jobID, "Name": parName, "Value": parValue, "_id": str(jobID) + str(parName) + str(parValue)}
             for parName, parValue in parameters
         ]