Date: Saturday, March 27, 2021 @ 20:19:39 Author: jelle Revision: 411126
upgpkg: prometheus 2.25.2-1 Added: prometheus/trunk/fix-test-suite-failure-go1.16.patch Modified: prometheus/trunk/PKGBUILD -------------------------------------+ PKGBUILD | 15 +++++-- fix-test-suite-failure-go1.16.patch | 71 ++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-27 19:53:16 UTC (rev 411125) +++ PKGBUILD 2021-03-27 20:19:39 UTC (rev 411126) @@ -1,7 +1,7 @@ # Maintainer: Johannes Löthberg <[email protected]> pkgname=prometheus -pkgver=2.25.0 +pkgver=2.25.2 pkgrel=1 pkgdesc='An open-source systems monitoring and alerting toolkit' @@ -17,13 +17,20 @@ source=("prometheus-v$pkgver.tar.gz::https://github.com/prometheus/prometheus/archive/v$pkgver.tar.gz"; prometheus.service prometheus.sysusers - prometheus.conf) + prometheus.conf + fix-test-suite-failure-go1.16.patch::https://github.com/prometheus/prometheus/commit/8bf7bc68f1d678ea82c392f80486a62e7973720b.patch) -sha256sums=('bb95b39870a1844483c0775c5122092b07006ae26f8961a881bebb7eafe52afa' +sha256sums=('85f50c0cfb4db206a59d2c3301e02d685c3fe4b451b41ca943a4eb94935cf4d4' 'f358986865bd3d06dc47a265aeb3b5ef64aa644e831f07731c2fc7af64d9e98f' '2747fabb4e56b808361eb7dd7acf9729ab8973d1ebe2f857dd56f6c71f71e45f' - '6d32deb125381cbebac11b6953a7d9a65eb7e50f209dc1e22c63facf678a3070') + '6d32deb125381cbebac11b6953a7d9a65eb7e50f209dc1e22c63facf678a3070' + 'a8adb5f0999db24f17e215571e1c809620a50e184f565137f48e9f57b06a7aca') +prepare() { + cd prometheus-$pkgver + patch -Np1 -i ${srcdir}/fix-test-suite-failure-go1.16.patch +} + build() { cd prometheus-$pkgver Added: fix-test-suite-failure-go1.16.patch =================================================================== --- fix-test-suite-failure-go1.16.patch (rev 0) +++ fix-test-suite-failure-go1.16.patch 2021-03-27 20:19:39 UTC (rev 411126) @@ -0,0 +1,71 @@ +From 8bf7bc68f1d678ea82c392f80486a62e7973720b Mon Sep 17 00:00:00 2001 +From: Bartlomiej Plotka <[email protected]> +Date: Thu, 25 Feb 2021 10:08:12 +0100 +Subject: [PATCH] Fixed TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks for + go1.16 (#8538) + +Fixes https://github.com/prometheus/prometheus/issues/8403 + +Signed-off-by: Bartlomiej Plotka <[email protected]> +--- + tsdb/chunks/head_chunks.go | 4 +++- + tsdb/chunks/head_chunks_test.go | 11 ++--------- + 2 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/tsdb/chunks/head_chunks.go b/tsdb/chunks/head_chunks.go +index 051b9b1a89..d5386f7ea1 100644 +--- a/tsdb/chunks/head_chunks.go ++++ b/tsdb/chunks/head_chunks.go +@@ -605,12 +605,14 @@ func (cdm *ChunkDiskMapper) IterateAllChunks(f func(seriesRef, chunkRef uint64, + } + } + if allZeros { ++ // End of segment chunk file content. + break + } + return &CorruptionErr{ + Dir: cdm.dir.Name(), + FileIndex: segID, +- Err: errors.Errorf("head chunk file doesn't include enough bytes to read the chunk header - required:%v, available:%v, file:%d", idx+MaxHeadChunkMetaSize, fileEnd, segID), ++ Err: errors.Errorf("head chunk file has some unread data, but doesn't include enough bytes to read the chunk header"+ ++ " - required:%v, available:%v, file:%d", idx+MaxHeadChunkMetaSize, fileEnd, segID), + } + } + chkCRC32.Reset() +diff --git a/tsdb/chunks/head_chunks_test.go b/tsdb/chunks/head_chunks_test.go +index 43aa0484b4..3519439003 100644 +--- a/tsdb/chunks/head_chunks_test.go ++++ b/tsdb/chunks/head_chunks_test.go +@@ -118,11 +118,6 @@ func TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks(t *testing.T) { + fileEnd := HeadChunkFileHeaderSize + len(expectedBytes) + require.Equal(t, expectedBytes, actualBytes[HeadChunkFileHeaderSize:fileEnd]) + +- // Test for the next chunk header to be all 0s. That marks the end of the file. +- for _, b := range actualBytes[fileEnd : fileEnd+MaxHeadChunkMetaSize] { +- require.Equal(t, byte(0), b) +- } +- + // Testing reading of chunks. + for _, exp := range expectedData { + actChunk, err := hrw.Chunk(exp.chunkRef) +@@ -137,7 +132,7 @@ func TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks(t *testing.T) { + require.NoError(t, err) + + idx := 0 +- err = hrw.IterateAllChunks(func(seriesRef, chunkRef uint64, mint, maxt int64, numSamples uint16) error { ++ require.NoError(t, hrw.IterateAllChunks(func(seriesRef, chunkRef uint64, mint, maxt int64, numSamples uint16) error { + t.Helper() + + expData := expectedData[idx] +@@ -153,10 +148,8 @@ func TestChunkDiskMapper_WriteChunk_Chunk_IterateChunks(t *testing.T) { + + idx++ + return nil +- }) +- require.NoError(t, err) ++ })) + require.Equal(t, len(expectedData), idx) +- + } + + // TestChunkDiskMapper_Truncate tests
