external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly handle error at owner check (#6984) 

We did not properly handle the error at ownership check method, which
causes `max stack depth for errors` as in
https://github.com/citusdata/citus/issues/6980.

**Fix:**
In case of an error, we should rollback subtransaction and throw the
message with log level to `LOG_SERVER_ONLY`.

Note: We prevent logs from the client to prevent pg vanilla test
failures due to Citus logs which differs from the actual Postgres logs.
(For context: https://github.com/citusdata/citus/pull/6130)

I also needed to fix a flaky test: `multi_schema_support`

DESCRIPTION: Fixes a bug related to non-existent objects in DDL
commands.

Fixes https://github.com/citusdata/citus/issues/6980
pull/7024/head
aykut-bozkurt 2023-06-21 14:50:01 +03:00 committed by GitHub
parent 69af3e8509
commit 565c5260fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/backend/distributed/utils/citus_depended_object.c
View File

@ -462,21 +462,25 @@ HasDropCommandViolatesOwnership(Node *node)
static bool
AnyObjectViolatesOwnership(DropStmt *dropStmt)
{
bool hasOwnershipViolation = false;
volatile ObjectAddress objectAddress = { 0 };
Relation relation = NULL;
bool objectViolatesOwnership = false;
ObjectType objectType = dropStmt->removeType;
bool missingOk = dropStmt->missing_ok;
Node *object = NULL;
foreach_ptr(object, dropStmt->objects)
MemoryContext savedContext = CurrentMemoryContext;
ResourceOwner savedOwner = CurrentResourceOwner;
BeginInternalSubTransaction(NULL);
MemoryContextSwitchTo(savedContext);
PG_TRY();
{
PG_TRY();
Node *object = NULL;
foreach_ptr(object, dropStmt->objects)
{
objectAddress = get_object_address(objectType, object,
&relation, AccessShareLock, missingOk);
if (OidIsValid(objectAddress.objectId))
{
/*
@ -487,29 +491,39 @@ AnyObjectViolatesOwnership(DropStmt *dropStmt)
objectAddress,
object, relation);
}
}
PG_CATCH();
{
if (OidIsValid(objectAddress.objectId))
if (relation != NULL)
{
/* ownership violation */
objectViolatesOwnership = true;
relation_close(relation, NoLock);
relation = NULL;
}
}
PG_END_TRY();
ReleaseCurrentSubTransaction();
MemoryContextSwitchTo(savedContext);
CurrentResourceOwner = savedOwner;
}
PG_CATCH();
{
MemoryContextSwitchTo(savedContext);
ErrorData *edata = CopyErrorData();
FlushErrorState();
hasOwnershipViolation = true;
if (relation != NULL)
{
relation_close(relation, AccessShareLock);
relation_close(relation, NoLock);
relation = NULL;
}
RollbackAndReleaseCurrentSubTransaction();
MemoryContextSwitchTo(savedContext);
CurrentResourceOwner = savedOwner;
/* we found ownership violation, so can return here */
if (objectViolatesOwnership)
{
return true;
}
/* Rethrow error with LOG_SERVER_ONLY to prevent log to be sent to client */
edata->elevel = LOG_SERVER_ONLY;
ThrowErrorData(edata);
}
PG_END_TRY();
return false;
return hasOwnershipViolation;
}

5
src/test/regress/expected/multi_schema_support.out
View File

@ -1095,6 +1095,9 @@ ALTER TABLE IF EXISTS non_existent_table SET SCHEMA non_existent_schema;
NOTICE: relation "non_existent_table" does not exist, skipping
DROP SCHEMA existing_schema, another_existing_schema CASCADE;
NOTICE: drop cascades to table existing_schema.table_set_schema
-- test DROP SCHEMA with nonexisting schemas
DROP SCHEMA ax, bx, cx, dx, ex, fx, gx, jx;
ERROR: schema "ax" does not exist
-- test ALTER TABLE SET SCHEMA with interesting names
CREATE SCHEMA "cItuS.T E E N'sSchema";
CREATE SCHEMA "citus-teen's scnd schm.";
@ -1390,6 +1393,7 @@ SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM pg_catalog.p
(schema,{run_test_schema},{})
(1 row)
DROP TABLE public.nation_local;
DROP SCHEMA run_test_schema, test_schema_support_join_1, test_schema_support_join_2, "Citus'Teen123", "CiTUS.TEEN2", bar, test_schema_support CASCADE;
-- verify that the dropped schema is removed from worker's pg_dist_object
SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM pg_catalog.pg_dist_object
@ -1398,4 +1402,3 @@ SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM pg_catalog.p
---------------------------------------------------------------------
(0 rows)
DROP TABLE public.nation_local CASCADE;

5
src/test/regress/sql/multi_schema_support.sql
View File

@ -802,6 +802,9 @@ ALTER TABLE IF EXISTS non_existent_table SET SCHEMA non_existent_schema;
DROP SCHEMA existing_schema, another_existing_schema CASCADE;
-- test DROP SCHEMA with nonexisting schemas
DROP SCHEMA ax, bx, cx, dx, ex, fx, gx, jx;
-- test ALTER TABLE SET SCHEMA with interesting names
CREATE SCHEMA "cItuS.T E E N'sSchema";
CREATE SCHEMA "citus-teen's scnd schm.";
@ -985,8 +988,8 @@ SET client_min_messages TO WARNING;
SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM pg_catalog.pg_dist_object
WHERE classid=2615 and objid IN (select oid from pg_namespace where nspname='run_test_schema');
DROP TABLE public.nation_local;
DROP SCHEMA run_test_schema, test_schema_support_join_1, test_schema_support_join_2, "Citus'Teen123", "CiTUS.TEEN2", bar, test_schema_support CASCADE;
-- verify that the dropped schema is removed from worker's pg_dist_object
SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM pg_catalog.pg_dist_object
WHERE classid=2615 and objid IN (select oid from pg_namespace where nspname='run_test_schema');
DROP TABLE public.nation_local CASCADE;