Skip to content

[v7r3] WMS DBs: do not try to decode when it's not bytes #5841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 1 commit into from
Feb 1, 2022
Merged

[v7r3] WMS DBs: do not try to decode when it's not bytes #5841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/DIRAC/WorkloadManagementSystem/DB/JobDB.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ def getJobParameters(self, jobID, paramList=None):
if result["OK"]:
if result["Value"]:
for res_jobID, res_name, res_value in result["Value"]:
resultDict.setdefault(int(res_jobID), {})[res_name] = res_value.decode(errors="replace")
try:
res_value = res_value.decode(errors="replace") # account for use of BLOBs
except AttributeError:
pass
resultDict.setdefault(int(res_jobID), {})[res_name] = res_value

return S_OK(resultDict) # there's a slim chance that this is an empty dictionary
else:
Expand All @@ -207,7 +211,11 @@ def getJobParameters(self, jobID, paramList=None):
return result

for res_jobID, res_name, res_value in result["Value"]:
resultDict.setdefault(int(res_jobID), {})[res_name] = res_value.decode(errors="replace")
try:
res_value = res_value.decode(errors="replace") # account for use of BLOBs
except AttributeError:
pass
resultDict.setdefault(int(res_jobID), {})[res_name] = res_value

return S_OK(resultDict) # there's a slim chance that this is an empty dictionary

Expand Down Expand Up @@ -246,7 +254,11 @@ def getAtticJobParameters(self, jobID, paramList=None, rescheduleCounter=-1):
if result["OK"]:
if result["Value"]:
for name, value, counter in result["Value"]:
resultDict.setdefault(counter, {})[name] = value.decode()
try:
value = value.decode() # account for use of BLOBs
except AttributeError:
pass
resultDict.setdefault(counter, {})[name] = value

return S_OK(resultDict)
else:
Expand Down Expand Up @@ -397,7 +409,11 @@ def getJobOptParameters(self, jobID, paramList=None):
result = self._query(cmd)
if not result["OK"]:
return S_ERROR("JobDB.getJobOptParameters: failed to retrieve parameters")
return S_OK({name: value.decode() for name, value in result.get("Value", {})})
try:
jobOptParameters = {name: value.decode() for name, value in result.get("Value", {})} # account for BLOBs
except AttributeError:
jobOptParameters = {name: value for name, value in result.get("Value", {})}
return S_OK(jobOptParameters)

#############################################################################

Expand Down
8 changes: 6 additions & 2 deletions src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,12 @@ def getPilotOutput(self, pilotRef):
return result
else:
if result["Value"]:
stdout = result["Value"][0][0]
error = result["Value"][0][1]
try:
stdout = result["Value"][0][0].decode() # account for the use of BLOBs
error = result["Value"][0][1].decode()
except AttributeError:
stdout = result["Value"][0][0]
error = result["Value"][0][1]
if stdout == '""':
stdout = ""
if error == '""':
Expand Down