Skip to content

[advanced-reboot] Handle logs on tmpfs for all new platforms #9094

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
vaibhavhd merged 1 commit into from
Jul 27, 2023
Merged

[advanced-reboot] Handle logs on tmpfs for all new platforms #9094

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
19 changes: 12 additions & 7 deletions tests/platform_tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,15 @@
FMT = "%b %d %H:%M:%S.%f"
FMT_SHORT = "%b %d %H:%M:%S"
FMT_ALT = "%Y-%m-%dT%H:%M:%S.%f%z"
SMALL_DISK_SKUS = [
"Arista-7060CX-32S-C32",
"Arista-7060CX-32S-Q32",
"Arista-7060CX-32S-D48C8"
LOGS_ON_TMPFS_PLATFORMS = [
"x86_64-arista_7050_qx32",
"x86_64-arista_7050_qx32s",
"x86_64-arista_7060_cx32s",
"x86_64-arista_7260cx3_64",
"x86_64-arista_7050cx3_32s",
"x86_64-mlnx_msn2700-r0",
"x86_64-dell_s6100_c2538-r0",
"armhf-nokia_ixs7215_52x-r0"
]


Expand Down Expand Up @@ -452,7 +457,7 @@ def advanceboot_loganalyzer(duthosts, enum_rand_one_per_hwsku_frontend_hostname,
name='device_type') for arg in mark.args]
if 'vs' not in device_marks:
pytest.skip('Testcase not supported for kvm')
hwsku = duthost.facts["hwsku"]
platform = duthost.facts["platform"]
logs_in_tmpfs = list()

loganalyzer = LogAnalyzer(
Expand Down Expand Up @@ -486,7 +491,7 @@ def pre_reboot_analysis():
True if (log_filesystem and "tmpfs" in log_filesystem) else False)
base_os_version.append(get_current_sonic_version(duthost))
bgpd_log = bgpd_log_handler(preboot=True)
if hwsku in SMALL_DISK_SKUS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True):
if platform in LOGS_ON_TMPFS_PLATFORMS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True):
# For small disk devices, /var/log in mounted in tmpfs.
# Hence, after reboot the preboot logs are lost.
# For log_analyzer to work, it needs logs from the shutdown path
Expand All @@ -508,7 +513,7 @@ def pre_reboot_analysis():

def post_reboot_analysis(marker, event_counters=None, reboot_oper=None, log_dir=None):
bgpd_log_handler()
if hwsku in SMALL_DISK_SKUS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True):
if platform in LOGS_ON_TMPFS_PLATFORMS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True):
restore_backup = "mv /host/syslog.99 /var/log/; " +\
"mv /host/sairedis.rec.99 /var/log/swss/; " +\
"mv /host/swss.rec.99 /var/log/swss/; " +\
Expand Down