Skip to content

Fix error="accessor: byte slice too small for indirectIndex" #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skladd wants to merge 2 commits into
base: 1.8.10+big_db_32bit
Choose a base branch
from
Open

Fix error="accessor: byte slice too small for indirectIndex" #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b4ab15
TSM1 reader accessor struct: use pointers to atomic values to ensure …
skladd May 22, 2023
1977b83
TSM reader: force int64 in blockAccessor.length() return value
skladd May 30, 2023
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
33 changes: 18 additions & 15 deletions tsdb/engine/tsm1/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ func (d *indirectIndex) Close() error {
// blockaccessor abstracts a method of accessing blocks from a
// TSM file through the accessor.
type blockAccessor interface {
length() int
length() int64
read(int64, int64) []byte
free() error
advise(bool) error
Expand Down Expand Up @@ -1338,8 +1338,8 @@ func NewMMapAccessor(f *os.File) (*mmapAccessor, error) {
return t, nil
}

func (m *mmapAccessor) length() int {
return len(m.b)
func (m *mmapAccessor) length() int64 {
return int64(len(m.b))
}

func (m *mmapAccessor) read(start int64, stop int64) []byte {
Expand All @@ -1360,7 +1360,7 @@ func (m *mmapAccessor) advise(need bool) error {

type seekAccessor struct {
f *os.File
l int
l int64
}

func NewSeekAccessor(f *os.File) (*seekAccessor, error) {
Expand All @@ -1372,11 +1372,11 @@ func NewSeekAccessor(f *os.File) (*seekAccessor, error) {
}
t.f = f
// TSM files are immutable so their size won't change
t.l = int(stat.Size())
t.l = stat.Size()
return t, nil
}

func (m *seekAccessor) length() int {
func (m *seekAccessor) length() int64 {
return m.l
}

Expand All @@ -1403,8 +1403,8 @@ func (m *seekAccessor) advise(need bool) error {
// Access is mmap based block accessor. It access blocks through an
// MMAP or seek/read file interface, depending on the type of blockAccessor
type accessor struct {
accessCount uint64 // Counter incremented everytime the accessor is accessed
freeCount uint64 // Counter to determine whether the accessor can free its resources
accessCount *uint64 // Counter incremented everytime the accessor is accessed
freeCount *uint64 // Counter to determine whether the accessor can free its resources

mmapWillNeed bool // If true then mmap advise value MADV_WILLNEED will be provided the kernel for b.
useSeek bool // If true, use seekAccessor instead of mmapAccessor
Expand All @@ -1424,6 +1424,9 @@ func (m *accessor) init() (*indirectIndex, error) {
return nil, err
}

m.freeCount = new(uint64)
m.accessCount = new(uint64)

var err error
if (m.useSeek) {
m.b, err = NewSeekAccessor(m.f)
Expand Down Expand Up @@ -1461,14 +1464,14 @@ func (m *accessor) init() (*indirectIndex, error) {

// Allow resources to be freed immediately if requested
m.incAccess()
atomic.StoreUint64(&m.freeCount, 1)
atomic.StoreUint64(m.freeCount, 1)

return m.index, nil
}

func (m *accessor) free() error {
accessCount := atomic.LoadUint64(&m.accessCount)
freeCount := atomic.LoadUint64(&m.freeCount)
accessCount := atomic.LoadUint64(m.accessCount)
freeCount := atomic.LoadUint64(m.freeCount)

// Already freed everything.
if freeCount == 0 && accessCount == 0 {
Expand All @@ -1479,13 +1482,13 @@ func (m *accessor) free() error {
// If so, don't free anything and record the access count that we
// see now for the next check.
if accessCount != freeCount {
atomic.StoreUint64(&m.freeCount, accessCount)
atomic.StoreUint64(m.freeCount, accessCount)
return nil
}

// Reset both counters to zero to indicate that we have freed everything.
atomic.StoreUint64(&m.accessCount, 0)
atomic.StoreUint64(&m.freeCount, 0)
atomic.StoreUint64(m.accessCount, 0)
atomic.StoreUint64(m.freeCount, 0)

m.mu.RLock()
defer m.mu.RUnlock()
Expand All @@ -1494,7 +1497,7 @@ func (m *accessor) free() error {
}

func (m *accessor) incAccess() {
atomic.AddUint64(&m.accessCount, 1)
atomic.AddUint64(m.accessCount, 1)
}

func (m *accessor) rename(path string) error {
Expand Down