Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-15 08:23:34 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

app/vmselect/netstorage: properly handle the case when an empty brsPool points to the end of brs.brs

Browse Source 
This case is possible after a new brsPool is allocated. The fix is to verify whether len(brsPool) >= len(brs.brs)
before trying to append a new item to brsPool and sharing its contents with brs.brs.

Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5733
This commit is contained in:
Aliaksandr Valialkin 2024-01-31 10:25:53 +02:00
parent 151247c9b9
commit 4f5cb17042
No known key found for this signature in database
GPG Key ID: 52C003EE2BCDB9EB
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/vmselect/netstorage/netstorage.go
View File

@ -1382,10 +1382,23 @@ type blockAddrs struct {
addrs []tmpBlockAddr addrs []tmpBlockAddr
} }
func haveSameBlockAddrTails(a, b []tmpBlockAddr) bool { // canAppendToBlockAddrPool returns true if a points to the pool and the last item in a is the last item in the pool.
sha := (*reflect.SliceHeader)(unsafe.Pointer(&a)) //
shb := (*reflect.SliceHeader)(unsafe.Pointer(&b)) // In this case it is safe appending an item to the pool and then updating the a, so it refers to the extended slice.
return sha.Data+uintptr(sha.Len)*unsafe.Sizeof(tmpBlockAddr{}) == shb.Data+uintptr(shb.Len)*unsafe.Sizeof(tmpBlockAddr{}) //
// True is also returned if a is nil, since in this case it is safe appending an item to the pool and pointing a
// to the last item in the pool.
func canAppendToBlockAddrPool(pool, a []tmpBlockAddr) bool {
if a == nil {
return true
}
if len(a) > len(pool) {
// a doesn't belong to pool
return false
}
shPool := (*reflect.SliceHeader)(unsafe.Pointer(&pool))
shA := (*reflect.SliceHeader)(unsafe.Pointer(&a))
return shPool.Data+uintptr(shPool.Len)*unsafe.Sizeof(tmpBlockAddr{}) == shA.Data+uintptr(shA.Len)*unsafe.Sizeof(tmpBlockAddr{})
} }
func (tbfwLocal *tmpBlocksFileWrapperShard) newBlockAddrs() int { func (tbfwLocal *tmpBlocksFileWrapperShard) newBlockAddrs() int {
@ -1442,7 +1455,7 @@ func (tbfw *tmpBlocksFileWrapper) RegisterAndWriteBlock(mb *storage.MetricBlock,
addrsPool = make([]tmpBlockAddr, 0, maxFastAllocBlockSize/unsafe.Sizeof(tmpBlockAddr{})) addrsPool = make([]tmpBlockAddr, 0, maxFastAllocBlockSize/unsafe.Sizeof(tmpBlockAddr{}))
tbfwLocal.addrsPool = addrsPool tbfwLocal.addrsPool = addrsPool
} }
if addrs.addrs == nil || haveSameBlockAddrTails(addrs.addrs, addrsPool) { if canAppendToBlockAddrPool(addrsPool, addrs.addrs) {
// It is safe appending addr to addrsPool, since there are no other items added there yet. // It is safe appending addr to addrsPool, since there are no other items added there yet.
addrsPool = append(addrsPool, addr) addrsPool = append(addrsPool, addr)
tbfwLocal.addrsPool = addrsPool tbfwLocal.addrsPool = addrsPool

1
docs/CHANGELOG.md
View File

@ -28,6 +28,7 @@ The sandbox cluster installation is running under the constant load generated by
## tip ## tip
* BUGFIX: fix `runtime error: slice bounds out of range` panic, which can occur during query execution. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5733). The bug has been introduced in `v1.97.0`.
* BUGFIX: [MetricsQL](https://docs.victoriametrics.com/MetricsQL.html): properly handle `avg_over_time({some_filter}[d]) keep_metric_names` queries, where [`some_filter`](https://docs.victoriametrics.com/keyconcepts/#filtering) matches multiple time series with multiple names, while `d` is bigger or equal to `3h`. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5556). * BUGFIX: [MetricsQL](https://docs.victoriametrics.com/MetricsQL.html): properly handle `avg_over_time({some_filter}[d]) keep_metric_names` queries, where [`some_filter`](https://docs.victoriametrics.com/keyconcepts/#filtering) matches multiple time series with multiple names, while `d` is bigger or equal to `3h`. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5556).
* BUGFIX: dashboards/single: fix typo in query for `version` annotation which falsely produced many version change events. * BUGFIX: dashboards/single: fix typo in query for `version` annotation which falsely produced many version change events.