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

!4372 控制双集群ctlinfo更新，删除无用函数

Browse Source 
Merge pull request !4372 from Carl/ctlinfo
This commit is contained in:
opengauss_bot
2023-11-03 00:59:21 +00:00
committed by Gitee
parent 678d995e7d 6f266bcb3e
commit 374143385b
3 changed files with 3 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gausskernel/ddes/adapter/ss_reform_common.cpp
View File

@ -278,12 +278,12 @@ void SSUpdateReformerCtrl()
}
if (fd < 0) {
ereport(FATAL, (errcode_for_file_access(), errmsg("could not open control file \"%s\": %m", fname[i])));
ereport(FATAL, (errcode_for_file_access(), errmsg("could not open control file \"%s\": %s", fname[i], TRANSLATE_ERRNO)));
}
SSWriteInstanceControlFile(fd, buffer, REFORM_CTRL_PAGE, write_size);
if (close(fd)) {
ereport(PANIC, (errcode_for_file_access(), errmsg("could not close control file: %m")));
ereport(PANIC, (errcode_for_file_access(), errmsg("could not close control file: %s", TRANSLATE_ERRNO)));
}
}
}

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

@ -6633,35 +6633,6 @@ static uint64 GetMACAddr(void)
return macAddr;
}
void UpdateCtlInfoToFile(ShareStorageXLogCtl *ctlInfo)
{
int fd = BasicOpenFile(SS_DORADO_CTRL_FILE, O_RDWR | PG_BINARY | O_DIRECT, S_IRUSR | S_IWUSR);
if (fd < 0) {
ereport(FATAL, (errcode_for_file_access(), errmsg("could not open ss ctl into file \"%s\": %s", SS_DORADO_CTRL_FILE, TRANSLATE_ERRNO)));
}
Assert(fd > 0);
errno = EOK;
if (pwrite(fd, ctlInfo, SS_DORADO_CTL_INFO_SIZE, 0) != SS_DORADO_CTL_INFO_SIZE) {
if (errno == 0) {
errno = ENOSPC;
}
ereport(PANIC, (errcode_for_file_access(), errmsg("could not write to ss ctl info file: %s", TRANSLATE_ERRNO)));
}
if (pg_fsync(fd) != 0) {
int save_errno = errno;
close(fd);
errno = save_errno;
ereport(PANIC, (errcode_for_file_access(), errmsg("could not fsync ss ctl info file: %s", TRANSLATE_ERRNO)));
}
if (close(fd)) {
ereport(ERROR, (errcode_for_file_access(), errmsg("could not close file \"%s\": %s", SS_DORADO_CTRL_FILE, TRANSLATE_ERRNO)));
}
}
/*
* This func must be called ONCE on system install. It creates pg_control
* and the initial XLOG segment.
@ -19053,40 +19024,6 @@ void UpdatePostgresqlFile(const char *optName, const char *gucLine)
release_file_lock(&filelock);
}
void SSWriteDoradoCtlInfoFile(int fd, char* buffer)
{
Assert(ENABLE_DSS && SS_REPLICATION_DORADO_CLUSTER);
Assert(fd > 0);
errno = EOK;
if (pwrite(fd, buffer, SS_DORADO_CTL_INFO_SIZE, 0) != SS_DORADO_CTL_INFO_SIZE) {
if (errno == 0) {
errno = ENOSPC;
}
ereport(PANIC, (errcode_for_file_access(), errmsg("could not write to ss ctl info file: %s", TRANSLATE_ERRNO)));
}
if (pg_fsync(fd) != 0) {
ereport(PANIC, (errcode_for_file_access(), errmsg("could not fsync ss ctl info file: %s", TRANSLATE_ERRNO)));
}
}
void SSReadDoradoCtlInfoFile()
{
Assert(ENABLE_DSS && SS_REPLICATION_DORADO_CLUSTER);
int fd = BasicOpenFile(SS_DORADO_CTRL_FILE, O_RDWR | PG_BINARY | O_DIRECT, S_IRUSR | S_IWUSR);
if (fd < 0) {
ereport(FATAL, (errcode_for_file_access(), errmsg("could not open ss ctl into file \"%s\": %s",
SS_DORADO_CTRL_FILE, TRANSLATE_ERRNO)));
}
int readSize = CalShareStorageCtlSize();
char buffer[readSize] __attribute__ ((__aligned__(ALIGNOF_BUFFER)));
if (pread(fd, buffer, SS_DORADO_CTL_INFO_SIZE, 0) != SS_DORADO_CTL_INFO_SIZE) {
ereport(PANIC, (errcode_for_file_access(), errmsg("could not read ss ctl into file: %s", TRANSLATE_ERRNO)));
}
}
void NormalClusterDoradoStorageInit()
{
bool found = false;

2
src/gausskernel/storage/replication/ss_cluster_replication.cpp
View File

@ -169,7 +169,7 @@ void SSClusterDoradoStorageInit()
void UpdateSSDoradoCtlInfoAndSync()
{
if (!SS_REPLICATION_DORADO_CLUSTER) {
if (!SS_REPLICATION_PRIMARY_NODE) {
return;
}