external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5403 from citusdata/reuse_to_be_deleted_connection_in_same_transaction 

Don't skip connections with forceCloseAtTransactionEnd that Sent Begin in FindAvailableConnection
pull/5402/head
Halil Ozan Akgül 2021-11-01 17:59:40 +03:00 committed by GitHub
parent 57a0228c52 c0eb67b24f
commit a350feb13c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 85 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/distributed/connection/connection_management.c
View File

@ -429,12 +429,18 @@ FindAvailableConnection(dlist_head *connections, uint32 flags)
continue;
}
if (connection->forceCloseAtTransactionEnd)
if (connection->forceCloseAtTransactionEnd &&
!connection->remoteTransaction.beginSent)
{
/*
* This is a connection that should be closed, probabably because
* of old connection options. So we ignore it. It will
* automatically be closed at the end of the transaction.
* This is a connection that should be closed, probably because
* of old connection options or removing a node. This will
* automatically be closed at the end of the transaction. But, if we are still
* inside a transaction, we should keep using this connection as long as a remote
* transaction is in progress over the connection. The main use for this case
* is having some commands inside a transaction block after removing nodes. And, we
* currently allow very limited operations after removing a node inside a
* transaction block (e.g., no placement access can happen).
*/
continue;
}

51
src/test/regress/expected/node_conninfo_reload.out
View File

@ -458,5 +458,56 @@ select count(*) from test where a = 0;
0
(1 row)
-- Test connecting all the shards
ALTER SYSTEM SET citus.node_conninfo = 'sslmode=doesnotexist';
BEGIN;
ALTER TABLE test ADD COLUMN b INT;
select pg_reload_conf();
pg_reload_conf
---------------------------------------------------------------------
t
(1 row)
select pg_sleep(0.1); -- wait for config reload to apply
pg_sleep
---------------------------------------------------------------------
(1 row)
show citus.node_conninfo;
citus.node_conninfo
---------------------------------------------------------------------
sslmode=doesnotexist
(1 row)
-- Should work since connections to the same shards that BEGIN is sent
-- are reused.
ALTER TABLE test ADD COLUMN c INT;
COMMIT;
-- Should fail now, when transaction is finished
ALTER TABLE test ADD COLUMN d INT;
ERROR: connection to the remote node localhost:xxxxx failed with the following error: invalid sslmode value: "doesnotexist"
-- Reset it again
ALTER SYSTEM RESET citus.node_conninfo;
select pg_reload_conf();
pg_reload_conf
---------------------------------------------------------------------
t
(1 row)
select pg_sleep(0.1); -- wait for config reload to apply
pg_sleep
---------------------------------------------------------------------
(1 row)
show citus.node_conninfo;
citus.node_conninfo
---------------------------------------------------------------------
sslmode=require
(1 row)
-- Should work again
ALTER TABLE test ADD COLUMN e INT;
DROP SCHEMA node_conninfo_reload CASCADE;
NOTICE: drop cascades to table test

24
src/test/regress/sql/node_conninfo_reload.sql
View File

@ -171,4 +171,28 @@ show citus.node_conninfo;
-- Should work
select count(*) from test where a = 0;
-- Test connecting all the shards
ALTER SYSTEM SET citus.node_conninfo = 'sslmode=doesnotexist';
BEGIN;
ALTER TABLE test ADD COLUMN b INT;
select pg_reload_conf();
select pg_sleep(0.1); -- wait for config reload to apply
show citus.node_conninfo;
-- Should work since connections to the same shards that BEGIN is sent
-- are reused.
ALTER TABLE test ADD COLUMN c INT;
COMMIT;
-- Should fail now, when transaction is finished
ALTER TABLE test ADD COLUMN d INT;
-- Reset it again
ALTER SYSTEM RESET citus.node_conninfo;
select pg_reload_conf();
select pg_sleep(0.1); -- wait for config reload to apply
show citus.node_conninfo;
-- Should work again
ALTER TABLE test ADD COLUMN e INT;
DROP SCHEMA node_conninfo_reload CASCADE;