Skip to content

Commit 5913425

Browse files
Archit Mishrafacebook-github-bot
Archit Mishra
authored andcommitted
Displayed Deadlock Paths
Summary: update-submodule: rocksdb Changes: * extracted deadock information buffer from rocksdb * displayed information of interest to the user by adding a section with information about the latest deadlocks * annotates the transaction id of the transaction that go the deadlock * added small test case to verify the changes and recorded engine transaction status tests Closes #666 Reviewed By: lth Differential Revision: D5519254 Pulled By: armishra fbshipit-source-id: ca73dda
1 parent 2dd16b3 commit 5913425

15 files changed

+903
-12
lines changed

Diff for: mysql-test/r/mysqld--help-notwin-profiling.result

+7
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,9 @@ The following options may be given as the first argument:
11771177
ON, OFF, FORCE (don't start if the plugin fails to load).
11781178
--rocksdb-deadlock-detect
11791179
Enables deadlock detection
1180+
--rocksdb-deadlock-detect-depth=#
1181+
Number of transactions deadlock detection will traverse
1182+
through before assuming deadlock
11801183
--rocksdb-debug-optimizer-n-rows=#
11811184
Test only to override rocksdb estimates of table size in
11821185
a memtable
@@ -1309,6 +1312,8 @@ The following options may be given as the first argument:
13091312
slave.
13101313
--rocksdb-max-background-jobs=#
13111314
DBOptions::max_background_jobs for RocksDB
1315+
--rocksdb-max-latest-deadlocks=#
1316+
Maximum number of recent deadlocks to store
13121317
--rocksdb-max-log-file-size=#
13131318
DBOptions::max_log_file_size for RocksDB
13141319
--rocksdb-max-manifest-file-size=#
@@ -2116,6 +2121,7 @@ rocksdb-db-write-buffer-size 0
21162121
rocksdb-dbstats ON
21172122
rocksdb-ddl ON
21182123
rocksdb-deadlock-detect FALSE
2124+
rocksdb-deadlock-detect-depth 50
21192125
rocksdb-debug-optimizer-n-rows 0
21202126
rocksdb-debug-optimizer-no-zero-cardinality TRUE
21212127
rocksdb-debug-ttl-ignore-pk FALSE
@@ -2156,6 +2162,7 @@ rocksdb-manifest-preallocation-size 4194304
21562162
rocksdb-manual-wal-flush TRUE
21572163
rocksdb-master-skip-tx-api FALSE
21582164
rocksdb-max-background-jobs 2
2165+
rocksdb-max-latest-deadlocks 5
21592166
rocksdb-max-log-file-size 0
21602167
rocksdb-max-manifest-file-size 18446744073709551615
21612168
rocksdb-max-open-files -1

Diff for: mysql-test/r/mysqld--help-notwin.result

+7
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,9 @@ The following options may be given as the first argument:
11751175
ON, OFF, FORCE (don't start if the plugin fails to load).
11761176
--rocksdb-deadlock-detect
11771177
Enables deadlock detection
1178+
--rocksdb-deadlock-detect-depth=#
1179+
Number of transactions deadlock detection will traverse
1180+
through before assuming deadlock
11781181
--rocksdb-debug-optimizer-n-rows=#
11791182
Test only to override rocksdb estimates of table size in
11801183
a memtable
@@ -1307,6 +1310,8 @@ The following options may be given as the first argument:
13071310
slave.
13081311
--rocksdb-max-background-jobs=#
13091312
DBOptions::max_background_jobs for RocksDB
1313+
--rocksdb-max-latest-deadlocks=#
1314+
Maximum number of recent deadlocks to store
13101315
--rocksdb-max-log-file-size=#
13111316
DBOptions::max_log_file_size for RocksDB
13121317
--rocksdb-max-manifest-file-size=#
@@ -2113,6 +2118,7 @@ rocksdb-db-write-buffer-size 0
21132118
rocksdb-dbstats ON
21142119
rocksdb-ddl ON
21152120
rocksdb-deadlock-detect FALSE
2121+
rocksdb-deadlock-detect-depth 50
21162122
rocksdb-debug-optimizer-n-rows 0
21172123
rocksdb-debug-optimizer-no-zero-cardinality TRUE
21182124
rocksdb-debug-ttl-ignore-pk FALSE
@@ -2153,6 +2159,7 @@ rocksdb-manifest-preallocation-size 4194304
21532159
rocksdb-manual-wal-flush TRUE
21542160
rocksdb-master-skip-tx-api FALSE
21552161
rocksdb-max-background-jobs 2
2162+
rocksdb-max-latest-deadlocks 5
21562163
rocksdb-max-log-file-size 0
21572164
rocksdb-max-manifest-file-size 18446744073709551615
21582165
rocksdb-max-open-files -1

0 commit comments

Comments
 (0)