Skip to content

Improve handling of unexpected values for upcomingMaintenance #4119

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Improve handling of unexpected values for upcomingMaintenance #4119

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
13 changes: 11 additions & 2 deletions ...odules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/slurmsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,17 @@ def get_upcoming_maintenance(lkp: util.Lookup) -> Dict[str, Tuple[str, datetime]
upc_maint_map = {}

for node, inst in lkp.instances().items():
if inst.resource_status.upcoming_maintenance:
upc_maint_map[node + "_maintenance"] = (node, inst.resource_status.upcoming_maintenance.window_start_time)
um = inst.resource_status.upcoming_maintenance
if not um:
continue
if um.type != "SCHEDULED":
log.warning(f"Maintenance event: can not handle non-scheduled maintenance of type {um.type} for node {node=}, skipping")
continue
if not um.window_start_time:
log.error(f"Maintenance event: {node=} upcoming scheduled maintenance doesn't have start time, skipping")
continue

upc_maint_map[node + "_maintenance"] = (node, um.window_start_time)

return upc_maint_map

Expand Down
28 changes: 22 additions & 6 deletions .../scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/tests/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,20 +429,33 @@ def test_parse_gcp_timestamp(got: str, want: datetime):
[
(None, None),
(dict(
type="Might",
windowStartTime="2025-01-15T00:00:00Z",
somethingToIgnore="past failures",
), UpcomingMaintenance(window_start_time=datetime(2025, 1, 15, 0, 0, tzinfo=UTC))),
), UpcomingMaintenance(
type="Might",
window_start_time=datetime(2025, 1, 15, 0, 0, tzinfo=UTC))),
(dict(
type="And",
startTimeWindow=dict(
earliest="2025-01-15T00:00:00Z"),
somethingToIgnore="past failures",
), UpcomingMaintenance(window_start_time=datetime(2025, 1, 15, 0, 0, tzinfo=UTC))),
), UpcomingMaintenance(
type="And",
window_start_time=datetime(2025, 1, 15, 0, 0, tzinfo=UTC))),
(dict(
type="Magic",
windowStartTime="2025-01-15T00:00:00Z",
startTimeWindow=dict(
earliest="2025-01-25T00:00:00Z"), # ignored
somethingToIgnore="past failures",
), UpcomingMaintenance(window_start_time=datetime(2025, 1, 15, 0, 0, tzinfo=UTC))),
), UpcomingMaintenance(
type="Magic",
window_start_time=datetime(2025, 1, 15, 0, 0, tzinfo=UTC))),
(
dict(type="III"),
UpcomingMaintenance(type="III", window_start_time=None),
),
])
def tests_parse_UpcomingMaintenance_OK(got: dict, want: Optional[UpcomingMaintenance]):
assert UpcomingMaintenance.from_json(got) == want
Expand All @@ -453,8 +466,8 @@ def tests_parse_UpcomingMaintenance_OK(got: dict, want: Optional[UpcomingMainten
[
{},
dict(
windowStartTime=dict(
earliest="2025-01-15T00:00:00Z")),
# no type,
windowStartTime=dict(earliest="2025-01-15T00:00:00Z")),
])
def tests_parse_UpcomingMaintenance_FAIL(got: dict):
with pytest.raises(ValueError):
Expand Down Expand Up @@ -483,10 +496,13 @@ def tests_parse_UpcomingMaintenance_FAIL(got: dict):
upcoming_maintenance=None)),
(dict(
physicalHost="/aaa/bbb/ccc",
upcomingMaintenance=dict(windowStartTime="2025-01-15T00:00:00Z")),
upcomingMaintenance=dict(
type="Lilac",
windowStartTime="2025-01-15T00:00:00Z")),
InstanceResourceStatus(
physical_host="/aaa/bbb/ccc",
upcoming_maintenance=UpcomingMaintenance(
type="Lilac",
window_start_time=datetime(2025, 1, 15, 0, 0, tzinfo=UTC)))),
])
def test_parse_InstanceResourceStatus(got: dict, want: Optional[InstanceResourceStatus]):
Expand Down
8 changes: 5 additions & 3 deletions ...ity/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,22 +181,24 @@ def sockets(self) -> int:

@dataclass(frozen=True)
class UpcomingMaintenance:
window_start_time: datetime
type: str
window_start_time: Optional[datetime]

@classmethod
def from_json(cls, jo: Optional[dict]) -> Optional["UpcomingMaintenance"]:
if jo is None:
return None
try:
type = jo["type"]
if "windowStartTime" in jo:
ts = parse_gcp_timestamp(jo["windowStartTime"])
elif "startTimeWindow" in jo:
ts = parse_gcp_timestamp(jo["startTimeWindow"]["earliest"])
else:
raise Exception("Neither windowStartTime nor startTimeWindow are found")
ts = None
except BaseException as e:
raise ValueError(f"Unexpected format for upcomingMaintenance: {jo}") from e
return cls(window_start_time=ts)
return cls(type=type, window_start_time=ts)

@dataclass(frozen=True)
class InstanceResourceStatus:
Expand Down
Loading