Repository: incubator-hawq Updated Branches: refs/heads/master d1d09bfd2 -> 5d54d9afa
HAWQ-1457. Shared memory for SegmentStatus and MetadataCache should not be allocated on segments. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/5d54d9af Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/5d54d9af Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/5d54d9af Branch: refs/heads/master Commit: 5d54d9afab66c3d61316228b034046e108cbd90f Parents: d1d09bf Author: Paul Guo <[email protected]> Authored: Wed May 10 18:31:09 2017 +0800 Committer: Paul Guo <[email protected]> Committed: Wed May 10 18:31:09 2017 +0800 ---------------------------------------------------------------------- src/backend/storage/ipc/ipci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5d54d9af/src/backend/storage/ipc/ipci.c ---------------------------------------------------------------------- diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 54638d4..b0daed7 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -170,10 +170,9 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port) size = add_size(size, PersistentRelfile_ShmemSize()); size = add_size(size, Pass2Recovery_ShmemSize()); size = add_size(size, FSCredShmemSize()); - if ((AmIMaster() || AmIStandby()) && Gp_role == GP_ROLE_DISPATCH) { + + if ((AmIMaster() || AmIStandby()) && (Gp_role == GP_ROLE_DISPATCH || Gp_role == GP_ROLE_UTILITY)) size = add_size(size, SegmentStatus_ShmSize()); - elog(WARNING, "add_size %d on pid %d", (int)size, getpid()); - } if ((AmIMaster() || AmIStandby()) && (Gp_role == GP_ROLE_DISPATCH || Gp_role == GP_ROLE_UTILITY)) { @@ -369,7 +368,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port) FSCredShmemInit(); - if ((AmIMaster() || AmIStandby()) && Gp_role == GP_ROLE_DISPATCH) + if ((AmIMaster() || AmIStandby()) && (Gp_role == GP_ROLE_DISPATCH || Gp_role == GP_ROLE_UTILITY)) SegmentStatusShmemInit(); #ifdef EXEC_BACKEND
