Skip to content
This repository has been archived by the owner on Jul 25, 2022. It is now read-only.

Do not require chronyd to be installed on storage servers #2307

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

Do not require chronyd to be installed on storage servers #2307

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
25 changes: 23 additions & 2 deletions chroma_core/models/ntp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from chroma_help.help import help_text

import settings
import sys


class NTPConfiguration(DeletableStatefulObject):
Expand Down Expand Up @@ -56,14 +57,34 @@ class StopChronyStep(Step):
idempotent = True

def run(self, kwargs):
return self.invoke_rust_agent_expect_result(kwargs["fqdn"], "stop_unit", "chronyd.service")
from chroma_core.services.job_scheduler.agent_rpc import AgentException

try:
return self.invoke_rust_agent_expect_result(kwargs["fqdn"], "stop_unit", "chronyd.service")
except AgentException as e:
t, v, tb = sys.exc_info()

if "Unknown busctl" in str(e):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a more clear way to say no such unit? 🙂

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree this is frustrating and ugly. If you know of a better way to check please let me know.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of trying to stop and handling the error. We should just check the state first and then stop iff it's already installed / running

return ""
else:
raise t, v, tb
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why explicitly raise with values? I thought just raise would re-raise last exception.



class DisableChronyStep(Step):
idempotent = True

def run(self, kwargs):
return self.invoke_rust_agent_expect_result(kwargs["fqdn"], "disable_unit", "chronyd.service")
from chroma_core.services.job_scheduler.agent_rpc import AgentException

try:
return self.invoke_rust_agent_expect_result(kwargs["fqdn"], "disable_unit", "chronyd.service")
except AgentException as e:
t, v, tb = sys.exc_info()

if "Unknown busctl" in str(e):
return ""
else:
raise t, v, tb


class EnableNtpStep(Step):
Expand Down