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

Jump to bottom

disk_check: Publish event for RO state #2320

Merged
merged 6 commits into from
Sep 8, 2022
Merged

disk_check: Publish event for RO state #2320

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4cf344a
Added event
renukamanavalan Aug 18, 2022
5422632
remove unused import
renukamanavalan Aug 18, 2022
687fe7b
remove unused import
renukamanavalan Aug 18, 2022
e8edb2e
LGTM warning fixed
renukamanavalan Aug 18, 2022
3f9ee1c
Merge remote-tracking branch 'upstream/master' into statistics
renukamanavalan Sep 8, 2022
d7176a0
drop settig explicit log level
renukamanavalan Sep 8, 2022
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
23 changes: 22 additions & 1 deletion scripts/disk_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,26 @@
import sys
import syslog
import subprocess
from swsscommon.swsscommon import events_init_publisher, events_deinit_publisher, event_publish
from swsscommon.swsscommon import Logger, FieldValueMap

UPPER_DIR = "/run/mount/upper"
WORK_DIR = "/run/mount/work"
MOUNTS_FILE = "/proc/mounts"

EVENTS_PUBLISHER_SOURCE = "sonic-events-host"
EVENTS_PUBLISHER_TAG = "event-disk"
events_handle = None

Logger.setMinPrio(Logger.SWSS_INFO)
chk_log_level = syslog.LOG_ERR

def _log_msg(lvl, pfx, msg):
if lvl <= chk_log_level:
print("{}: {}".format(pfx, msg))
syslog.syslog(lvl, msg)


def log_err(m):
_log_msg(syslog.LOG_ERR, "Err", m)

Expand All @@ -57,11 +65,18 @@ def log_debug(m):
_log_msg(syslog.LOG_DEBUG, "Debug", m)


def event_pub():
param_dict = FieldValueMap()
param_dict["fail_type"] = "read_only"
rc = event_publish(events_handle, EVENTS_PUBLISHER_TAG, param_dict)


def test_writable(dirs):
for d in dirs:
rw = os.access(d, os.W_OK)
if not rw:
log_err("{} is not read-write".format(d))
event_pub()
return False
else:
log_debug("{} is Read-Write".format(d))
Expand Down Expand Up @@ -145,12 +160,13 @@ def do_check(skip_mount, dirs):
# Check if mounted
if (not ret) and is_mounted(dirs):
log_err("READ-ONLY: Mounted {} to make Read-Write".format(dirs))
event_pub()

return ret


def main():
global chk_log_level
global chk_log_level, events_handle

parser=argparse.ArgumentParser(
description="check disk for Read-Write and mount etc & home as Read-Write")
Expand All @@ -163,7 +179,12 @@ def main():
args = parser.parse_args()

chk_log_level = args.loglvl

events_handle = events_init_publisher(EVENTS_PUBLISHER_SOURCE)

ret = do_check(args.skip_mount, args.dirs.split(","))

events_deinit_publisher(events_handle)
return ret


Expand Down