git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Disallow CREATE/DROP SUBSCRIPTION in transaction block

author Peter Eisentraut <peter_e@gmx.net>

Sat, 4 Mar 2017 04:25:34 +0000 (23:25 -0500)

committer Peter Eisentraut <peter_e@gmx.net>

Sat, 4 Mar 2017 04:29:13 +0000 (23:29 -0500)

Disallow CREATE SUBSCRIPTION and DROP SUBSCRIPTION in a transaction
block when the replication slot is to be created or dropped, since that
cannot be rolled back.

based on patch by Masahiko Sawada <sawada.mshk@gmail.com>

doc/src/sgml/ref/create_subscription.sgml patch | blob | blame | history

doc/src/sgml/ref/drop_subscription.sgml patch | blob | blame | history

src/backend/commands/subscriptioncmds.c patch | blob | blame | history

src/backend/tcop/utility.c patch | blob | blame | history

src/include/commands/subscriptioncmds.h patch | blob | blame | history

src/test/regress/expected/subscription.out patch | blob | blame | history

src/test/regress/sql/subscription.sql patch | blob | blame | history

diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml

index 250806f981b5d38164424bfbc42718862f5d656d..9bed26219c684129a48af03a987d7eb478aa38ae 100644 (file)

--- a/doc/src/sgml/ref/create_subscription.sgml

+++ b/doc/src/sgml/ref/create_subscription.sgml

@@ -51,6 +51,11 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl

subscription at the commit of the transaction where this command is run.

</para>

+ <para>

+ <command>CREATE SUBSCRIPTION</command> cannot be executed inside a

+ transaction block when <literal>CREATE SLOT</literal> is specified.

+ </para>

<para>

Additional info about subscriptions and logical replication as a whole

can is available at <xref linkend="logical-replication-subscription"> and

diff --git a/doc/src/sgml/ref/drop_subscription.sgml b/doc/src/sgml/ref/drop_subscription.sgml

index 9f2fb93275ca61cce9fe0dff788354323e9d101b..4228f1a25339f1e100030d48c32ee963c4339893 100644 (file)

--- a/doc/src/sgml/ref/drop_subscription.sgml

+++ b/doc/src/sgml/ref/drop_subscription.sgml

@@ -38,8 +38,8 @@ DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable

</para>

<para>

- The replication worker associated with the subscription will not stop until

- after the transaction that issued this command has committed.

+ <command>DROP SUBSCRIPTION</command> cannot be executed inside a

+ transaction block when <literal>DROP SLOT</literal> is specified.

</para>

</refsect1>

diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c

index 0e081388c47f21c4d56b530111eddeada75bba8b..0036d99c2e09c5f18161921982ead21abf68e1b8 100644 (file)

--- a/src/backend/commands/subscriptioncmds.c

+++ b/src/backend/commands/subscriptioncmds.c

@@ -18,6 +18,7 @@

#include "access/heapam.h"

#include "access/htup_details.h"

+#include "access/xact.h"

#include "catalog/indexing.h"

#include "catalog/objectaccess.h"

@@ -204,7 +205,7 @@ publicationListToArray(List *publist)

* Create new subscription.

ObjectAddress

-CreateSubscription(CreateSubscriptionStmt *stmt)

+CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel)

{

Relation rel;

ObjectAddress myself;

@@ -221,6 +222,23 @@ CreateSubscription(CreateSubscriptionStmt *stmt)

bool create_slot;

List *publications;

+ /*

+ * Parse and check options.

+ * Connection and publication should not be specified here.

+ */

+ parse_subscription_options(stmt->options, NULL, NULL,

+ &enabled_given, &enabled,

+ &create_slot, &slotname);

+ /*

+ * Since creating a replication slot is not transactional, rolling back

+ * the transaction leaves the created replication slot. So we cannot run

+ * CREATE SUBSCRIPTION inside a transaction block if creating a

+ * replication slot.

+ */

+ if (create_slot)

+ PreventTransactionChain(isTopLevel, "CREATE SUBSCRIPTION ... CREATE SLOT");

if (!superuser())

ereport(ERROR,

(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),

@@ -239,13 +257,6 @@ CreateSubscription(CreateSubscriptionStmt *stmt)

stmt->subname)));

}

- /*

- * Parse and check options.

- * Connection and publication should not be specified here.

- */

- parse_subscription_options(stmt->options, NULL, NULL,

- &enabled_given, &enabled,

- &create_slot, &slotname);

if (slotname == NULL)

slotname = stmt->subname;

@@ -424,7 +435,7 @@ AlterSubscription(AlterSubscriptionStmt *stmt)

* Drop a subscription

void

-DropSubscription(DropSubscriptionStmt *stmt)

+DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)

{

Relation rel;

ObjectAddress myself;

@@ -441,6 +452,15 @@ DropSubscription(DropSubscriptionStmt *stmt)

WalReceiverConn *wrconn = NULL;

StringInfoData cmd;

+ /*

+ * Since dropping a replication slot is not transactional, the replication

+ * slot stays dropped even if the transaction rolls back. So we cannot

+ * run DROP SUBSCRIPTION inside a transaction block if dropping the

+ * replication slot.

+ */

+ if (stmt->drop_slot)

+ PreventTransactionChain(isTopLevel, "DROP SUBSCRIPTION ... DROP SLOT");

rel = heap_open(SubscriptionRelationId, RowExclusiveLock);

tup = SearchSysCache2(SUBSCRIPTIONNAME, MyDatabaseId,

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c

index 3bc0ae5e7e6aad8fbafbce1f9354ca14995b7638..20b527340543b3003caf540c25af764fa674d148 100644 (file)

--- a/src/backend/tcop/utility.c

+++ b/src/backend/tcop/utility.c

@@ -1609,7 +1609,8 @@ ProcessUtilitySlow(ParseState *pstate,

break;

case T_CreateSubscriptionStmt:

- address = CreateSubscription((CreateSubscriptionStmt *) parsetree);

+ address = CreateSubscription((CreateSubscriptionStmt *) parsetree,

+ isTopLevel);

break;

case T_AlterSubscriptionStmt:

@@ -1617,7 +1618,7 @@ ProcessUtilitySlow(ParseState *pstate,

break;

case T_DropSubscriptionStmt:

- DropSubscription((DropSubscriptionStmt *) parsetree);

+ DropSubscription((DropSubscriptionStmt *) parsetree, isTopLevel);

/* no commands stashed for DROP */

commandCollected = true;

break;

diff --git a/src/include/commands/subscriptioncmds.h b/src/include/commands/subscriptioncmds.h

index 127696c60d52d156ae7d669261600233509d619a..17658793331f236647d48770a1d16babb6c3dd2e 100644 (file)

--- a/src/include/commands/subscriptioncmds.h

+++ b/src/include/commands/subscriptioncmds.h

@@ -18,9 +18,10 @@

#include "catalog/objectaddress.h"

#include "nodes/parsenodes.h"

-extern ObjectAddress CreateSubscription(CreateSubscriptionStmt *stmt);

+extern ObjectAddress CreateSubscription(CreateSubscriptionStmt *stmt,

+ bool isTopLevel);

extern ObjectAddress AlterSubscription(AlterSubscriptionStmt *stmt);

-extern void DropSubscription(DropSubscriptionStmt *stmt);

+extern void DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel);

extern ObjectAddress AlterSubscriptionOwner(const char *name, Oid newOwnerId);

extern void AlterSubscriptionOwner_oid(Oid subid, Oid newOwnerId);

diff --git a/src/test/regress/expected/subscription.out b/src/test/regress/expected/subscription.out

index cb1ab4e7914a4143a3be5ce82017cc45f205e5de..a8a61ee8afa7e0f788998919de0e36a750f498bd 100644 (file)

--- a/src/test/regress/expected/subscription.out

+++ b/src/test/regress/expected/subscription.out

@@ -14,6 +14,11 @@ ERROR: syntax error at or near "PUBLICATION"

LINE 1: CREATE SUBSCRIPTION testsub PUBLICATION foo;

set client_min_messages to error;

+-- fail - cannot do CREATE SUBSCRIPTION CREATE SLOT inside transaction block

+BEGIN;

+CREATE SUBSCRIPTION testsub CONNECTION 'testconn' PUBLICATION testpub WITH (CREATE SLOT);

+ERROR: CREATE SUBSCRIPTION ... CREATE SLOT cannot run inside a transaction block

+COMMIT;

CREATE SUBSCRIPTION testsub CONNECTION 'testconn' PUBLICATION testpub;

ERROR: invalid connection string syntax: missing "=" after "testconn" in connection info string

@@ -69,6 +74,13 @@ ALTER SUBSCRIPTION testsub RENAME TO testsub_foo;

testsub_foo | regress_subscription_user | f | {testpub,testpub1}

(1 row)

+-- fail - cannot do DROP SUBSCRIPTION DROP SLOT inside transaction block

+BEGIN;

+DROP SUBSCRIPTION testsub DROP SLOT;

+ERROR: DROP SUBSCRIPTION ... DROP SLOT cannot run inside a transaction block

+COMMIT;

+BEGIN;

DROP SUBSCRIPTION testsub_foo NODROP SLOT;

+COMMIT;

RESET SESSION AUTHORIZATION;

DROP ROLE regress_subscription_user;

diff --git a/src/test/regress/sql/subscription.sql b/src/test/regress/sql/subscription.sql

index fce6069a9cd71f9a281ba0862b3d147adae2a826..0b6c8a3f5c92c1707e1dade764addbc0160ec416 100644 (file)

--- a/src/test/regress/sql/subscription.sql

+++ b/src/test/regress/sql/subscription.sql

@@ -12,6 +12,11 @@ CREATE SUBSCRIPTION testsub CONNECTION 'foo';

CREATE SUBSCRIPTION testsub PUBLICATION foo;

set client_min_messages to error;

+-- fail - cannot do CREATE SUBSCRIPTION CREATE SLOT inside transaction block

+BEGIN;

+CREATE SUBSCRIPTION testsub CONNECTION 'testconn' PUBLICATION testpub WITH (CREATE SLOT);

+COMMIT;

CREATE SUBSCRIPTION testsub CONNECTION 'testconn' PUBLICATION testpub;

CREATE SUBSCRIPTION testsub CONNECTION 'dbname=doesnotexist' PUBLICATION testpub WITH (DISABLED, NOCREATE SLOT);

reset client_min_messages;

@@ -42,7 +47,14 @@ ALTER SUBSCRIPTION testsub RENAME TO testsub_foo;

\dRs

+-- fail - cannot do DROP SUBSCRIPTION DROP SLOT inside transaction block

+BEGIN;

+DROP SUBSCRIPTION testsub DROP SLOT;

+COMMIT;

+BEGIN;

DROP SUBSCRIPTION testsub_foo NODROP SLOT;

+COMMIT;

RESET SESSION AUTHORIZATION;

DROP ROLE regress_subscription_user;

This is the main PostgreSQL git repository.

RSS Atom