From 22dc31754e4a55e0da1952f1b403cdc0ad5b9700 Mon Sep 17 00:00:00 2001
From: yukai_k <yu_kai@Hoperun.com>
Date: Fri, 30 Oct 2020 17:12:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=94=AF=E6=8C=81=E4=B8=8D=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?OM=E7=9A=84=E7=BA=AF=E5=86=85=E6=A0=B8=E5=8C=85=202.gs=5Fbaseba?=
 =?UTF-8?q?ckup=E6=94=AF=E6=8C=81=E5=A4=87=E6=9C=BA=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/package.sh                              | 16 ++++++++++++----
 src/gausskernel/storage/access/transam/xlog.cpp |  4 ++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/package/package.sh b/package/package.sh
index b3cf899cf..64023caab 100644
--- a/package/package.sh
+++ b/package/package.sh
@@ -173,6 +173,7 @@ done
 declare version_string="${server_name_for_package}-${version_number}"
 declare package_pre_name="${version_string}-${dist_version}-${PLATFORM}bit"
 declare server_package_name="${package_pre_name}.tar.gz"
+declare server_package_name_kernel_only="${package_pre_name}-kernel.tar.gz"
 declare symbol_package_name="${package_pre_name}-symbol.tar.gz"
 declare libpq_package_name="${package_pre_name}-Libpq.tar.gz"
 
@@ -518,7 +519,6 @@ function replace_omtools_version()
 
 }
 
-
 function make_package_srv()
 {
     cd $SCRIPT_DIR
@@ -597,13 +597,21 @@ function make_package_srv()
     rm -r ./install_tools
     mkdir simpleInstall
     cp -r $ROOT_DIR/simpleInstall/. ./simpleInstall
-        tar -zvcf "${server_package_name}" ./* >>"$LOG_FILE" 2>&1
+    tar -zvcf "${server_package_name}" ./* >>"$LOG_FILE" 2>&1
     if [ $? -ne 0 ]; then
-        die "$package_command ${server_package_name} failed"
+        die "tar ${server_package_name} failed"
     fi
     mv ${server_package_name} ${package_path}
     echo "install $pkgname tools is ${server_package_name} of ${package_path} directory " >> "$LOG_FILE" 2>&1
-    echo "success!"
+    echo "make server(all) package success!"
+
+    tar -zvcf "${server_package_name_kernel_only}"  ${sha256_name} ${tar_name}  >>"$LOG_FILE" 2>&1
+    if [ $? -ne 0 ]; then
+        die "tar ${server_package_name_kernel_only} failed"
+    fi
+    mv ${server_package_name_kernel_only} ${package_path}
+    echo "the kernel package is ${server_package_name_kernel_only} of ${package_path} directory " >> "$LOG_FILE" 2>&1        
+    echo "make kernel package success!"
 }
 
 function target_file_copy_for_non_server()
diff --git a/src/gausskernel/storage/access/transam/xlog.cpp b/src/gausskernel/storage/access/transam/xlog.cpp
index c96cc83e2..c91d3b301 100755
--- a/src/gausskernel/storage/access/transam/xlog.cpp
+++ b/src/gausskernel/storage/access/transam/xlog.cpp
@@ -12242,6 +12242,7 @@ XLogRecPtr do_pg_start_backup(const char* backupidstr, bool fast, char** labelfi
                 recptr = xlogctl->lastFpwDisableRecPtr;
                 SpinLockRelease(&xlogctl->info_lck);
 
+#ifdef ENABLE_MULTIPLE_NODES
                 if (!checkpointfpw || XLByteLE(startpoint, recptr)) {
                     ereport(ERROR,
                         (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
@@ -12252,6 +12253,7 @@ XLogRecPtr do_pg_start_backup(const char* backupidstr, bool fast, char** labelfi
                                     "Enable full_page_writes and run CHECKPOINT on the master, "
                                     "and then try an online backup again.")));
                 }
+#endif
 
                 /*
                  * During recovery, since we don't use the end-of-backup WAL
@@ -12690,6 +12692,7 @@ XLogRecPtr do_pg_stop_backup(char* labelfile, bool waitforarchive)
         recptr = xlogctl->lastFpwDisableRecPtr;
         SpinLockRelease(&xlogctl->info_lck);
 
+#ifdef ENABLE_MULTIPLE_NODES
         if (XLByteLE(startpoint, recptr)) {
             ereport(ERROR,
                 (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
@@ -12700,6 +12703,7 @@ XLogRecPtr do_pg_stop_backup(char* labelfile, bool waitforarchive)
                             "Enable full_page_writes and run CHECKPOINT on the master, "
                             "and then try an online backup again.")));
         }
+#endif
 
         LWLockAcquire(ControlFileLock, LW_SHARED);
         stoppoint = t_thrd.shemem_ptr_cxt.ControlFile->minRecoveryPoint;