Skip to content

SOFTWARE-6342: Fix handling of missing attributes in get_classad_resource_name #198

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
matyasselmeci merged 1 commit into from
May 1, 2026
+8 −2
Merged

SOFTWARE-6342: Fix handling of missing attributes in get_classad_resource_name #198

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
5 changes: 4 additions & 1 deletion common/gratia/common/condor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,10 @@ def cream_match(match, desired):

def get_classad_resource_name(classad):
for attr in RESOURCE_NAME_ATTRS:
resource_name = classad.eval(attr)
try:
resource_name = classad.eval(attr)
except (KeyError, ValueError):
continue
if resource_name and resource_name is not classadLib.Value.Undefined and resource_name is not classadLib.Value.Error:
return resource_name
return None
Expand Down
5 changes: 4 additions & 1 deletion rpm/gratia-probe.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Name: gratia-probe
Summary: Gratia OSG accounting system probes
Group: Applications/System
Version: 2.9.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPL
URL: https://github.com/opensciencegrid/gratia-probe
Vendor: The Open Science Grid <http://www.opensciencegrid.org/>
Expand Down Expand Up @@ -607,6 +607,9 @@ This is a transitional dummy package for gratia-probe-slurm; it may safely be re
%files slurm

%changelog
* Fri May 1 2026 Matt Westphall <westphall@wisc.edu.> - 2.9.1-3
- Add missing try/catch block (SOFTWARE-6342)

* Thu Feb 5 2026 Matt Westphall <westphall@wisc.edu.> - 2.9.1-2
- Add check for empty classad resource names

Expand Down
Loading