[Tarantool-patches] [PATCH v3 09/10] wal: fix say_x format

Cyrill Gorcunov gorcunov at gmail.com
Tue May 4 18:58:18 MSK 2021


 - vclock_get returns int64_t
 - vclock_sum returns int64_t

Part-of #5846

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 src/box/wal.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/box/wal.c b/src/box/wal.c
index 6468df884..fff530a38 100644
--- a/src/box/wal.c
+++ b/src/box/wal.c
@@ -1009,13 +1009,14 @@ wal_assign_lsn(struct vclock *vclock_diff, struct vclock *base,
 			int64_t diff = (*row)->lsn - vclock_get(base, (*row)->replica_id);
 			if (diff <= vclock_get(vclock_diff,
 					       (*row)->replica_id)) {
+				int64_t confirmed_lsn =
+					vclock_get(base, (*row)->replica_id) +
+					vclock_get(vclock_diff, (*row)->replica_id);
 				say_crit("Attempt to write a broken LSN to WAL:"
-					 " replica id: %d, confirmed lsn: %d,"
-					 " new lsn %d", (*row)->replica_id,
-					 vclock_get(base, (*row)->replica_id) +
-					 vclock_get(vclock_diff,
-						    (*row)->replica_id),
-						    (*row)->lsn);
+					 " replica id: %d, confirmed lsn: %lld,"
+					 " new lsn %lld", (*row)->replica_id,
+					 (long long)confirmed_lsn,
+					 (long long)(*row)->lsn);
 				assert(false);
 			} else {
 				vclock_follow(vclock_diff, (*row)->replica_id, diff);
@@ -1254,9 +1255,9 @@ wal_write_async(struct journal *journal, struct journal_entry *entry)
 		 * commit a transaction which has seen changes
 		 * that will be rolled back.
 		 */
-		say_error("Aborting transaction %llu during "
+		say_error("Aborting transaction %lld during "
 			  "cascading rollback",
-			  vclock_sum(&writer->vclock));
+			  (long long)vclock_sum(&writer->vclock));
 		goto fail;
 	}
 
-- 
2.30.2



More information about the Tarantool-patches mailing list