From bf959b36cb0b95b9fc42b8800fb3f71f773f0d6a Mon Sep 17 00:00:00 2001 From: Mauro Stettler Date: Wed, 19 Jan 2022 11:50:35 -0300 Subject: [PATCH] Nits after PR 10051 merge (#10159) Signed-off-by: Marco Pracucci Co-authored-by: Marco Pracucci --- tsdb/chunks/chunk_write_queue.go | 2 +- tsdb/chunks/head_chunks.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tsdb/chunks/chunk_write_queue.go b/tsdb/chunks/chunk_write_queue.go index 5cdd2e81f..628880b4c 100644 --- a/tsdb/chunks/chunk_write_queue.go +++ b/tsdb/chunks/chunk_write_queue.go @@ -34,7 +34,7 @@ type chunkWriteJob struct { // chunkWriteQueue is a queue for writing chunks to disk in a non-blocking fashion. // Chunks that shall be written get added to the queue, which is consumed asynchronously. -// Adding jobs to the job is non-blocking as long as the queue isn't full. +// Adding jobs to the queue is non-blocking as long as the queue isn't full. type chunkWriteQueue struct { jobs chan chunkWriteJob diff --git a/tsdb/chunks/head_chunks.go b/tsdb/chunks/head_chunks.go index 1b5845808..b9393865f 100644 --- a/tsdb/chunks/head_chunks.go +++ b/tsdb/chunks/head_chunks.go @@ -61,7 +61,7 @@ const ( CRCSize = 4 // MaxHeadChunkMetaSize is the max size of an mmapped chunks minus the chunks data. // Max because the uvarint size can be smaller. - MaxHeadChunkMetaSize = SeriesRefSize + 2*MintMaxtSize + ChunksFormatVersionSize + MaxChunkLengthFieldSize + CRCSize + MaxHeadChunkMetaSize = SeriesRefSize + 2*MintMaxtSize + ChunkEncodingSize + MaxChunkLengthFieldSize + CRCSize // MinWriteBufferSize is the minimum write buffer size allowed. MinWriteBufferSize = 64 * 1024 // 64KB. // MaxWriteBufferSize is the maximum write buffer size allowed. @@ -113,7 +113,7 @@ func (f *chunkPos) getNextChunkRef(chk chunkenc.Chunk) (chkRef ChunkDiskMapperRe chkLen := uint64(len(chk.Bytes())) bytesToWrite := f.bytesToWriteForChunk(chkLen) - if f.shouldCutNewFile(chkLen) { + if f.shouldCutNewFile(bytesToWrite) { f.toNewFile() f.cutFile = false cutFile = true @@ -144,14 +144,14 @@ func (f *chunkPos) initSeq(seq uint64) { } // shouldCutNewFile returns whether a new file should be cut based on the file size. -// The read or write lock on chunkPos must be held when calling this. -func (f *chunkPos) shouldCutNewFile(chunkSize uint64) bool { +// Not thread safe, a lock must be held when calling this. +func (f *chunkPos) shouldCutNewFile(bytesToWrite uint64) bool { if f.cutFile { return true } return f.offset == 0 || // First head chunk file. - f.offset+chunkSize+MaxHeadChunkMetaSize > MaxHeadChunkFileSize // Exceeds the max head chunk file size. + f.offset+bytesToWrite > MaxHeadChunkFileSize // Exceeds the max head chunk file size. } // bytesToWriteForChunk returns the number of bytes that will need to be written for the given chunk size,