From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp21.mail.ru (smtp21.mail.ru [94.100.179.250]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 2D4C34696C6 for ; Thu, 13 Feb 2020 02:51:22 +0300 (MSK) From: sergepetrenko Date: Thu, 13 Feb 2020 02:51:01 +0300 Message-Id: <05d98ad17bd55b1437511c7ed57ee82a9a1625f9.1581551227.git.sergepetrenko@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 2/2] wal: panic when trying to write a record with a broken lsn List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: alexander.turenko@tarantool.org, v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org There is an assertion in vclock_follow `lsn > prev_lsn`, which doesn't fire in release builds, of course. So we better panic on an attemt to write a record with a duplicate or otherwise broken lsn. Follow-up #4739 --- src/box/wal.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/box/wal.c b/src/box/wal.c index 0ae66ff32..3d4317f34 100644 --- a/src/box/wal.c +++ b/src/box/wal.c @@ -951,9 +951,18 @@ wal_assign_lsn(struct vclock *vclock_diff, struct vclock *base, (*row)->tsn = tsn; (*row)->is_commit = row == end - 1; } else { - vclock_follow(vclock_diff, (*row)->replica_id, - (*row)->lsn - vclock_get(base, - (*row)->replica_id)); + int64_t diff = (*row)->lsn - vclock_get(base, (*row)->replica_id); + if (diff <= vclock_get(vclock_diff, + (*row)->replica_id)) { + panic("Attempt to write a broken LSN to WAL:" + " replica id: %d, committed lsn: %d," + " new lsn %d", (*row)->replica_id, + vclock_get(base, (*row)->replica_id) + + vclock_get(vclock_diff, + (*row)->replica_id), + (*row)->lsn); + } + vclock_follow(vclock_diff, (*row)->replica_id, diff); } } } -- 2.20.1 (Apple Git-117)