Fix bug in deadlock detection

knizhnik · knizhnik · commit 889201e668ad · 2016-03-09T20:13:13.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1724,7 +1724,7 @@ MtmSerializeLock(PROCLOCK* proclock, void* arg)
                             if ((proclock->holdMask & LOCKBIT_ON(lm)) && (conflictMask & LOCKBIT_ON(lm)))
                             {
                                 MTM_TRACE("%d: %u(%u) waits for %u(%u)\n", MyProcPid, srcPgXact->xid, proc->pid, dstPgXact->xid, proclock->tag.myProc->pid);
-                                MtmGetGtid(srcPgXact->xid, &gtid); /* transaction holding lock */
+                                MtmGetGtid(dstPgXact->xid, &gtid); /* transaction holding lock */
 								ByteBufferAppendInt32(buf, gtid.node); 
 								ByteBufferAppendInt32(buf, gtid.xid); 
                                 break;

Original file line number	Diff line number	Diff line change
`@@ -1724,7 +1724,7 @@ MtmSerializeLock(PROCLOCK* proclock, void* arg)`
`1724`	`1724`	`if ((proclock->holdMask & LOCKBIT_ON(lm)) && (conflictMask & LOCKBIT_ON(lm)))`
`1725`	`1725`	`{`
`1726`	`1726`	`MTM_TRACE("%d: %u(%u) waits for %u(%u)\n", MyProcPid, srcPgXact->xid, proc->pid, dstPgXact->xid, proclock->tag.myProc->pid);`
`1727`		`- MtmGetGtid(srcPgXact->xid, &gtid); /* transaction holding lock */`
	`1727`	`+ MtmGetGtid(dstPgXact->xid, &gtid); /* transaction holding lock */`
`1728`	`1728`	`ByteBufferAppendInt32(buf, gtid.node);`
`1729`	`1729`	`ByteBufferAppendInt32(buf, gtid.xid);`
`1730`	`1730`	`break;`