mirror of
https://github.com/prometheus/prometheus.git
synced 2025-08-06 14:17:12 +02:00
fix: unlock of unlocked mutex (#16332)
* fix: unlock on unlocked mutex Signed-off-by: Usama Alhanaqtah <a.usama@yandex.ru> * test coverage Signed-off-by: Usama Alhanaqtah <a.usama@yandex.ru> --------- Signed-off-by: Usama Alhanaqtah <a.usama@yandex.ru> Co-authored-by: alhanaqtah.usama <alhanaqtah.usama@DEV-254.local>
This commit is contained in:
parent
d86796863f
commit
89f011ba13
@ -799,13 +799,17 @@ func (a *headAppender) AppendHistogramCTZeroSample(ref storage.SeriesRef, lset l
|
|||||||
if errors.Is(err, storage.ErrOutOfOrderSample) {
|
if errors.Is(err, storage.ErrOutOfOrderSample) {
|
||||||
return 0, storage.ErrOutOfOrderCT
|
return 0, storage.ErrOutOfOrderCT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// OOO is not allowed because after the first scrape, CT will be the same for most (if not all) future samples.
|
// OOO is not allowed because after the first scrape, CT will be the same for most (if not all) future samples.
|
||||||
// This is to prevent the injected zero from being marked as OOO forever.
|
// This is to prevent the injected zero from being marked as OOO forever.
|
||||||
if isOOO {
|
if isOOO {
|
||||||
s.Unlock()
|
s.Unlock()
|
||||||
return 0, storage.ErrOutOfOrderCT
|
return 0, storage.ErrOutOfOrderCT
|
||||||
}
|
}
|
||||||
|
|
||||||
s.pendingCommit = true
|
s.pendingCommit = true
|
||||||
s.Unlock()
|
s.Unlock()
|
||||||
a.histograms = append(a.histograms, record.RefHistogramSample{
|
a.histograms = append(a.histograms, record.RefHistogramSample{
|
||||||
@ -832,13 +836,17 @@ func (a *headAppender) AppendHistogramCTZeroSample(ref storage.SeriesRef, lset l
|
|||||||
if errors.Is(err, storage.ErrOutOfOrderSample) {
|
if errors.Is(err, storage.ErrOutOfOrderSample) {
|
||||||
return 0, storage.ErrOutOfOrderCT
|
return 0, storage.ErrOutOfOrderCT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// OOO is not allowed because after the first scrape, CT will be the same for most (if not all) future samples.
|
// OOO is not allowed because after the first scrape, CT will be the same for most (if not all) future samples.
|
||||||
// This is to prevent the injected zero from being marked as OOO forever.
|
// This is to prevent the injected zero from being marked as OOO forever.
|
||||||
if isOOO {
|
if isOOO {
|
||||||
s.Unlock()
|
s.Unlock()
|
||||||
return 0, storage.ErrOutOfOrderCT
|
return 0, storage.ErrOutOfOrderCT
|
||||||
}
|
}
|
||||||
|
|
||||||
s.pendingCommit = true
|
s.pendingCommit = true
|
||||||
s.Unlock()
|
s.Unlock()
|
||||||
a.floatHistograms = append(a.floatHistograms, record.RefFloatHistogramSample{
|
a.floatHistograms = append(a.floatHistograms, record.RefFloatHistogramSample{
|
||||||
@ -852,6 +860,7 @@ func (a *headAppender) AppendHistogramCTZeroSample(ref storage.SeriesRef, lset l
|
|||||||
if ct > a.maxt {
|
if ct > a.maxt {
|
||||||
a.maxt = ct
|
a.maxt = ct
|
||||||
}
|
}
|
||||||
|
|
||||||
return storage.SeriesRef(s.ref), nil
|
return storage.SeriesRef(s.ref), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6717,6 +6717,50 @@ func TestHeadAppender_AppendCT(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestHeadAppender_AppendHistogramCTZeroSample(t *testing.T) {
|
||||||
|
testHistogram := tsdbutil.GenerateTestHistogram(1)
|
||||||
|
type appendableSamples struct {
|
||||||
|
ts int64
|
||||||
|
h *histogram.Histogram
|
||||||
|
fh *histogram.FloatHistogram
|
||||||
|
ct int64
|
||||||
|
}
|
||||||
|
for _, tc := range []struct {
|
||||||
|
name string
|
||||||
|
appendableSamples []appendableSamples
|
||||||
|
expectedError error
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "CT lower than minValidTime initiates ErrOutOfBounds",
|
||||||
|
appendableSamples: []appendableSamples{
|
||||||
|
{ts: 100, h: testHistogram, ct: -1},
|
||||||
|
},
|
||||||
|
expectedError: storage.ErrOutOfBounds,
|
||||||
|
},
|
||||||
|
} {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
h, _ := newTestHead(t, DefaultBlockDuration, compression.None, false)
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
require.NoError(t, h.Close())
|
||||||
|
}()
|
||||||
|
|
||||||
|
a := h.Appender(context.Background())
|
||||||
|
lbls := labels.FromStrings("foo", "bar")
|
||||||
|
|
||||||
|
for _, sample := range tc.appendableSamples {
|
||||||
|
ref, err := a.AppendHistogramCTZeroSample(0, lbls, sample.ts, sample.ct, sample.h, sample.fh)
|
||||||
|
require.ErrorIs(t, err, tc.expectedError)
|
||||||
|
|
||||||
|
_, err = a.AppendHistogram(ref, lbls, sample.ts, sample.h, sample.fh)
|
||||||
|
require.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
require.NoError(t, a.Commit())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestHeadCompactableDoesNotCompactEmptyHead(t *testing.T) {
|
func TestHeadCompactableDoesNotCompactEmptyHead(t *testing.T) {
|
||||||
// Use a chunk range of 1 here so that if we attempted to determine if the head
|
// Use a chunk range of 1 here so that if we attempted to determine if the head
|
||||||
// was compactable using default values for min and max times, `Head.compactable()`
|
// was compactable using default values for min and max times, `Head.compactable()`
|
||||||
|
Loading…
Reference in New Issue
Block a user