diff options
| author | Amit Kapila | 2021-07-19 05:06:15 +0000 |
|---|---|---|
| committer | Amit Kapila | 2021-07-19 05:06:15 +0000 |
| commit | 29abde637bbb4b8fcdc96e049813890afa5ab671 (patch) | |
| tree | 9b90b99b8a836d407f047ea205591602fa27b278 | |
| parent | 04cad8f7bcd63fac567e49fd72e6df42b3b251a9 (diff) | |
Don't allow to set replication slot_name as ''.
We don't allow to create replication slot_name as an empty string ('') via
SQL API pg_create_logical_replication_slot() but it is allowed to be set
via Alter Subscription command. This will lead to apply worker repeatedly
keep trying to stream data via slot_name '' and the user is not allowed to
create the slot with that name.
Author: Japin Li
Reviewed-By: Ranier Vilela, Amit Kapila
Backpatch-through: 10, where it was introduced
Discussion: https://postgr.es/m/MEYP282MB1669CBD98E721C77CA696499B61A9@MEYP282MB1669.AUSP282.PROD.OUTLOOK.COM
| -rw-r--r-- | src/backend/commands/subscriptioncmds.c | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/subscription.out | 3 | ||||
| -rw-r--r-- | src/test/regress/sql/subscription.sql | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index cc4c1b47e4..22ae982328 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -173,6 +173,8 @@ parse_subscription_options(ParseState *pstate, List *stmt_options, /* Setting slot_name = NONE is treated as no slot name. */ if (strcmp(opts->slot_name, "none") == 0) opts->slot_name = NULL; + else + ReplicationSlotValidateName(opts->slot_name, ERROR); } else if (IsSet(supported_opts, SUBOPT_COPY_DATA) && strcmp(defel->defname, "copy_data") == 0) diff --git a/src/test/regress/expected/subscription.out b/src/test/regress/expected/subscription.out index ad6b4e4bd3..67f92b3878 100644 --- a/src/test/regress/expected/subscription.out +++ b/src/test/regress/expected/subscription.out @@ -86,6 +86,9 @@ ALTER SUBSCRIPTION regress_testsub SET PUBLICATION testpub2, testpub3 WITH (refr ALTER SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist2'; ALTER SUBSCRIPTION regress_testsub SET (slot_name = 'newname'); -- fail +ALTER SUBSCRIPTION regress_testsub SET (slot_name = ''); +ERROR: replication slot name "" is too short +-- fail ALTER SUBSCRIPTION regress_doesnotexist CONNECTION 'dbname=regress_doesnotexist2'; ERROR: subscription "regress_doesnotexist" does not exist ALTER SUBSCRIPTION regress_testsub SET (create_slot = false); diff --git a/src/test/regress/sql/subscription.sql b/src/test/regress/sql/subscription.sql index b732871407..88743ab33b 100644 --- a/src/test/regress/sql/subscription.sql +++ b/src/test/regress/sql/subscription.sql @@ -66,6 +66,9 @@ ALTER SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist2'; ALTER SUBSCRIPTION regress_testsub SET (slot_name = 'newname'); -- fail +ALTER SUBSCRIPTION regress_testsub SET (slot_name = ''); + +-- fail ALTER SUBSCRIPTION regress_doesnotexist CONNECTION 'dbname=regress_doesnotexist2'; ALTER SUBSCRIPTION regress_testsub SET (create_slot = false); |