From e0e540937a64d89dbbd7dffe99a861155cb57975 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Sat, 15 Aug 2015 00:10:48 -0400 Subject: [PATCH 3/3] Add some isolation tests for deadlock detection and resolution. --- src/test/isolation/expected/deadlock-hard.out | 35 +++++++++++++ src/test/isolation/expected/deadlock-simple.out | 11 ++++ src/test/isolation/expected/deadlock-soft.out | 17 ++++++ src/test/isolation/isolation_schedule | 3 ++ src/test/isolation/specs/deadlock-hard.spec | 70 +++++++++++++++++++++++++ src/test/isolation/specs/deadlock-simple.spec | 29 ++++++++++ src/test/isolation/specs/deadlock-soft.spec | 40 ++++++++++++++ 7 files changed, 205 insertions(+) create mode 100644 src/test/isolation/expected/deadlock-hard.out create mode 100644 src/test/isolation/expected/deadlock-simple.out create mode 100644 src/test/isolation/expected/deadlock-soft.out create mode 100644 src/test/isolation/specs/deadlock-hard.spec create mode 100644 src/test/isolation/specs/deadlock-simple.spec create mode 100644 src/test/isolation/specs/deadlock-soft.spec diff --git a/src/test/isolation/expected/deadlock-hard.out b/src/test/isolation/expected/deadlock-hard.out new file mode 100644 index 0000000..cb25f75 --- /dev/null +++ b/src/test/isolation/expected/deadlock-hard.out @@ -0,0 +1,35 @@ +Parsed test spec with 8 sessions + +starting permutation: s1a1 s2a2 s3a3 s4a4 s5a5 s6a6 s7a7 s8a8 s1a2 s2a3 s3a4 s4a5 s5a6 s6a7 s7a8 s8a1 s8c s7c s6c s5c s4c s3c s2c s1c +step s1a1: LOCK TABLE a1; +step s2a2: LOCK TABLE a2; +step s3a3: LOCK TABLE a3; +step s4a4: LOCK TABLE a4; +step s5a5: LOCK TABLE a5; +step s6a6: LOCK TABLE a6; +step s7a7: LOCK TABLE a7; +step s8a8: LOCK TABLE a8; +step s1a2: LOCK TABLE a2; +step s2a3: LOCK TABLE a3; +step s3a4: LOCK TABLE a4; +step s4a5: LOCK TABLE a5; +step s5a6: LOCK TABLE a6; +step s6a7: LOCK TABLE a7; +step s7a8: LOCK TABLE a8; +step s8a1: LOCK TABLE a1; +step s7a8: <... completed> +error in steps s8a1 s7a8: ERROR: deadlock detected +step s8c: COMMIT; +step s7c: COMMIT; +step s6a7: <... completed> +step s6c: COMMIT; +step s5a6: <... completed> +step s5c: COMMIT; +step s4a5: <... completed> +step s4c: COMMIT; +step s3a4: <... completed> +step s3c: COMMIT; +step s2a3: <... completed> +step s2c: COMMIT; +step s1a2: <... completed> +step s1c: COMMIT; diff --git a/src/test/isolation/expected/deadlock-simple.out b/src/test/isolation/expected/deadlock-simple.out new file mode 100644 index 0000000..e0d2c4e --- /dev/null +++ b/src/test/isolation/expected/deadlock-simple.out @@ -0,0 +1,11 @@ +Parsed test spec with 2 sessions + +starting permutation: s1as s2as s1ae s2ae s1c s2c +step s1as: LOCK TABLE a1 IN ACCESS SHARE MODE; +step s2as: LOCK TABLE a1 IN ACCESS SHARE MODE; +step s1ae: LOCK TABLE a1 IN ACCESS EXCLUSIVE MODE; +step s2ae: LOCK TABLE a1 IN ACCESS EXCLUSIVE MODE; +step s1ae: <... completed> +error in steps s2ae s1ae: ERROR: deadlock detected +step s1c: COMMIT; +step s2c: COMMIT; diff --git a/src/test/isolation/expected/deadlock-soft.out b/src/test/isolation/expected/deadlock-soft.out new file mode 100644 index 0000000..24a35da --- /dev/null +++ b/src/test/isolation/expected/deadlock-soft.out @@ -0,0 +1,17 @@ +Parsed test spec with 4 sessions + +starting permutation: d1a1 d2a2 e1l e2l d1a2 d2a1 d1c e1c d2c e2c +step d1a1: LOCK TABLE a1 IN ACCESS SHARE MODE; +step d2a2: LOCK TABLE a2 IN ACCESS SHARE MODE; +step e1l: LOCK TABLE a1 IN ACCESS EXCLUSIVE MODE; +step e2l: LOCK TABLE a2 IN ACCESS EXCLUSIVE MODE; +step d1a2: LOCK TABLE a2 IN ACCESS SHARE MODE; +step d2a1: LOCK TABLE a1 IN ACCESS SHARE MODE; +step d1a2: <... completed> +step d1c: COMMIT; +step e1l: <... completed> +step e1c: COMMIT; +step d2a1: <... completed> +step d2c: COMMIT; +step e2l: <... completed> +step e2c: COMMIT; diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule index c0ed637..8b4405c 100644 --- a/src/test/isolation/isolation_schedule +++ b/src/test/isolation/isolation_schedule @@ -10,6 +10,9 @@ test: partial-index test: two-ids test: multiple-row-versions test: index-only-scan +test: deadlock-simple +test: deadlock-hard +test: deadlock-soft test: fk-contention test: fk-deadlock test: fk-deadlock2 diff --git a/src/test/isolation/specs/deadlock-hard.spec b/src/test/isolation/specs/deadlock-hard.spec new file mode 100644 index 0000000..a6daba3 --- /dev/null +++ b/src/test/isolation/specs/deadlock-hard.spec @@ -0,0 +1,70 @@ +# This is a straightforward deadlock scenario. Since it involves more than +# two processes, the mainlock detector will find the problem and rollback the +# backend which discovers it. + +setup +{ + CREATE TABLE a1 (); + CREATE TABLE a2 (); + CREATE TABLE a3 (); + CREATE TABLE a4 (); + CREATE TABLE a5 (); + CREATE TABLE a6 (); + CREATE TABLE a7 (); + CREATE TABLE a8 (); +} + +teardown +{ + DROP TABLE a1, a2, a3, a4, a5, a6, a7, a8; +} + +session "s1" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "s1a1" { LOCK TABLE a1; } +step "s1a2" { LOCK TABLE a2; } +step "s1c" { COMMIT; } + +session "s2" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "s2a2" { LOCK TABLE a2; } +step "s2a3" { LOCK TABLE a3; } +step "s2c" { COMMIT; } + +session "s3" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "s3a3" { LOCK TABLE a3; } +step "s3a4" { LOCK TABLE a4; } +step "s3c" { COMMIT; } + +session "s4" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "s4a4" { LOCK TABLE a4; } +step "s4a5" { LOCK TABLE a5; } +step "s4c" { COMMIT; } + +session "s5" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "s5a5" { LOCK TABLE a5; } +step "s5a6" { LOCK TABLE a6; } +step "s5c" { COMMIT; } + +session "s6" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "s6a6" { LOCK TABLE a6; } +step "s6a7" { LOCK TABLE a7; } +step "s6c" { COMMIT; } + +session "s7" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "s7a7" { LOCK TABLE a7; } +step "s7a8" { LOCK TABLE a8; } +step "s7c" { COMMIT; } + +session "s8" +setup { BEGIN; SET deadlock_timeout = '10ms'; } +step "s8a8" { LOCK TABLE a8; } +step "s8a1" { LOCK TABLE a1; } +step "s8c" { COMMIT; } + +permutation "s1a1" "s2a2" "s3a3" "s4a4" "s5a5" "s6a6" "s7a7" "s8a8" "s1a2" "s2a3" "s3a4" "s4a5" "s5a6" "s6a7" "s7a8" "s8a1" "s8c" "s7c" "s6c" "s5c" "s4c" "s3c" "s2c" "s1c" diff --git a/src/test/isolation/specs/deadlock-simple.spec b/src/test/isolation/specs/deadlock-simple.spec new file mode 100644 index 0000000..b1300ca --- /dev/null +++ b/src/test/isolation/specs/deadlock-simple.spec @@ -0,0 +1,29 @@ +# The deadlock detector has a special case for "simple" deadlocks. A simple +# deadlock occurs when we attempt a lock upgrade while another process waits +# for a lock upgrade on the same object; and the sought locks conflict with +# those already held, so that neither process can complete its upgrade until +# the other releases locks. Test this scenario. + +setup +{ + CREATE TABLE a1 (); +} + +teardown +{ + DROP TABLE a1; +} + +session "s1" +setup { BEGIN; } +step "s1as" { LOCK TABLE a1 IN ACCESS SHARE MODE; } +step "s1ae" { LOCK TABLE a1 IN ACCESS EXCLUSIVE MODE; } +step "s1c" { COMMIT; } + +session "s2" +setup { BEGIN; } +step "s2as" { LOCK TABLE a1 IN ACCESS SHARE MODE; } +step "s2ae" { LOCK TABLE a1 IN ACCESS EXCLUSIVE MODE; } +step "s2c" { COMMIT; } + +permutation "s1as" "s2as" "s1ae" "s2ae" "s1c" "s2c" diff --git a/src/test/isolation/specs/deadlock-soft.spec b/src/test/isolation/specs/deadlock-soft.spec new file mode 100644 index 0000000..49d16e0 --- /dev/null +++ b/src/test/isolation/specs/deadlock-soft.spec @@ -0,0 +1,40 @@ +# Four-process deadlock with two hard edges and two soft edges. +# d2 waits for e1 (soft edge), e1 waits for d1 (hard edge), +# d1 waits for e2 (soft edge), e2 waits for d2 (hard edge). +# The deadlock detector resolves the deadlock by reversing the d1-e2 edge, +# unblocking d1. + +setup +{ + CREATE TABLE a1 (); + CREATE TABLE a2 (); +} + +teardown +{ + DROP TABLE a1, a2; +} + +session "d1" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "d1a1" { LOCK TABLE a1 IN ACCESS SHARE MODE; } +step "d1a2" { LOCK TABLE a2 IN ACCESS SHARE MODE; } +step "d1c" { COMMIT; } + +session "d2" +setup { BEGIN; SET deadlock_timeout = '10ms'; } +step "d2a2" { LOCK TABLE a2 IN ACCESS SHARE MODE; } +step "d2a1" { LOCK TABLE a1 IN ACCESS SHARE MODE; } +step "d2c" { COMMIT; } + +session "e1" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "e1l" { LOCK TABLE a1 IN ACCESS EXCLUSIVE MODE; } +step "e1c" { COMMIT; } + +session "e2" +setup { BEGIN; SET deadlock_timeout = '10s'; } +step "e2l" { LOCK TABLE a2 IN ACCESS EXCLUSIVE MODE; } +step "e2c" { COMMIT; } + +permutation "d1a1" "d2a2" "e1l" "e2l" "d1a2" "d2a1" "d1c" "e1c" "d2c" "e2c" -- 2.3.2 (Apple Git-55)