From 3e6b54b964fed5ecda9b9eab6bd6aca320a2fec8 Mon Sep 17 00:00:00 2001
From: Hadi Moshayedi <hadi@moshayedi.net>
Date: Sat, 6 Feb 2021 15:59:18 -0800
Subject: [PATCH] Normalize isolation_metadata_sync_deadlock

---
 src/test/regress/bin/normalize.sed                     | 10 ++++++++++
 .../expected/isolation_metadata_sync_deadlock.out      |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed
index 377e78ed7..08ee994fa 100644
--- a/src/test/regress/bin/normalize.sed
+++ b/src/test/regress/bin/normalize.sed
@@ -207,3 +207,13 @@ s/ERROR:  cannot append to shardId [0-9]+/ERROR:  cannot append to shardId xxxxx
 
 # normalize partitioned table shard constraint name errors for upgrade_partition_constraints_(before|after)
 s/^(ERROR:  child table is missing constraint "\w+)_([0-9])+"/\1_xxxxxx"/g
+
+# normalize for distributed deadlock delay in isolation_metadata_sync_deadlock
+# isolation tester first detects a lock, but then deadlock detector cancels the
+# session. Sometimes happens that deadlock detector cancels the session before
+# lock detection, so we normalize it by removing these two lines.
+/^ <waiting ...>$/ {
+    N; /\nstep s1-update-2: <... completed>$/ {
+        s/.*//g
+    }
+}
diff --git a/src/test/regress/expected/isolation_metadata_sync_deadlock.out b/src/test/regress/expected/isolation_metadata_sync_deadlock.out
index 7f7a8c6aa..0482d3c74 100644
--- a/src/test/regress/expected/isolation_metadata_sync_deadlock.out
+++ b/src/test/regress/expected/isolation_metadata_sync_deadlock.out
@@ -63,8 +63,7 @@ step s2-update-1-on-worker:
  <waiting ...>
 step s1-update-2:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2;
- <waiting ...>
-step s1-update-2: <... completed>
+
 step s2-update-1-on-worker: <... completed>
 run_commands_on_session_level_connection_to_node