Tarantool development patches archive
 help / color / mirror / Atom feed
From: Cyrill Gorcunov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: tml <tarantool-patches@dev.tarantool.org>
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Subject: [Tarantool-patches] [PATCH v3 09/10] wal: fix say_x format
Date: Tue,  4 May 2021 18:58:18 +0300	[thread overview]
Message-ID: <20210504155819.290874-10-gorcunov@gmail.com> (raw)
In-Reply-To: <20210504155819.290874-1-gorcunov@gmail.com>

 - vclock_get returns int64_t
 - vclock_sum returns int64_t

Part-of #5846

Signed-off-by: Cyrill Gorcunov <gorcunov@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


  parent reply	other threads:[~2021-05-04 16:01 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-04 15:58 [Tarantool-patches] [PATCH v3 00/10] fix say_x format and rework fibers Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 01/10] fiber: use uint64_t for fiber IDs Cyrill Gorcunov via Tarantool-patches
2021-05-10 18:40   ` Vladislav Shpilevoy via Tarantool-patches
2021-05-10 21:40     ` Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 02/10] popen: fix say_x format arguments Cyrill Gorcunov via Tarantool-patches
2021-05-10 18:40   ` Vladislav Shpilevoy via Tarantool-patches
2021-05-10 21:41     ` Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 03/10] raft: fix say_x arguments Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 04/10] box/error: fix argument for CustomError Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 05/10] xlog: fix say_x format Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 06/10] box/vynil: " Cyrill Gorcunov via Tarantool-patches
2021-05-10 18:40   ` Vladislav Shpilevoy via Tarantool-patches
2021-05-10 21:51     ` Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 07/10] txn: " Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 08/10] limbo: " Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` Cyrill Gorcunov via Tarantool-patches [this message]
2021-05-10 18:40   ` [Tarantool-patches] [PATCH v3 09/10] wal: " Vladislav Shpilevoy via Tarantool-patches
2021-05-10 21:55     ` Cyrill Gorcunov via Tarantool-patches
2021-05-04 15:58 ` [Tarantool-patches] [PATCH v3 10/10] say: fix CFORMAT specification Cyrill Gorcunov via Tarantool-patches
2021-05-10 18:40   ` Vladislav Shpilevoy via Tarantool-patches
2021-05-10 21:58     ` Cyrill Gorcunov via Tarantool-patches
2021-05-11 20:13 ` [Tarantool-patches] [PATCH v3 00/10] fix say_x format and rework fibers Vladislav Shpilevoy via Tarantool-patches
2021-05-11 21:15   ` Cyrill Gorcunov via Tarantool-patches
2021-05-11 21:24     ` Cyrill Gorcunov via Tarantool-patches
2021-05-12 18:41       ` Vladislav Shpilevoy via Tarantool-patches
2021-05-13  8:17         ` Cyrill Gorcunov via Tarantool-patches
2021-05-13 11:17           ` Vladislav Shpilevoy via Tarantool-patches
2021-05-13 11:44             ` Cyrill Gorcunov via Tarantool-patches
2021-05-13 12:09               ` Vladislav Shpilevoy via Tarantool-patches
2021-05-14  7:56 ` Kirill Yukhin via Tarantool-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210504155819.290874-10-gorcunov@gmail.com \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=gorcunov@gmail.com \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v3 09/10] wal: fix say_x format' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox