Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/filestore.go
Original file line number Diff line number Diff line change
Expand Up @@ -2345,7 +2345,7 @@ func (fs *fileStore) recoverMsgs() error {
if fs.ld != nil {
var emptyBlks []*msgBlock
for _, mb := range fs.blks {
if mb.msgs == 0 && mb.rbytes == 0 {
if mb.msgs == 0 && mb.rbytes == 0 && mb != fs.lmb {
emptyBlks = append(emptyBlks, mb)
}
}
Expand Down
49 changes: 49 additions & 0 deletions server/jetstream_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22329,3 +22329,52 @@ func TestJetStreamServerEncryptionRecoveryWithoutStreamStateFile(t *testing.T) {
})
}
}

func TestJetStreamFileStoreErrorOpeningBlockAfterTruncate(t *testing.T) {
storeDir := t.TempDir()
conf := createConfFile(t, []byte(fmt.Sprintf(`
listen: 127.0.0.1:-1
jetstream: {store_dir: %q}
`, storeDir)))

s, _ := RunServerWithConfig(conf)
defer s.Shutdown()

nc, js := jsClientConnect(t, s)
defer nc.Close()

_, err := js.AddStream(&nats.StreamConfig{
Name: "TEST",
Subjects: []string{"foo"},
})
require_NoError(t, err)

pubAck, err := js.Publish("foo", nil)
require_NoError(t, err)
require_Equal(t, pubAck.Sequence, 1)

// Shut down the server and manually truncate the message blocks to be entirely empty, simulating data loss.
mset, err := s.globalAccount().lookupStream("TEST")
require_NoError(t, err)
fs := mset.store.(*fileStore)
blk := filepath.Join(fs.fcfg.StoreDir, msgDir, "1.blk")
index := filepath.Join(fs.fcfg.StoreDir, msgDir, streamStreamStateFile)
nc.Close()
s.Shutdown()

// Truncate the block such that it isn't fully empty, but doesn't contain any messages.
require_NoError(t, os.Truncate(blk, 1))
require_NoError(t, os.Remove(index))

// Restart the server and reconnect.
s, _ = RunServerWithConfig(conf)
defer s.Shutdown()
nc, js = jsClientConnect(t, s)
defer nc.Close()

// Publish another message. Due to the simulated data loss, the stream sequence should continue
// counting after truncating the corrupted data.
pubAck, err = js.Publish("foo", nil)
require_NoError(t, err)
require_Equal(t, pubAck.Sequence, 1)
}