From 5aa5ef94063ea95d0be97fae535dc2a40d3b3f9a Mon Sep 17 00:00:00 2001
From: bowenliu <liubowen18@huawei.com>
Date: Mon, 30 Jan 2023 11:14:44 +0800
Subject: [PATCH] fix switchover trigger

---
 src/gausskernel/process/postmaster/postmaster.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gausskernel/process/postmaster/postmaster.cpp b/src/gausskernel/process/postmaster/postmaster.cpp
index 083626af7..60cb40ac5 100644
--- a/src/gausskernel/process/postmaster/postmaster.cpp
+++ b/src/gausskernel/process/postmaster/postmaster.cpp
@@ -9342,9 +9342,13 @@ static void sigusr1_handler(SIGNAL_ARGS)
         PostmasterStateMachine();
     }
 
-    if (SS_STANDBY_MODE && !SS_PERFORMING_SWITCHOVER && pmState == PM_RUN &&
-        (mode = CheckSwitchoverSignal())) {
-        SSDoSwitchover();
+    if (ENABLE_DMS && (mode = CheckSwitchoverSignal())) {
+        if (SS_NORMAL_STANDBY && pmState == PM_RUN) {
+            SSDoSwitchover();
+        } else {
+            ereport(LOG, (errmsg("Current mode is not NORMAL STANDBY, SS switchover command ignored.")));
+        }
+        
     }
 
     if ((mode = CheckSwitchoverSignal()) != 0 && WalRcvIsOnline() && DataRcvIsOnline() &&