Skip to content

Fix Oid display errors in the log or message #1583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fairyfar wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −13
Open

Fix Oid display errors in the log or message #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/backend/commands/resgroupcmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ GetResGroupCapabilities(Relation rel, Oid groupId, ResGroupCaps *resgroupCaps)
{
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("cannot find limit capabilities for resource group: %d",
errmsg("cannot find limit capabilities for resource group: %u",
groupId)));
}
}
Expand Down Expand Up @@ -1370,7 +1370,7 @@ validateCapabilities(Relation rel,

ereport(ERROR,
(errcode(ERRCODE_DUPLICATE_OBJECT),
errmsg("found duplicate resource group id: %d",
errmsg("found duplicate resource group id: %u",
groupid)));
}

Expand Down
2 changes: 1 addition & 1 deletion src/backend/commands/user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ AlterRole(AlterRoleStmt *stmt)
if (!HeapTupleIsValid(profiletuple))
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("profile \"%d\" does not exist", profileid)));
errmsg("profile \"%u\" does not exist", profileid)));

/* Get PASSWORD_REUSE_MAX from profile tuple and transform it to normal value */
profileform = (Form_pg_profile) GETSTRUCT(profiletuple);
Expand Down
6 changes: 3 additions & 3 deletions src/backend/utils/resgroup/cgroup-ops-linux-v1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ createcgroup_v1(Oid group)
(gp_resource_group_enable_cgroup_cpuset &&
!createDir(group, CGROUP_COMPONENT_CPUSET, "")))
{
CGROUP_ERROR("can't create cgroup for resource group '%d': %m", group);
CGROUP_ERROR("can't create cgroup for resource group '%u': %m", group);
}

/*
Expand Down Expand Up @@ -707,7 +707,7 @@ create_default_cpuset_group_v1(void)

if (!createDir(DEFAULT_CPUSET_GROUP_ID, component, ""))
{
CGROUP_ERROR("can't create cpuset cgroup for resgroup '%d': %m",
CGROUP_ERROR("can't create cpuset cgroup for resgroup '%u': %m",
DEFAULT_CPUSET_GROUP_ID);
}

Expand Down Expand Up @@ -926,7 +926,7 @@ destroycgroup_v1(Oid group, bool migrate)
(gp_resource_group_enable_cgroup_cpuset &&
!deleteDir(group, CGROUP_COMPONENT_CPUSET, NULL, migrate, detachcgroup_v1)))
{
CGROUP_ERROR("can't remove cgroup for resource group '%d': %m", group);
CGROUP_ERROR("can't remove cgroup for resource group '%u': %m", group);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/backend/utils/resgroup/cgroup-ops-linux-v2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ createcgroup_v2(Oid group)
if (!createDir(group, CGROUP_COMPONENT_PLAIN, "") ||
!createDir(group, CGROUP_COMPONENT_PLAIN, CGROUPV2_LEAF_INDENTIFIER))
{
CGROUP_ERROR("can't create cgroup for resource group '%d': %m", group);
CGROUP_ERROR("can't create cgroup for resource group '%u': %m", group);
}

/*
Expand Down Expand Up @@ -421,7 +421,7 @@ create_default_cpuset_group_v2(void)

if (!createDir(DEFAULT_CPUSET_GROUP_ID, component, ""))
{
CGROUP_ERROR("can't create cpuset cgroup for resgroup '%d': %m",
CGROUP_ERROR("can't create cpuset cgroup for resgroup '%u': %m",
DEFAULT_CPUSET_GROUP_ID);
}

Expand Down Expand Up @@ -626,7 +626,7 @@ destroycgroup_v2(Oid group, bool migrate)
{
if (!deleteDir(group, CGROUP_COMPONENT_PLAIN, NULL, migrate, detachcgroup_v2))
{
CGROUP_ERROR("can't remove cgroup for resource group '%d': %m", group);
CGROUP_ERROR("can't remove cgroup for resource group '%u': %m", group);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/backend/utils/resgroup/resgroup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,7 @@ groupHashFind(Oid groupId, bool raise)
{
ereport(raise ? ERROR : LOG,
(errcode(ERRCODE_DATA_CORRUPTED),
errmsg("cannot find resource group with Oid %d in shared memory",
errmsg("cannot find resource group with Oid %u in shared memory",
groupId)));
return NULL;
}
Expand Down Expand Up @@ -1971,7 +1971,7 @@ groupHashRemove(Oid groupId)
if (!found)
ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED),
errmsg("cannot find resource group with Oid %d in shared memory to remove",
errmsg("cannot find resource group with Oid %u in shared memory to remove",
groupId)));

group = &pResGroupControl->groups[entry->index];
Expand Down Expand Up @@ -3537,7 +3537,7 @@ ResGroupMoveQuery(int sessionId, Oid groupId, const char *groupName)
{
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
(errmsg("invalid resource group id: %d", groupId))));
(errmsg("invalid resource group id: %u", groupId))));
}

groupInfo.group = group;
Expand All @@ -3546,7 +3546,7 @@ ResGroupMoveQuery(int sessionId, Oid groupId, const char *groupName)
if (slot == NULL)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_RESOURCES),
(errmsg("cannot get slot in resource group %d", groupId))));
(errmsg("cannot get slot in resource group %u", groupId))));

PG_TRY();
{
Expand Down
Loading