Skip to content

Commit bfa2a92

Browse files
author
Amit Kapila
committed
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
1 parent e159368 commit bfa2a92

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

src/backend/commands/subscriptioncmds.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "nodes/makefuncs.h"
3535
#include "replication/logicallauncher.h"
3636
#include "replication/origin.h"
37+
#include "replication/slot.h"
3738
#include "replication/walreceiver.h"
3839
#include "replication/walsender.h"
3940
#include "replication/worker_internal.h"
@@ -139,6 +140,8 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given,
139140
/* Setting slot_name = NONE is treated as no slot name. */
140141
if (strcmp(*slot_name, "none") == 0)
141142
*slot_name = NULL;
143+
else
144+
ReplicationSlotValidateName(*slot_name, ERROR);
142145
}
143146
else if (strcmp(defel->defname, "copy_data") == 0 && copy_data)
144147
{

src/test/regress/expected/subscription.out

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ ALTER SUBSCRIPTION regress_testsub SET PUBLICATION testpub2, testpub3 WITH (refr
8686
ALTER SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist2';
8787
ALTER SUBSCRIPTION regress_testsub SET (slot_name = 'newname');
8888
-- fail
89+
ALTER SUBSCRIPTION regress_testsub SET (slot_name = '');
90+
ERROR: replication slot name "" is too short
91+
-- fail
8992
ALTER SUBSCRIPTION regress_doesnotexist CONNECTION 'dbname=regress_doesnotexist2';
9093
ERROR: subscription "regress_doesnotexist" does not exist
9194
ALTER SUBSCRIPTION regress_testsub SET (create_slot = false);

src/test/regress/sql/subscription.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ ALTER SUBSCRIPTION regress_testsub SET PUBLICATION testpub2, testpub3 WITH (refr
6565
ALTER SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist2';
6666
ALTER SUBSCRIPTION regress_testsub SET (slot_name = 'newname');
6767

68+
-- fail
69+
ALTER SUBSCRIPTION regress_testsub SET (slot_name = '');
70+
6871
-- fail
6972
ALTER SUBSCRIPTION regress_doesnotexist CONNECTION 'dbname=regress_doesnotexist2';
7073
ALTER SUBSCRIPTION regress_testsub SET (create_slot = false);

0 commit comments

Comments
 (0)