From bb56e55bdc550d10d4cce9d851839b84035d2673 Mon Sep 17 00:00:00 2001 From: Tyler Coleman Date: Thu, 30 Nov 2023 09:27:09 -0800 Subject: [PATCH 1/2] Change log message based on dry run Change the log message to reflect the dry run status; if not a dry run, the message now says the transactions have been queued (as opposed to the hypothetical "would have been queued" in the dry run). Signed-off-by: Tyler Coleman --- .../vttablet/tabletserver/txserializer/tx_serializer.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go b/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go index 4a9124345aa..10428ed67c7 100644 --- a/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go +++ b/go/vt/vttablet/tabletserver/txserializer/tx_serializer.go @@ -273,15 +273,18 @@ func (txs *TxSerializer) unlockLocked(key string, returnSlot bool) { delete(txs.queues, key) if q.max > 1 { + var formattedKey = key var logMsg string + if txs.env.Config().SanitizeLogMessages { - logMsg = fmt.Sprintf("%v simultaneous transactions (%v in total) for the same row range (%v) would have been queued.", q.max, q.count, txs.sanitizeKey(key)) - } else { - logMsg = fmt.Sprintf("%v simultaneous transactions (%v in total) for the same row range (%v) would have been queued.", q.max, q.count, key) + formattedKey = txs.sanitizeKey(key) } + if txs.dryRun { + logMsg = fmt.Sprintf("%v simultaneous transactions (%v in total) for the same row range (%v) would have been queued.", q.max, q.count, formattedKey) txs.logDryRun.Infof(logMsg) } else { + logMsg = fmt.Sprintf("%v simultaneous transactions (%v in total) for the same row range (%v) have been queued.", q.max, q.count, formattedKey) txs.log.Infof(logMsg) } } From b31931dc8f2c20a33602073156377a0a08b889c5 Mon Sep 17 00:00:00 2001 From: Tyler Coleman Date: Fri, 5 Jan 2024 12:04:03 -0800 Subject: [PATCH 2/2] Keep alive Signed-off-by: Tyler Coleman