Skip to content

Commit d0591ef

Browse files
committed
fix: ElasticJobParametersDB: get in output all entries
1 parent 8aa94a0 commit d0591ef

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/DIRAC/WorkloadManagementSystem/DB/ElasticJobParametersDB.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def __init__(self):
7272
self.log.always("Index created:", self.indexName)
7373

7474
self.dslSearch = self._Search(self.indexName)
75+
self.dslSearch.extra(track_total_hits=True)
7576

7677
def getJobParameters(self, jobID, paramList=None):
7778
"""Get Job Parameters defined for jobID.
@@ -108,7 +109,7 @@ def getJobParameters(self, jobID, paramList=None):
108109

109110
s = self.dslSearch.query("bool", filter=self._Q("term", JobID=jobID))
110111

111-
res = s.execute()
112+
res = s.scan()
112113

113114
for hit in res:
114115
name = hit.Name
@@ -151,7 +152,7 @@ def setJobParameters(self, jobID, parameters):
151152
self.log.debug("Inserting parameters", "in %s: for job %s : %s" % (self.indexName, jobID, parameters))
152153

153154
parametersListDict = [
154-
{"JobID": jobID, "Name": parName, "Value": parValue, "_id": str(parName) + str(parValue)}
155+
{"JobID": jobID, "Name": parName, "Value": parValue, "_id": str(jobID) + str(parName) + str(parValue)}
155156
for parName, parValue in parameters
156157
]
157158

0 commit comments

Comments
 (0)