github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/storage: prevent from clobbering nin-nil lastError in Storage.add

Browse source
This commit is contained in:
Aliaksandr Valialkin 2020-02-16 15:51:11 +02:00
parent afecb34491
commit ad4cb9f3ca
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/storage/storage.go
View file

@ -1038,8 +1038,8 @@ func (s *Storage) add(rows []rawRow, mrs []MetricRow, precisionBits uint8) ([]ra
if err := s.tb.AddRows(rows); err != nil { if err := s.tb.AddRows(rows); err != nil {
lastError = fmt.Errorf("cannot add rows to table: %s", err) lastError = fmt.Errorf("cannot add rows to table: %s", err)
} }
if err := s.updatePerDateData(rows, lastError); err != nil { if err := s.updatePerDateData(rows, lastError); err != nil lastError == nil {
lastError = err lastError = fmt.Errorf("cannot update per-date data: %s", err)
} }
if lastError != nil { if lastError != nil {
return rows, fmt.Errorf("error occurred during rows addition: %s", lastError) return rows, fmt.Errorf("error occurred during rows addition: %s", lastError)