diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp index cdbcda445..20eedda8d 100644 --- a/syncd/Syncd.cpp +++ b/syncd/Syncd.cpp @@ -204,9 +204,9 @@ void Syncd::performStartupLogic() { SWSS_LOG_ENTER(); - // ignore warm logic here if syncd starts in Mellanox fastfast boot mode + // ignore warm logic here if syncd starts in fast-boot or Mellanox fastfast boot mode - if (m_isWarmStart && (m_commandLineOptions->m_startType != SAI_START_TYPE_FASTFAST_BOOT)) + if (m_isWarmStart && m_commandLineOptions->m_startType != SAI_START_TYPE_FASTFAST_BOOT && m_commandLineOptions->m_startType != SAI_START_TYPE_FAST_BOOT) { SWSS_LOG_WARN("override command line startType=%s via SAI_START_TYPE_WARM_BOOT", CommandLineOptions::startTypeToString(m_commandLineOptions->m_startType).c_str()); diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh index b4c9739fb..9c64341cb 100644 --- a/syncd/scripts/syncd_init_common.sh +++ b/syncd/scripts/syncd_init_common.sh @@ -26,8 +26,10 @@ else CMD_ARGS= fi -# Use temporary view between init and apply -CMD_ARGS+=" -u" +# Use temporary view between init and apply except when in fast-reboot +if [[ "$(cat /proc/cmdline)" != *"SONIC_BOOT_TYPE=fast-reboot"* ]]; then + CMD_ARGS+=" -u" +fi # Use bulk APIs in SAI # currently disabled since most vendors don't support that yet