From d1d76856e633e3f02248fca1298ccac8b26df15c Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Tue, 14 Oct 2014 12:00:25 -0700 Subject: [PATCH] consul: less aggressive deadlock timer. Fixes #389 --- consul/mdb_table.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/consul/mdb_table.go b/consul/mdb_table.go index 592bce849a..23856fc5f6 100644 --- a/consul/mdb_table.go +++ b/consul/mdb_table.go @@ -3,11 +3,12 @@ package consul import ( "bytes" "fmt" - "github.com/armon/gomdb" "reflect" "strings" "sync/atomic" "time" + + "github.com/armon/gomdb" ) var ( @@ -21,6 +22,13 @@ const ( // is not used by MDBTable, but is stored so that the client can map // back to the Raft index number lastIndexRowID = 0 + + // deadlockTimeout is a heuristic to detect a potential MDB deadlock. + // If we have a transaction that is left open indefinitely, it can + // prevent new transactions from making progress and deadlocking + // the system. If we fail to start a transaction after this long, + // assume a potential deadlock and panic. + deadlockTimeout = 30 * time.Second ) /* @@ -215,7 +223,7 @@ func (t *MDBTable) StartTxn(readonly bool, mdbTxn *MDBTxn) (*MDBTxn, error) { var err error // Panic if we deadlock acquiring a transaction - timeout := time.AfterFunc(5*time.Second, func() { + timeout := time.AfterFunc(deadlockTimeout, func() { panic("Timeout starting MDB transaction, potential deadlock") }) defer timeout.Stop()