diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index bbbfc719a5e3b23f8dc71b0cdbaaaaca2ae67584..aad2cbba7304c59fdc5a9f5b4485e23e501e7d45 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -1591,6 +1591,11 @@ if (!triggered) Plugins and extensions - <command>LOAD</> </para> </listitem> + <listitem> + <para> + <command>UNLISTEN</command> + </para> + </listitem> </itemizedlist> </para> @@ -1680,7 +1685,7 @@ if (!triggered) </listitem> <listitem> <para> - <command>LISTEN</>, <command>UNLISTEN</>, <command>NOTIFY</> + <command>LISTEN</>, <command>NOTIFY</> </para> </listitem> </itemizedlist> @@ -1688,8 +1693,8 @@ if (!triggered) <para> In normal operation, <quote>read-only</> transactions are allowed to - use <command>LISTEN</>, <command>UNLISTEN</>, and - <command>NOTIFY</>, so Hot Standby sessions operate under slightly tighter + use <command>LISTEN</command> and <command>NOTIFY</command>, + so Hot Standby sessions operate under slightly tighter restrictions than ordinary read-only sessions. It is possible that some of these restrictions might be loosened in a future release. </para> diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 872c2e9ce5ab4a319c0a43928fc016f939efb4c5..3aa49d9079b6410ad5783ab7aa58e41239c6a81e 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -608,7 +608,7 @@ standard_ProcessUtility(Node *parsetree, { UnlistenStmt *stmt = (UnlistenStmt *) parsetree; - PreventCommandDuringRecovery("UNLISTEN"); + /* we allow UNLISTEN during recovery, as it's a noop */ CheckRestrictedOperation("UNLISTEN"); if (stmt->conditionname) Async_Unlisten(stmt->conditionname); diff --git a/src/test/regress/expected/hs_standby_allowed.out b/src/test/regress/expected/hs_standby_allowed.out index c26c9822f63555c2ad4bf3b9b40b8440ab271fcb..b2efb4195d9b1d3cadba9ed9ec100c7d0062b614 100644 --- a/src/test/regress/expected/hs_standby_allowed.out +++ b/src/test/regress/expected/hs_standby_allowed.out @@ -208,6 +208,9 @@ LOCK hs1 IN ACCESS SHARE MODE; LOCK hs1 IN ROW SHARE MODE; LOCK hs1 IN ROW EXCLUSIVE MODE; COMMIT; +-- UNLISTEN +UNLISTEN a; +UNLISTEN *; -- LOAD -- should work, easier if there is no test for that... -- ALLOWED COMMANDS diff --git a/src/test/regress/expected/hs_standby_disallowed.out b/src/test/regress/expected/hs_standby_disallowed.out index bc117413ffdb375a0279269276581e22430ec904..dff0953e9a6987a45d669f26269d2088d9e74db9 100644 --- a/src/test/regress/expected/hs_standby_disallowed.out +++ b/src/test/regress/expected/hs_standby_disallowed.out @@ -118,10 +118,6 @@ listen a; ERROR: cannot execute LISTEN during recovery notify a; ERROR: cannot execute NOTIFY during recovery -unlisten a; -ERROR: cannot execute UNLISTEN during recovery -unlisten *; -ERROR: cannot execute UNLISTEN during recovery -- disallowed commands ANALYZE hs1; ERROR: cannot execute ANALYZE during recovery diff --git a/src/test/regress/sql/hs_standby_allowed.sql b/src/test/regress/sql/hs_standby_allowed.sql index 7fc22148cbc986067c9d9a2d7090b62d2c72cb17..f15a1a4909281684c46d6d478e8459903709fc39 100644 --- a/src/test/regress/sql/hs_standby_allowed.sql +++ b/src/test/regress/sql/hs_standby_allowed.sql @@ -110,6 +110,10 @@ LOCK hs1 IN ROW SHARE MODE; LOCK hs1 IN ROW EXCLUSIVE MODE; COMMIT; +-- UNLISTEN +UNLISTEN a; +UNLISTEN *; + -- LOAD -- should work, easier if there is no test for that... diff --git a/src/test/regress/sql/hs_standby_disallowed.sql b/src/test/regress/sql/hs_standby_disallowed.sql index 21bbf526b741337ad05b644d6661287d8b07932e..a470600eec88330d22e9bf5b1cf7bebdbf3e9a5c 100644 --- a/src/test/regress/sql/hs_standby_disallowed.sql +++ b/src/test/regress/sql/hs_standby_disallowed.sql @@ -88,8 +88,6 @@ COMMIT; -- Listen listen a; notify a; -unlisten a; -unlisten *; -- disallowed commands