From 3e50edf46f0b3905659cebff370ba088835c80e0 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 11 Oct 2018 12:05:57 +0200 Subject: [PATCH] lib/db: More info in sequence panic msg (#5261) --- lib/db/instance.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/db/instance.go b/lib/db/instance.go index 8c1a972d..e8f314bb 100644 --- a/lib/db/instance.go +++ b/lib/db/instance.go @@ -8,7 +8,6 @@ package db import ( "bytes" - "encoding/binary" "fmt" "github.com/syncthing/syncthing/lib/protocol" @@ -155,10 +154,8 @@ func (db *instance) withHaveSequence(folder []byte, startSeq int64, fn Iterator) } if shouldDebug() { - key := dbi.Key() - seq := int64(binary.BigEndian.Uint64(key[keyPrefixLen+keyFolderLen:])) - if f.Sequence != seq { - panic(fmt.Sprintf("sequence index corruption, file sequence %d != expected %d", f.Sequence, seq)) + if seq := db.keyer.SequenceFromSequenceKey(dbi.Key()); f.Sequence != seq { + panic(fmt.Sprintf("sequence index corruption (folder %v, file %v): sequence %d != expected %d", string(folder), f.Name, f.Sequence, seq)) } } if !fn(f) {