diff options
| author | Amit Kapila <akapila@postgresql.org> | 2021-07-19 11:15:03 +0530 |
|---|---|---|
| committer | Amit Kapila <akapila@postgresql.org> | 2021-07-19 11:15:03 +0530 |
| commit | f2f459f182fc8b1af44e422e2324b7acd5ee2408 (patch) | |
| tree | a78ee3e79b66337ab7c6c0a5a51fe5944e3c601e | |
| parent | df12b625a6885cd200e580ebcc605209a16e17ad (diff) | |
| download | postgresql-f2f459f182fc8b1af44e422e2324b7acd5ee2408.tar.gz postgresql-f2f459f182fc8b1af44e422e2324b7acd5ee2408.zip | |
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 | 3 | ||||
| -rw-r--r-- | src/test/regress/expected/subscription.out | 3 | ||||
| -rw-r--r-- | src/test/regress/sql/subscription.sql | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index 5b02e0de0fb..ee255cf6834 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -40,6 +40,7 @@ #include "replication/logicallauncher.h" #include "replication/origin.h" +#include "replication/slot.h" #include "replication/walreceiver.h" #include "replication/walsender.h" #include "replication/worker_internal.h" @@ -146,6 +147,8 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given, /* Setting slot_name = NONE is treated as no slot name. */ if (strcmp(*slot_name, "none") == 0) *slot_name = NULL; + else + ReplicationSlotValidateName(*slot_name, ERROR); } else if (strcmp(defel->defname, "copy_data") == 0 && copy_data) { diff --git a/src/test/regress/expected/subscription.out b/src/test/regress/expected/subscription.out index 3ba1e5dcdd5..1a7ca156ec4 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 1bc58887f7e..277b9290dbe 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); |