Merge pull request #5580 from citusdata/fix_metadata_sync_fails_on_multi_transaction_recovery

Fix metadata sync fails on multi_transaction_recovery

src/test/regress/expected/multi_transaction_recovery.out

@@ -371,7 +371,7 @@ COMMIT;
 SELECT COUNT(*) FROM pg_dist_transaction;
  count
 ---------------------------------------------------------------------
-     1
+     2
 (1 row)
 
 SELECT recover_prepared_transactions();
@@ -393,6 +393,12 @@ SELECT count(DISTINCT nodeport) FROM pg_dist_shard_placement WHERE shardid IN (g
      2
 (1 row)
 
+SELECT recover_prepared_transactions();
+ recover_prepared_transactions
+---------------------------------------------------------------------
+                             0
+(1 row)
+
 -- only two of the connections will perform a write (INSERT)
 SET citus.force_max_query_parallelization TO ON;
 BEGIN;

src/test/regress/multi_1_schedule

@@ -191,8 +191,8 @@ test: check_mx
 test: turn_mx_off
 test: multi_generate_ddl_commands multi_repair_shards
 test: multi_create_shards
-test: multi_transaction_recovery
 test: turn_mx_on
+test: multi_transaction_recovery
 
 test: local_dist_join_modifications
 test: local_table_join

src/test/regress/sql/multi_transaction_recovery.sql

@@ -207,6 +207,7 @@ SELECT citus_move_shard_placement((SELECT * FROM selected_shard), 'localhost', :
 
 -- for the following test, ensure that 6 and 7 go to different shards on different workers
 SELECT count(DISTINCT nodeport) FROM pg_dist_shard_placement WHERE shardid IN (get_shard_id_for_distribution_column('test_2pcskip', 6),get_shard_id_for_distribution_column('test_2pcskip', 7));
+SELECT recover_prepared_transactions();
 -- only two of the connections will perform a write (INSERT)
 SET citus.force_max_query_parallelization TO ON;
 BEGIN;