Skip to content
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

[hostcfgd]: wait till system initialization is done before starting hostcfgd #6232

Merged
merged 4 commits into from
Dec 18, 2020
Merged

[hostcfgd]: wait till system initialization is done before starting hostcfgd #6232

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43a6a73
wait hostcfgd starting till systemctl init is done
arlakshm Dec 17, 2020
bef44cc
address review comment
arlakshm Dec 17, 2020
7bce07a
move the check to start()
arlakshm Dec 17, 2020
0488759
change the log message
arlakshm Dec 17, 2020
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
14 changes: 14 additions & 0 deletions src/sonic-host-services/scripts/hostcfgd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ class HostConfigDaemon:
self.kdumpCfg = KdumpCfg(self.config_db)
self.kdumpCfg.load(self.config_db.get_table('KDUMP'))


def load(self):
aaa = self.config_db.get_table('AAA')
tacacs_global = self.config_db.get_table('TACPLUS')
Expand Down Expand Up @@ -447,6 +448,13 @@ class HostConfigDaemon:
syslog.syslog(syslog.LOG_INFO, 'Kdump handler...')
self.kdumpCfg.kdump_update(key, data, False)

def wait_till_system_init_done(self):

# No need to print the output in the log file so using the "--quiet"
# flag
systemctl_cmd = "sudo systemctl is-system-running --wait --quiet"
subprocess.call(systemctl_cmd, shell=True)

def start(self):

self.config_db.subscribe('AAA', lambda table, key, data: self.aaa_handler(key, data))
Expand All @@ -456,6 +464,12 @@ class HostConfigDaemon:
self.config_db.subscribe('FEATURE', lambda table, key, data: self.feature_state_handler(key, data))
self.config_db.subscribe('KDUMP', lambda table, key, data: self.kdump_handler(key, data))

syslog.syslog(syslog.LOG_INFO,
"Waiting for systemctl to finish initialization")
self.wait_till_system_init_done()
syslog.syslog(syslog.LOG_INFO,
"systemctl has finished initialization -- proceeding ...")

# Update all feature states once upon starting
self.update_all_feature_states()

Expand Down