fix ddd broken in b908eaf

kelvich · kelvich · commit 58ccadd781bd · 2018-08-17T15:56:01.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -5748,6 +5748,12 @@ MtmDetectGlobalDeadLockForXid(TransactionId xid)
 		// 		enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);
 		// 	}
 		// }
+
+		if (!hasDeadlock)
+		{
+			MTM_LOG1("Enable deadlock timeout in backend %d for transaction %llu", MyProcPid, (long64)xid);
+			enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);
+		}
 	}
 	return hasDeadlock;
 }

Original file line number	Diff line number	Diff line change
`@@ -5748,6 +5748,12 @@ MtmDetectGlobalDeadLockForXid(TransactionId xid)`
`5748`	`5748`	`// enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);`
`5749`	`5749`	`// }`
`5750`	`5750`	`// }`
	`5751`	`+`
	`5752`	`+ if (!hasDeadlock)`
	`5753`	`+ {`
	`5754`	`+ MTM_LOG1("Enable deadlock timeout in backend %d for transaction %llu", MyProcPid, (long64)xid);`
	`5755`	`+ enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);`
	`5756`	`+ }`
`5751`	`5757`	`}`
`5752`	`5758`	`return hasDeadlock;`
`5753`	`5759`	`}`