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

Trigger metadata sync at transaction commit

pull/4419/head
Hadi Moshayedi 2020-12-23 13:27:22 -08:00
parent 4df723cf9b
commit a2c73bef27
7 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/commands/function.c
View File

@ -1147,7 +1147,7 @@ TriggerSyncMetadataToPrimaryNodes(void)
/* let the maintanince deamon know about the metadata sync */ /* let the maintanince deamon know about the metadata sync */
if (triggerMetadataSync) if (triggerMetadataSync)
{ {
TriggerMetadataSync(MyDatabaseId); TriggerMetadataSyncOnCommit();
} }
} }

4
src/backend/distributed/metadata/node_metadata.c
View File

@ -444,7 +444,7 @@ SetUpDistributedTableDependencies(WorkerNode *newWorkerNode)
{ {
MarkNodeHasMetadata(newWorkerNode->workerName, newWorkerNode->workerPort, MarkNodeHasMetadata(newWorkerNode->workerName, newWorkerNode->workerPort,
true); true);
TriggerMetadataSync(MyDatabaseId); TriggerMetadataSyncOnCommit();
} }
} }
} }
@ -810,7 +810,7 @@ master_update_node(PG_FUNCTION_ARGS)
*/ */
if (UnsetMetadataSyncedForAll()) if (UnsetMetadataSyncedForAll())
{ {
TriggerMetadataSync(MyDatabaseId); TriggerMetadataSyncOnCommit();
} }
if (handle != NULL) if (handle != NULL)

2
src/backend/distributed/test/metadata_sync.c
View File

@ -135,7 +135,7 @@ wait_until_metadata_sync(PG_FUNCTION_ARGS)
Datum Datum
trigger_metadata_sync(PG_FUNCTION_ARGS) trigger_metadata_sync(PG_FUNCTION_ARGS)
{ {
TriggerMetadataSync(MyDatabaseId); TriggerMetadataSyncOnCommit();
PG_RETURN_VOID(); PG_RETURN_VOID();
} }

26
src/backend/distributed/transaction/transaction_management.c
View File

@ -28,6 +28,7 @@
#include "distributed/listutils.h" #include "distributed/listutils.h"
#include "distributed/local_executor.h" #include "distributed/local_executor.h"
#include "distributed/locally_reserved_shared_connections.h" #include "distributed/locally_reserved_shared_connections.h"
#include "distributed/maintenanced.h"
#include "distributed/multi_executor.h" #include "distributed/multi_executor.h"
#include "distributed/multi_explain.h" #include "distributed/multi_explain.h"
#include "distributed/repartition_join_execution.h" #include "distributed/repartition_join_execution.h"
@ -102,6 +103,9 @@ bool CoordinatedTransactionUses2PC = false;
/* if disabled, distributed statements in a function may run as separate transactions */ /* if disabled, distributed statements in a function may run as separate transactions */
bool FunctionOpensTransactionBlock = true; bool FunctionOpensTransactionBlock = true;
/* if true, we should trigger metadata sync on commit */
bool MetadataSyncOnCommit = false;
/* transaction management functions */ /* transaction management functions */
static void CoordinatedTransactionCallback(XactEvent event, void *arg); static void CoordinatedTransactionCallback(XactEvent event, void *arg);
@ -262,6 +266,15 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
AfterXactConnectionHandling(true); AfterXactConnectionHandling(true);
} }
/*
* Changes to catalog tables are now visible to the metadata sync
* daemon, so we can trigger metadata sync if necessary.
*/
if (MetadataSyncOnCommit)
{
TriggerMetadataSync(MyDatabaseId);
}
ResetGlobalVariables(); ResetGlobalVariables();
/* /*
@ -474,6 +487,7 @@ ResetGlobalVariables()
activeSetStmts = NULL; activeSetStmts = NULL;
CoordinatedTransactionUses2PC = false; CoordinatedTransactionUses2PC = false;
TransactionModifiedNodeMetadata = false; TransactionModifiedNodeMetadata = false;
MetadataSyncOnCommit = false;
ResetWorkerErrorIndication(); ResetWorkerErrorIndication();
} }
@ -728,3 +742,15 @@ MaybeExecutingUDF(void)
{ {
return ExecutorLevel > 1 || (ExecutorLevel == 1 && PlannerLevel > 0); return ExecutorLevel > 1 || (ExecutorLevel == 1 && PlannerLevel > 0);
} }
/*
* TriggerMetadataSyncOnCommit sets a flag to do metadata sync on commit.
* This is because new metadata only becomes visible to the metadata sync
* daemon after commit happens.
*/
void
TriggerMetadataSyncOnCommit(void)
{
MetadataSyncOnCommit = true;
}

1
src/include/distributed/transaction_management.h
View File

@ -121,6 +121,7 @@ extern void InitializeTransactionManagement(void);
/* other functions */ /* other functions */
extern List * ActiveSubXactContexts(void); extern List * ActiveSubXactContexts(void);
extern StringInfo BeginAndSetDistributedTransactionIdCommand(void); extern StringInfo BeginAndSetDistributedTransactionIdCommand(void);
extern void TriggerMetadataSyncOnCommit(void);
#endif /* TRANSACTION_MANAGMENT_H */ #endif /* TRANSACTION_MANAGMENT_H */

16
src/test/regress/expected/isolation_metadata_sync_deadlock.out
View File

@ -1,6 +1,6 @@
Parsed test spec with 3 sessions Parsed test spec with 3 sessions
starting permutation: enable-deadlock-detection reload-conf s2-start-session-level-connection s1-begin s1-update-1 s2-begin-on-worker s2-update-2-on-worker s2-truncate-on-worker s3-invalidate-metadata s3-resync s2-update-1-on-worker s1-update-2 s1-commit s2-commit-on-worker disable-deadlock-detection reload-conf s2-stop-connection starting permutation: enable-deadlock-detection reload-conf s2-start-session-level-connection s1-begin s1-update-1 s2-begin-on-worker s2-update-2-on-worker s2-truncate-on-worker s3-invalidate-metadata s3-resync s3-wait s2-update-1-on-worker s1-update-2 s1-commit s2-commit-on-worker disable-deadlock-detection reload-conf s2-stop-connection
create_distributed_table create_distributed_table
@ -48,11 +48,13 @@ step s3-invalidate-metadata:
step s3-resync: step s3-resync:
SELECT trigger_metadata_sync(); SELECT trigger_metadata_sync();
SELECT pg_sleep(2);
trigger_metadata_sync trigger_metadata_sync
step s3-wait:
SELECT pg_sleep(2);
pg_sleep pg_sleep
@ -96,7 +98,7 @@ restore_isolation_tester_func
starting permutation: increase-retry-interval reload-conf s2-start-session-level-connection s2-begin-on-worker s2-truncate-on-worker s3-invalidate-metadata s3-resync s1-count-daemons s1-cancel-metadata-sync s1-count-daemons reset-retry-interval reload-conf s2-commit-on-worker s2-stop-connection s3-resync starting permutation: increase-retry-interval reload-conf s2-start-session-level-connection s2-begin-on-worker s2-truncate-on-worker s3-invalidate-metadata s3-resync s3-wait s1-count-daemons s1-cancel-metadata-sync s1-count-daemons reset-retry-interval reload-conf s2-commit-on-worker s2-stop-connection s3-resync s3-wait
create_distributed_table create_distributed_table
@ -132,11 +134,13 @@ step s3-invalidate-metadata:
step s3-resync: step s3-resync:
SELECT trigger_metadata_sync(); SELECT trigger_metadata_sync();
SELECT pg_sleep(2);
trigger_metadata_sync trigger_metadata_sync
step s3-wait:
SELECT pg_sleep(2);
pg_sleep pg_sleep
@ -185,11 +189,13 @@ stop_session_level_connection_to_node
step s3-resync: step s3-resync:
SELECT trigger_metadata_sync(); SELECT trigger_metadata_sync();
SELECT pg_sleep(2);
trigger_metadata_sync trigger_metadata_sync
step s3-wait:
SELECT pg_sleep(2);
pg_sleep pg_sleep

8
src/test/regress/spec/isolation_metadata_sync_deadlock.spec
View File

@ -134,6 +134,10 @@ step "s3-invalidate-metadata"
step "s3-resync" step "s3-resync"
{ {
SELECT trigger_metadata_sync(); SELECT trigger_metadata_sync();
}
step "s3-wait"
{
SELECT pg_sleep(2); SELECT pg_sleep(2);
} }
@ -142,8 +146,8 @@ step "s3-resync"
// causes the concurrent metadata sync to be blocked. But s2 and s1 themselves are // causes the concurrent metadata sync to be blocked. But s2 and s1 themselves are
// themselves involved in a distributed deadlock. // themselves involved in a distributed deadlock.
// See https://github.com/citusdata/citus/issues/4393 for more details. // See https://github.com/citusdata/citus/issues/4393 for more details.
permutation "enable-deadlock-detection" "reload-conf" "s2-start-session-level-connection" "s1-begin" "s1-update-1" "s2-begin-on-worker" "s2-update-2-on-worker" "s2-truncate-on-worker" "s3-invalidate-metadata" "s3-resync" "s2-update-1-on-worker" "s1-update-2" "s1-commit" "s2-commit-on-worker" "disable-deadlock-detection" "reload-conf" "s2-stop-connection" permutation "enable-deadlock-detection" "reload-conf" "s2-start-session-level-connection" "s1-begin" "s1-update-1" "s2-begin-on-worker" "s2-update-2-on-worker" "s2-truncate-on-worker" "s3-invalidate-metadata" "s3-resync" "s3-wait" "s2-update-1-on-worker" "s1-update-2" "s1-commit" "s2-commit-on-worker" "disable-deadlock-detection" "reload-conf" "s2-stop-connection"
// Test that when metadata sync is waiting for locks, cancelling it terminates it. // Test that when metadata sync is waiting for locks, cancelling it terminates it.
// This is important in cases where the metadata sync daemon itself is involved in a deadlock. // This is important in cases where the metadata sync daemon itself is involved in a deadlock.
permutation "increase-retry-interval" "reload-conf" "s2-start-session-level-connection" "s2-begin-on-worker" "s2-truncate-on-worker" "s3-invalidate-metadata" "s3-resync" "s1-count-daemons" "s1-cancel-metadata-sync" "s1-count-daemons" "reset-retry-interval" "reload-conf" "s2-commit-on-worker" "s2-stop-connection" "s3-resync" permutation "increase-retry-interval" "reload-conf" "s2-start-session-level-connection" "s2-begin-on-worker" "s2-truncate-on-worker" "s3-invalidate-metadata" "s3-resync" "s3-wait" "s1-count-daemons" "s1-cancel-metadata-sync" "s1-count-daemons" "reset-retry-interval" "reload-conf" "s2-commit-on-worker" "s2-stop-connection" "s3-resync" "s3-wait"