Correctly report lock wait time in case of e-enabling deadlock_timeout

knizhnik · kelvich · commit e176384d58e0 · 2018-08-17T15:56:02.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -5807,8 +5807,10 @@ MtmDetectGlobalDeadLockForXid(TransactionId xid)
 
 		if (!hasDeadlock)
 		{
+			TimestampTz start_time = get_timeout_start_time(DEADLOCK_TIMEOUT);
 			MTM_LOG1("Enable deadlock timeout in backend %d for transaction %llu", MyProcPid, (long64)xid);
 			enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);
+			set_timeout_start_time(DEADLOCK_TIMEOUT, start_time);
 		}
 	}
 	return hasDeadlock;

Original file line number	Diff line number	Diff line change
`@@ -5807,8 +5807,10 @@ MtmDetectGlobalDeadLockForXid(TransactionId xid)`
`5807`	`5807`
`5808`	`5808`	`if (!hasDeadlock)`
`5809`	`5809`	`{`
	`5810`	`+ TimestampTz start_time = get_timeout_start_time(DEADLOCK_TIMEOUT);`
`5810`	`5811`	`MTM_LOG1("Enable deadlock timeout in backend %d for transaction %llu", MyProcPid, (long64)xid);`
`5811`	`5812`	`enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);`
	`5813`	`+ set_timeout_start_time(DEADLOCK_TIMEOUT, start_time);`
`5812`	`5814`	`}`
`5813`	`5815`	`}`
`5814`	`5816`	`return hasDeadlock;`