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

!2877 更新DMS和DSS commit点，解决cm_res_get_stat并发导致的内存问题

Browse Source 
Merge pull request !2877 from peibaoyi/master
This commit is contained in:
opengauss-bot
2023-02-08 02:10:25 +00:00
committed by Gitee
parent 39c2d3eeef 5091b95a60
commit 8cec403fac
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/backend/utils/misc/guc/guc_storage.cpp
View File

@ -5993,7 +5993,7 @@ static void assign_ss_log_max_file_size(int newval, void *extra)
{
g_instance.attr.attr_storage.dms_attr.sslog_max_file_size = newval;
if (t_thrd.proc_cxt.MyProcPid == PostmasterPid) {
unsigned long long val = (unsigned long long)newval;
unsigned long long val = (unsigned long long)newval * 1024;
if (ENABLE_DMS) {
DMSRefreshLogger("LOG_MAX_FILE_SIZE", &val);
}

4
src/gausskernel/ddes/ddes_commit_id
View File

@ -1,2 +1,2 @@
dms_commit_id=84ccd2b17f411e96119b4d02644647e45e082789
dss_commit_id=5cbcec9ce4b88f85a83d229a118d31db6ed1fea2
dms_commit_id=9bbe1c8b87d64f81201f91b7198dd16e03c99d2a
dss_commit_id=7f714909f4477564cd44fc307af780b24daf55d4

3
src/include/ddes/dms/dms_api.h
View File

@ -736,6 +736,7 @@ typedef struct st_dms_profile {
unsigned short mfc_max_wait_ticket_time; // max time to wait for ticket while sending a message
unsigned int page_size;
unsigned long long recv_msg_buf_size;
unsigned int log_level;
dms_conn_mode_t pipe_type; // Inter-instance communication mode. Currently, only TCP and RDMA are supported.
unsigned int inst_cnt; // Number of cluster instances
@ -783,7 +784,7 @@ typedef struct st_logger_param {
#define DMS_LOCAL_MINOR_VER_WEIGHT 1000
#define DMS_LOCAL_MAJOR_VERSION 0
#define DMS_LOCAL_MINOR_VERSION 0
#define DMS_LOCAL_VERSION 46
#define DMS_LOCAL_VERSION 47
#ifdef __cplusplus
}