hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!356 支持不包含OM的纯内核包以及gs_basebackup支持备机备份

Browse Source 
Merge pull request !356 from yukai_k/master
This commit is contained in:
opengauss-bot
2020-10-31 08:22:17 +08:00
committed by Gitee
parent 70e4f6d0d3 22dc31754e
commit 66e376653c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/package.sh
View File

@ -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()

4
src/gausskernel/storage/access/transam/xlog.cpp
View File

@ -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;