Simplify Redis loading error check

liuh-80 · web-flow · commit 2a5a9fc8310a · 2025-03-20T08:53:40.000+08:00
diff --git a/common/redisreply.h b/common/redisreply.h
@@ -128,7 +128,7 @@ inline void guard(FUNC func, const char* command)
         // Combine more error message and throw again
         std::string reason = ex.what();
         std::string errmsg = "RedisReply catches system_error: command: " + std::string(command) + ", reason: " + reason;
-        if (reason.find("LOADING Redis is loading the dataset in memory") != std::string::npos)
+        if (reason.rfind("LOADING ", 0) == 0)
         {
             // The command will fail when Redis is loading the dataset.
             SWSS_LOG_WARN("%s", errmsg.c_str());

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ inline void guard(FUNC func, const char* command)`
`128`	`128`	`// Combine more error message and throw again`
`129`	`129`	`std::string reason = ex.what();`
`130`	`130`	`std::string errmsg = "RedisReply catches system_error: command: " + std::string(command) + ", reason: " + reason;`
`131`		`- if (reason.find("LOADING Redis is loading the dataset in memory") != std::string::npos)`
	`131`	`+ if (reason.rfind("LOADING ", 0) == 0)`
`132`	`132`	`{`
`133`	`133`	`// The command will fail when Redis is loading the dataset.`
`134`	`134`	`SWSS_LOG_WARN("%s", errmsg.c_str());`