merge 6.0.0 into 6.0.0

pgsql_tmp路径不对

Created-by: jiangyan_jack
Commit-by: jiangyan
Merged-by: opengauss_bot
Description: 【标题】(请简要描述下实现的内容)

【实现内容】:

【根因分析】:
需要排除的目录中,只有pgsql_tmp和其他目录不在一层,gdb发现每次传进来的rel_path都是base/pgsql_tmp
![image.png](https://raw.gitcode.com/user-images/assets/5089689/244752aa-454e-4f85-9108-efa384a32052/image.png 'image.png')
![image.png](https://raw.gitcode.com/user-images/assets/5089689/01301adc-faac-4ebc-bed7-1d696635ddf5/image.png 'image.png')
![04621fb4bbda2ddb65b67390033f0e7.png](https://raw.gitcode.com/user-images/assets/5089689/f1f3cff7-4581-4453-8c23-c1ea1df92d04/04621fb4bbda2ddb65b67390033f0e7.png '04621fb4bbda2ddb65b67390033f0e7.png')
【实现方案】:

【关联需求或issue】:
https://gitcode.com/opengauss/openGauss-server/issues/7114
【开发自验报告】:
1. 请附上自验结果(内容或者截图)
修改前
![image.png](https://raw.gitcode.com/user-images/assets/5089689/6befead3-86e3-4dfb-9bb9-cafa53d531a1/image.png 'image.png')
修改后
![image.png](https://raw.gitcode.com/user-images/assets/5089689/edcac6f7-14dd-48af-9417-013962777fc4/image.png 'image.png')
2. 是否可以添加fastcheck测试用例,如是,请补充fastcheck用例
3. 是否涉及资料修改,如是,在docs仓库补充资料
4. 是否考虑升级场景(系统表修改、日志持久化以及修改执行态数据格式)
5. 是否考虑在线扩容等扩展场景
6. 是否考虑异常场景/并发场景/前向兼容/性能场景
7. 是否对其他模块产生影响

【其他说明】:

See merge request: opengauss/openGauss-server!7980
This commit is contained in:
opengauss_bot
2025-06-24 09:36:12 +08:00

View File

@ -42,7 +42,7 @@ const char *pgdata_exclude_dir[] =
* there.
*/
(const char *)"pg_stat_tmp",
(const char *)"pgsql_tmp",
(const char *)"base/pgsql_tmp",
/* Contents removed on startup, see dsm_cleanup_for_mmap(). */
(const char *)"pg_dynshmem",