diff --git a/contrib/pgbench/pgbench.cpp b/contrib/pgbench/pgbench.cpp
index 590dcfe290a90d43d6bb474cba0c3f65200889de..5064e0ea15a13e8e9d0fb426156eb79a27996a24 100644
--- a/contrib/pgbench/pgbench.cpp
+++ b/contrib/pgbench/pgbench.cpp
@@ -34,7 +34,7 @@
 #include "postgres_fe.h"
 
 #include "getopt_long.h"
-#include "libpq-fe.h"
+#include "libpq/libpq-fe.h"
 #include "libpq/pqsignal.h"
 #include "portability/instr_time.h"
 
diff --git a/src/gausskernel/cbb/instruments/wdr/snapshot.cpp b/src/gausskernel/cbb/instruments/wdr/snapshot.cpp
index 67a30616b665d831cda708ec1fdf9f9f5cf3a640..fb922339103e39ed8630ad27858caf69be63ca8e 100644
--- a/src/gausskernel/cbb/instruments/wdr/snapshot.cpp
+++ b/src/gausskernel/cbb/instruments/wdr/snapshot.cpp
@@ -155,6 +155,7 @@ static void check_snapshot_thd_exit()
     char* redis_group = PgxcGroupGetInRedistributionGroup();
     if (redis_group != NULL) {
         need_exit = true;
+        u_sess->attr.attr_common.ExitOnAnyError = true;
     }
     CommitTransactionCommand();
 
@@ -1451,6 +1452,7 @@ void SnapshotNameSpace::SubSnapshotMain(void)
     TablesList tablesList;
     const int SLEEP_GAP_AFTER_ERROR = 1;
     InitSnapshot(tablesList);
+    u_sess->attr.attr_common.ExitOnAnyError = false;
 
     while (!t_thrd.perf_snap_cxt.need_exit &&
            (PgxcIsCentralCoordinator(g_instance.attr.attr_common.PGXCNodeName) || IS_SINGLE_NODE) &&