starlingx
/
metal
Code Issues Proposed changes

Avoid logging in fork_sysreq_reboot failsafe thread 

Continuing to log in the fork_sysreq_reboot failsafe thread
is seen to cause mtcAgent and mtcClient log file corruption
with binary data.

As an avoidance measure this update changes the offending
information logs to normally disabled debug logs.

Test Plan:

PASS: Verify build, install and provision system with debian iso
      - AIO SX (hw), Standard 2+1 (vbox)
PASS: Verify mtcAgent and mtcClient log files do not get
      binary data (corruption) injected over a self reboot.
PASS: Verify lock and unlock of AIO SX host
PASS: Verify lock and unlock of system node from active controller
PASS: Verify host reboot command
PASS: Verify critical process failure reboot handling

Closes-Bug: 2001719
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
Change-Id: Ib49ee427d2a6363ce21ec7488b1f739986828219
This commit is contained in:
Eric MacDonald 2023-01-04 14:53:51 -05:00
parent 85ea002112
commit 67c4f1b148
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mtce-common/src/common/nodeUtil.cpp
View File

@ -1021,16 +1021,16 @@ void fork_sysreq_reboot ( int delay_in_secs )
{
elog ("failed to fork fail-safe (backup) sysreq reboot\n");
return ;
}
}
else if( 0 == parent ) /* we're the child */
{
int sysrq_handler_fd;
int sysrq_tigger_fd ;
size_t temp ;
setup_child ( false ) ;
ilog ("*** Failsafe Reset Thread ***\n");
setup_child ( false ) ;
dlog ("*** Failsafe Reset Thread ***\n");
/* Commented this out because blocking SIGTERM in systemd environment
* causes any processes that spawn this sysreq will stall shutdown
@ -1046,7 +1046,7 @@ void fork_sysreq_reboot ( int delay_in_secs )
sysrq_handler_fd = open( "/proc/sys/kernel/sysrq", O_RDWR | O_CLOEXEC );
if( 0 > sysrq_handler_fd )
{
ilog ( "failed sysrq_handler open\n");
elog ( "failed sysrq_handler open\n");
return ;
}
@ -1059,7 +1059,7 @@ void fork_sysreq_reboot ( int delay_in_secs )
{
if ( 0 == (i % 5) )
{
ilog ( "sysrq reset in %d seconds\n", i );
dlog ( "sysrq reset in %d seconds\n", i );
}
}
}
@ -1068,19 +1068,19 @@ void fork_sysreq_reboot ( int delay_in_secs )
sysrq_tigger_fd = open( "/proc/sysrq-trigger", O_RDWR | O_CLOEXEC );
if( 0 > sysrq_tigger_fd )
{
ilog ( "failed sysrq_trigger open\n");
elog ( "failed sysrq_trigger open\n");
return ;
}
temp = write( sysrq_tigger_fd, "b", 1 );
temp = write( sysrq_tigger_fd, "b", 1 );
close( sysrq_tigger_fd );
ilog ( "sysreq rc:%ld\n", temp );
dlog ( "sysreq rc:%ld\n", temp );
UNUSED(temp);
sleep (10);
sleep (10);
// Shouldn't get this far, else there was an error.
exit(-1);
}