Upstream SONiC getWarmStartState() API and Create returnWarmStartState as a wrapper.

Author: mint570

common/warm_restart.cpp

@@ -300,13 +300,6 @@ void WarmStart::getWarmStartState(const std::string &app_name, WarmStartState &s
 
     auto& warmStart = getInstance();
 
-    state = RECONCILED;
-
-    if (!isWarmStart())
-    {
-        return;
-    }
-
     if (app_name == warmStart.m_appName &&
         warmStart.m_warmbootState != WSUNKNOWN) {
         /* Cache is up-to-date. Read state from cache. */
@@ -316,9 +309,6 @@ void WarmStart::getWarmStartState(const std::string &app_name, WarmStartState &s
 
     warmStart.m_stateWarmRestartTable->hget(app_name, "state", statestr);
 
-    /* If warm-start is enabled, state cannot be assumed as Reconciled
-     * It should be set to unknown
-     */
     state = WSUNKNOWN;
 
     for (auto it = warmStartStateNameMap()->begin(); it != warmStartStateNameMap()->end(); it++)
@@ -341,6 +331,15 @@ void WarmStart::getWarmStartState(const std::string &app_name, WarmStartState &s
     return;
 }
 
+// Wrap getWarmStartState to return state vs passing a state variable by
+// reference. SWIG (for python) does not handle passing enum by reference
+// cleanly.
+WarmStart::WarmStartState WarmStart::returnWarmStartState(const std::string &app_name)
+{
+    WarmStartState state;
+    getWarmStartState(app_name, state);
+    return state;
+}
 // Set the WarmStart FSM state for a particular application.
 void WarmStart::setWarmStartState(const std::string &app_name, WarmStartState state)
 {
@@ -416,4 +415,24 @@ WarmStart::DataCheckState WarmStart::getDataCheckState(const std::string &app_na
     return state;
 }
 
+bool WarmStart::isStateVerificationEnabled()
+{
+    auto& warmStart = getInstance();
+
+    std::string value;
+    warmStart.m_stateWarmRestartEnableTable->hget("system",
+                                                  "state_verification", value);
+    if (value == "true")
+    {
+        return true;
+    }
+    return false;
+}
+
+bool WarmStart::waitForUnfreeze()
+{
+    // Wait for unfreeze notification only if state verification is enabled.
+    return isStateVerificationEnabled();
+}
+
 } // namespace swss

common/warm_restart.h

@@ -66,6 +66,8 @@ class WarmStart
 
     static WarmStart &getInstance(void);
 
+    static void updateStateOnColdBoot(const std::string& app_name);
+
     static void initialize(const std::string &app_name,
                            const std::string &docker_name,
                            unsigned int db_timeout = 0,
@@ -86,6 +88,10 @@ class WarmStart
     static void getWarmStartState(const std::string &app_name,
                                   WarmStartState    &state);
 
+    // For python via SWIG: return state instead of passing state
+    // variable by reference as a parameter.
+    static WarmStartState returnWarmStartState(const std::string &app_name);
+
     static void setWarmStartState(const std::string &app_name,
                                   WarmStartState     state);
 
@@ -98,6 +104,8 @@ class WarmStart
 
     static DataCheckState getDataCheckState(const std::string &app_name,
                                             DataCheckStage stage);
+    static bool isStateVerificationEnabled();
+    static bool waitForUnfreeze();
 private:
     std::shared_ptr<swss::DBConnector>   m_stateDb;
     std::shared_ptr<swss::DBConnector>   m_cfgDb;

tests/warm_restart_ut.cpp

@@ -11,6 +11,28 @@ using namespace swss;
 static const string testAppName = "TestApp";
 static const string testDockerName = "TestDocker";
 
+void verifyWarmbootState(std::string app,
+                         WarmStart::WarmStartState expected_state)
+{
+    WarmStart::WarmStartState state;
+    WarmStart::getWarmStartState(app, state);
+    EXPECT_EQ(state, expected_state);
+
+    DBConnector stateDb("STATE_DB", 0, true);
+    Table stateWarmRestartTable(&stateDb, STATE_WARM_RESTART_TABLE_NAME);
+    std::string state_str;
+    stateWarmRestartTable.hget(app, "state", state_str);
+    EXPECT_EQ(state_str, WarmStart::warmStartStateNameMap()->at(state).c_str());
+}
+
+void configureStateVerification(std::string value)
+{
+    DBConnector stateDb("STATE_DB", 0, true);
+    Table stateWarmRestartEnableTable(&stateDb,
+                                      STATE_WARM_RESTART_ENABLE_TABLE_NAME);
+    stateWarmRestartEnableTable.hset("system", "state_verification", value);
+}
+
 // This test must be executed before first successful call to initialize()
 // The static elements of this class can only be initialized once.
 TEST(WarmRestart, testRegisterWarmBootInfoNotInitialized)
@@ -144,8 +166,6 @@ TEST(WarmRestart, checkWarmStart_and_State)
     EXPECT_FALSE(system_enabled);
 }
 
-
-
 TEST(WarmRestart, getWarmStartTimer)
 {
     DBConnector configDb("CONFIG_DB", 0, true);
@@ -362,3 +382,57 @@ TEST(WarmRestart, testRegisterWarmBootInfo)
     EXPECT_TRUE(ret);
     EXPECT_EQ(value, "true");
 }
+
+TEST(WarmRestart, testOptionalStateVerification)
+{
+    DBConnector stateDb("STATE_DB", 0, true);
+    Table stateWarmRestartTable(&stateDb, STATE_WARM_RESTART_TABLE_NAME);
+    Table stateWarmRestartEnableTable(&stateDb,
+                                      STATE_WARM_RESTART_ENABLE_TABLE_NAME);
+
+    DBConnector configDb("CONFIG_DB", 0, true);
+    Table cfgWarmRestartTable(&configDb, CFG_WARM_RESTART_TABLE_NAME);
+
+    // Clean up warm restart state for testAppName and warm restart config for
+    // testDockerName
+    stateWarmRestartTable.del(testAppName);
+    cfgWarmRestartTable.del(testDockerName);
+    stateWarmRestartEnableTable.del("system");
+    stateWarmRestartEnableTable.del(testDockerName);
+
+    // Initialize WarmStart class for TestApp
+    WarmStart::initialize(testAppName, testDockerName, 0, true);
+
+    // perform checkWarmStart for TestApp running in TestDocker. This updates
+    // warmboot state in the DB.
+    EXPECT_FALSE(WarmStart::checkWarmStart(testAppName, testDockerName));
+
+    // State verification is disabled by default.
+    EXPECT_FALSE(WarmStart::isStateVerificationEnabled());
+    EXPECT_FALSE(WarmStart::waitForUnfreeze());
+    // Since state verification is disabled by default, warmboot state should be
+    // RECONCILED.
+    verifyWarmbootState(testAppName, WarmStart::RECONCILED);
+
+    // Disable system level warm restart. Verify that checkWarmStart() still
+    // updates warmboot state to RECONCILED since state verification is disabled
+    // by default.
+    stateWarmRestartEnableTable.hset("system", "enable", "false");
+    EXPECT_FALSE(WarmStart::isStateVerificationEnabled());
+    EXPECT_FALSE(WarmStart::waitForUnfreeze());
+    EXPECT_FALSE(WarmStart::checkWarmStart(testAppName, testDockerName));
+    verifyWarmbootState(testAppName, WarmStart::RECONCILED);
+
+    // Set warmboot state and enable system level warm restart. Verify that
+    // warmboot state reflects the configured state and doesn't get updated by
+    // checkWarmStart().
+    WarmStart::setWarmStartState(testAppName, WarmStart::INITIALIZED);
+    stateWarmRestartEnableTable.hset("system", "enable", "true");
+    EXPECT_TRUE(WarmStart::checkWarmStart(testAppName, testDockerName));
+    verifyWarmbootState(testAppName, WarmStart::INITIALIZED);
+
+    // Disable state verification.
+    configureStateVerification("false");
+    EXPECT_FALSE(WarmStart::isStateVerificationEnabled());
+    EXPECT_FALSE(WarmStart::waitForUnfreeze());
+}