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

Capture logs before reboot (cherry-pick 202311) #15059

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Capture logs before reboot (cherry-pick 202311) #15059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e6b686
Capture before reboot logs
Ryangwaite Oct 14, 2024
8825572
Addressed PR feedback
Ryangwaite Oct 15, 2024
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
11 changes: 11 additions & 0 deletions tests/common/fixtures/advanced_reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,11 @@ def __fetchTestLogs(self, rebootOper=None):
os.makedirs(log_dir)
log_dir = log_dir + "/"

# Create a sub-directory to store the logs before the reboot happened
log_dir_before_reboot = os.path.join(log_dir, "before_reboot/")
if not os.path.exists(log_dir_before_reboot):
os.makedirs(log_dir_before_reboot)

if "warm" in self.rebootType:
# normalize "warm-reboot -f", "warm-reboot -c" to "warm-reboot" for report collection
reboot_file_prefix = "warm-reboot"
Expand Down Expand Up @@ -481,6 +486,12 @@ def __fetchTestLogs(self, rebootOper=None):
{'src': syslogFile, 'dest': log_dir, 'flat': True},
{'src': sairedisRec, 'dest': log_dir, 'flat': True},
{'src': swssRec, 'dest': log_dir, 'flat': True},
# Logs from before reboot
{'src': '/host/syslog.99', 'dest': log_dir_before_reboot, 'flat': True, 'fail_on_missing': False},
{'src': '/host/sairedis.rec.99', 'dest': log_dir_before_reboot, 'flat': True,
'fail_on_missing': False},
{'src': '/host/swss.rec.99', 'dest': log_dir_before_reboot, 'flat': True, 'fail_on_missing': False},
{'src': '/host/bgpd.log.99', 'dest': log_dir_before_reboot, 'flat': True, 'fail_on_missing': False},
],
}
for host, logs in list(logFiles.items()):
Expand Down
3 changes: 3 additions & 0 deletions tests/platform_tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from .args.counterpoll_cpu_usage_args import add_counterpoll_cpu_usage_args
from .mellanox.mellanox_thermal_control_test_helper import suspend_hw_tc_service, resume_hw_tc_service

logger = logging.getLogger(__name__)

TEMPLATES_DIR = os.path.join(os.path.dirname(
os.path.realpath(__file__)), "templates")
Expand Down Expand Up @@ -525,6 +526,7 @@ def pre_reboot_analysis():
base_os_version.append(get_current_sonic_version(duthost))
bgpd_log = bgpd_log_handler(preboot=True)
if platform in LOGS_ON_TMPFS_PLATFORMS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True):
logger.info("Inserting step to back up logs to /host/ before reboot")
# 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 @@ -547,6 +549,7 @@ def pre_reboot_analysis():
def post_reboot_analysis(marker, event_counters=None, reboot_oper=None, log_dir=None):
bgpd_log_handler()
if platform in LOGS_ON_TMPFS_PLATFORMS or (len(logs_in_tmpfs) > 0 and logs_in_tmpfs[0] is True):
logger.info("Restoring log backup from /host/ after reboot")
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
Loading