gNOI Warm Reboot - Added tests

sonic-net · Jan 6, 2025 · 14eb980 · 14eb980
1 parent 79d4162
commit 14eb980
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 230 deletions.
diff --git a/src/sonic-framework/rebootbackend/gnoi_reboot_dbus.h b/src/sonic-framework/rebootbackend/gnoi_reboot_dbus.h
diff --git a/src/sonic-framework/rebootbackend/init_thread.h b/src/sonic-framework/rebootbackend/init_thread.h
diff --git a/src/sonic-framework/rebootbackend/reboot_thread.cpp b/src/sonic-framework/rebootbackend/reboot_thread.cpp
@@ -186,25 +186,6 @@ void RebootThread::do_warm_reboot(swss::Select &s) {
   return;
 }
 
-void RebootThread::do_warm_reboot(swss::Select &s) {
-  SWSS_LOG_ENTER();
-  SWSS_LOG_NOTICE("Sending warm reboot request to platform");
-  if (send_dbus_reboot_request() == Progress::EXIT_EARLY) {
-    return;
-  }
-
-  // Wait for warm reboot. If we return, reboot failed.
-  if (wait_for_platform_reboot(s) == Progress::EXIT_EARLY) {
-    return;
-  }
-
-  // We shouldn't be here. Platform reboot should've killed us.
-  log_error_and_set_non_retry_failure("failed to warm reboot");
-
-  return;
-}
-
-
 void RebootThread::reboot_thread(void) {
   SWSS_LOG_ENTER();
 

diff --git a/src/sonic-framework/rebootbackend/rebootbe.cpp b/src/sonic-framework/rebootbackend/rebootbe.cpp
@@ -1,4 +1,5 @@
 #include "rebootbe.h"
+
 #include <google/protobuf/util/json_util.h>
 #include <unistd.h>
 
@@ -29,7 +30,6 @@ RebootBE::RebootBE(DbusInterface &dbus_interface)
 }
 
 RebootBE::RebManagerStatus RebootBE::GetCurrentStatus() {
-  const std::lock_guard<std::mutex> lock(m_StatusMutex);
   return m_CurrentStatus;
 }
 
@@ -41,6 +41,9 @@ void RebootBE::SetCurrentStatus(RebManagerStatus newStatus) {
 void RebootBE::Start() {
   SWSS_LOG_ENTER();
   SWSS_LOG_NOTICE("--- Starting rebootbackend ---");
+  swss::WarmStart::initialize("rebootbackend", "sonic-framework");
+  swss::WarmStart::checkWarmStart("rebootbackend", "sonic-framework",
+                                  /*incr_restore_cnt=*/false);
 
   swss::Select s;
   s.addSelectable(&m_NotificationConsumer);
@@ -51,7 +54,7 @@ void RebootBE::Start() {
     SetCurrentStatus(RebManagerStatus::WARM_INIT_WAIT);
   } else {
     SWSS_LOG_NOTICE("Warm restart not enabled");
-  }
+  } 
 
   SWSS_LOG_NOTICE("RebootBE entering operational loop");
   while (true) {

diff --git a/src/sonic-framework/tests/reboot_thread_test.cpp b/src/sonic-framework/tests/reboot_thread_test.cpp
@@ -89,6 +89,38 @@ TEST_F(RebootStatusTest, TestGetStatus) {
   EXPECT_EQ(0, response.when());
 }
 
+TEST_F(RebootStatusTest, TestGetWarmStatus) {
+  std::chrono::nanoseconds curr_ns =
+      std::chrono::high_resolution_clock::now().time_since_epoch();
+
+  m_status.set_start_status(gnoi::system::RebootMethod::WARM, "reboot because");
+
+  gnoi::system::RebootStatusResponse response = m_status.get_response();
+  EXPECT_EQ(
+      response.status().status(),
+      gnoi::system::RebootStatus_Status::RebootStatus_Status_STATUS_UNKNOWN);
+
+  m_status.set_completed_status(
+      gnoi::system::RebootStatus_Status::RebootStatus_Status_STATUS_SUCCESS,
+      "anything");
+
+  response = m_status.get_response();
+
+  // message should be empty while reboot is active
+  EXPECT_THAT(response.status().message(), StrEq(""));
+
+  uint64_t reboot_ns = response.when();
+  EXPECT_TRUE(reboot_ns > (uint64_t)curr_ns.count());
+
+  m_status.set_inactive();
+  response = m_status.get_response();
+  EXPECT_THAT(response.status().message(), StrEq("anything"));
+  EXPECT_EQ(
+      response.status().status(),
+      gnoi::system::RebootStatus_Status::RebootStatus_Status_STATUS_SUCCESS);
+  EXPECT_EQ(0, response.when());
+}
+
 class RebootThreadTest : public ::testing::Test {
  protected:
   RebootThreadTest()
@@ -283,4 +315,43 @@ TEST_F(RebootThreadTest, TestInvalidMethodfDoReboot) {
           ""));
 }
 
+TEST_F(RebootThreadTest, TestNoWarmIfNonRetriableFailure) {
+  set_start_status(gnoi::system::RebootMethod::WARM, "time to reboot");
+  set_completed_status(
+      gnoi::system::RebootStatus_Status::RebootStatus_Status_STATUS_FAILURE,
+      "failed to warm reboot");
+  force_inactive();
+
+  gnoi::system::RebootRequest request;
+  request.set_method(gnoi::system::RebootMethod::WARM);
+
+  NotificationResponse response = m_reboot_thread.Start(request);
+  EXPECT_EQ(response.status, swss::StatusCode::SWSS_RC_FAILED_PRECONDITION);
+  EXPECT_EQ(response.json_string,
+            "RebootThread: last WARM reboot failed with non-retriable failure");
+}
+
+TEST_F(RebootThreadTest, TestSigTermStartofDoReboot) {
+  sigterm_requested = true;
+  set_start_status(gnoi::system::RebootMethod::WARM, "time to reboot");
+  do_reboot();
+  force_inactive();
+  gnoi::system::RebootStatusResponse response = m_reboot_thread.GetResponse();
+  EXPECT_THAT(
+      response,
+      IsStatus(
+          gnoi::system::RebootStatus_Status::RebootStatus_Status_STATUS_UNKNOWN,
+          ""));
+}
+
+TEST_F(RebootThreadTest, TestWaitForRebootPositive) {
+  overwrite_reboot_timeout(1);
+  set_start_status(gnoi::system::RebootMethod::WARM, "time to reboot");
+  swss::Select s;
+  swss::SelectableEvent m_stop;
+  s.addSelectable(&m_stop);
+  RebootThread::Progress progress = wait_for_platform_reboot(s);
+  EXPECT_EQ(progress, RebootThread::Progress::PROCEED);
+}
+
 }  // namespace rebootbackend