From 2ea04d815289928e4e26fbf5cd24fa523fe5719a Mon Sep 17 00:00:00 2001
From: openGaussDev <zhangtong67@huawei.com>
Date: Sat, 5 Mar 2022 17:54:59 +0800
Subject: [PATCH]  dont't replace pghba when cross region build

Offering: openGaussDev

More detail:

Match-id-b36b3f7f882a819dab886714343a54188ca203ad
---
 src/bin/pg_ctl/pg_build.cpp               | 10 ++++++++--
 src/include/replication/replicainternal.h |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_ctl/pg_build.cpp b/src/bin/pg_ctl/pg_build.cpp
index c004a06d2..59ce732bb 100755
--- a/src/bin/pg_ctl/pg_build.cpp
+++ b/src/bin/pg_ctl/pg_build.cpp
@@ -25,6 +25,7 @@
 
 #include "bin/elog.h"
 #include "nodes/pg_list.h"
+#include "replication/replicainternal.h"
 #include "storage/smgr/fd.h"
 #include "utils/builtins.h"
 #include "utils/datetime.h"
@@ -64,6 +65,7 @@ char g_buildprimary_slotname[MAX_VALUE_LEN] = {0};
 char g_str_replication_type[MAX_VALUE_LEN] = {0};
 int g_replconn_idx = -1;
 int g_replication_type = -1;
+bool is_cross_region_build = false;
 #define RT_WITH_DUMMY_STANDBY 0
 #define RT_WITH_MULTI_STANDBY 1
 
@@ -576,7 +578,9 @@ void get_conninfo(const char* filename)
         exit(1);
     }
 
-    if (IS_CROSS_CLUSTER_BUILD) {
+    if (build_mode == CROSS_CLUSTER_FULL_BUILD || build_mode == CROSS_CLUSTER_INC_BUILD ||
+        build_mode == CROSS_CLUSTER_STANDBY_FULL_BUILD) {
+        /* For shared storage cluster */
         conninfo_para = config_para_cross_cluster_build;
     } else {
         conninfo_para = config_para_build;
@@ -864,10 +868,11 @@ PGconn* check_and_conn(int conn_timeout, int recv_timeout, uint32 term)
 
         tnRet = memset_s(repl_conninfo_str, MAXPGPATH, 0, MAXPGPATH);
         securec_check_ss_c(tnRet, "", "");
+        is_cross_region_build = false;
         if (register_username != NULL && register_password != NULL) {
             if (*register_username == '.') {
                     register_username += 2;
-                }
+            }
             tnRet = snprintf_s(repl_conninfo_str,
                 sizeof(repl_conninfo_str),
                 sizeof(repl_conninfo_str) - 1,
@@ -882,6 +887,7 @@ PGconn* check_and_conn(int conn_timeout, int recv_timeout, uint32 term)
                 repl_conn_info.remoteport,
                 conn_timeout,
                 recv_timeout, register_username, register_password);
+            is_cross_region_build = true;
         } else {
             tnRet = snprintf_s(repl_conninfo_str,
                 sizeof(repl_conninfo_str),
diff --git a/src/include/replication/replicainternal.h b/src/include/replication/replicainternal.h
index 46df4f0ce..bd8d70f0f 100755
--- a/src/include/replication/replicainternal.h
+++ b/src/include/replication/replicainternal.h
@@ -191,7 +191,9 @@ typedef enum {
 extern bool data_catchup;
 extern bool wal_catchup;
 extern BuildMode build_mode;
+extern bool is_cross_region_build; /* for stream disaster recovery cluster */
 #define IS_CROSS_CLUSTER_BUILD (build_mode == CROSS_CLUSTER_FULL_BUILD || \
                                 build_mode == CROSS_CLUSTER_INC_BUILD || \
-                                build_mode == CROSS_CLUSTER_STANDBY_FULL_BUILD)
+                                build_mode == CROSS_CLUSTER_STANDBY_FULL_BUILD || \
+                                is_cross_region_build)
 #endif /* _REPLICA_INTERNAL_H */