Merge pull request #4655 from citusdata/fix_isolation

Normalize isolation_metadata_sync_deadlock

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
+    }
+}

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