Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance the WAL file related error

Browse Source 
The `ErrFileNotFound` was used for for three cases:
1. There is no any WAL files (probably due to no read permission);
2. There is no WAL files matching the snapshot index;
3. The WAL file seqs do not increase continuously.

It's not good for debug when users see the `ErrFileNotFound` error,
so in this PR, a different error is returned for each case above.

Signed-off-by: Benjamin Wang <wachao@vmware.com>
This commit is contained in:
Benjamin Wang 2022-08-03 05:29:46 +08:00
parent 4f0e92d94c
commit 3dd7d3f9af
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/storage/wal/wal.go
View File

@ -377,9 +377,12 @@ func selectWALFiles(lg *zap.Logger, dirpath string, snap walpb.Snapshot) ([]stri
}
nameIndex, ok := searchIndex(lg, names, snap.Index)
if !ok || !isValidSeq(lg, names[nameIndex:]) {
err = ErrFileNotFound
return nil, -1, err
if !ok {
return nil, -1, fmt.Errorf("wal: file not found which matches the snapshot index '%d'", snap.Index)
}
if !isValidSeq(lg, names[nameIndex:]) {
return nil, -1, fmt.Errorf("wal: file sequence numbers (starting from %d) do not increase continuously", nameIndex)
}
return names, nameIndex, nil

5
server/storage/wal/wal_test.go
View File

@ -25,6 +25,7 @@ import (
"path/filepath"
"reflect"
"regexp"
"strings"
"testing"
"github.com/stretchr/testify/assert"
@ -539,8 +540,8 @@ func TestRecoverAfterCut(t *testing.T) {
w, err := Open(zaptest.NewLogger(t), p, walpb.Snapshot{Index: uint64(i), Term: 1})
if err != nil {
if i <= 4 {
if err != ErrFileNotFound {
t.Errorf("#%d: err = %v, want %v", i, err, ErrFileNotFound)
if !strings.Contains(err.Error(), "do not increase continuously") {
t.Errorf("#%d: err = %v isn't expected, want: '* do not increase continuously'", i, err)
}
} else {
t.Errorf("#%d: err = %v, want nil", i, err)