From ca37194337a1e6b9882dcbacfd3e0aa4bec2e7a8 Mon Sep 17 00:00:00 2001
From: Alan Protasio <approtas@amazon.com>
Date: Wed, 27 Jul 2022 20:19:40 -0700
Subject: [PATCH] Fix updateCachedShippedBlocks - new thanos

Signed-off-by: Alan Protasio <approtas@amazon.com>
---
 pkg/ingester/ingester_v2.go      |  2 +-
 pkg/ingester/ingester_v2_test.go | 39 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/pkg/ingester/ingester_v2.go b/pkg/ingester/ingester_v2.go
index 653126a649d..b35411b72d7 100644
--- a/pkg/ingester/ingester_v2.go
+++ b/pkg/ingester/ingester_v2.go
@@ -310,7 +310,7 @@ func (u *userTSDB) blocksToDelete(blocks []*tsdb.Block) map[ulid.ULID]struct{} {
 // updateCachedShipperBlocks reads the shipper meta file and updates the cached shipped blocks.
 func (u *userTSDB) updateCachedShippedBlocks() error {
 	shipperMeta, err := shipper.ReadMetaFile(u.db.Dir())
-	if os.IsNotExist(err) {
+	if os.IsNotExist(err) || os.IsNotExist(errors.Cause(err)) {
 		// If the meta file doesn't exist it means the shipper hasn't run yet.
 		shipperMeta = &shipper.Meta{}
 	} else if err != nil {
diff --git a/pkg/ingester/ingester_v2_test.go b/pkg/ingester/ingester_v2_test.go
index 7e48abf9f65..e83d5a10996 100644
--- a/pkg/ingester/ingester_v2_test.go
+++ b/pkg/ingester/ingester_v2_test.go
@@ -2475,6 +2475,45 @@ func TestIngester_seriesCountIsCorrectAfterClosingTSDBForDeletedTenant(t *testin
 	require.Equal(t, int64(0), i.TSDBState.seriesCount.Load())
 }
 
+func TestIngester_sholdUpdateCacheShippedBlocks(t *testing.T) {
+	ctx := context.Background()
+	cfg := defaultIngesterTestConfig(t)
+	cfg.LifecyclerConfig.JoinAfter = 0
+	cfg.BlocksStorageConfig.TSDB.ShipConcurrency = 2
+
+	// Create ingester
+	i, err := prepareIngesterWithBlocksStorage(t, cfg, nil)
+	require.NoError(t, err)
+
+	require.NoError(t, services.StartAndAwaitRunning(ctx, i))
+	defer services.StopAndAwaitTerminated(ctx, i) //nolint:errcheck
+
+	// Wait until it's ACTIVE
+	test.Poll(t, 1*time.Second, ring.ACTIVE, func() interface{} {
+		return i.lifecycler.GetState()
+	})
+
+	mockUserShipper(t, i)
+
+	// Mock the shipper meta (no blocks).
+	db := i.getTSDB(userID)
+	err = db.updateCachedShippedBlocks()
+	require.NoError(t, err)
+
+	require.Equal(t, len(db.getCachedShippedBlocks()), 0)
+	shippedBlock, _ := ulid.Parse("01D78XZ44G0000000000000000")
+
+	require.NoError(t, shipper.WriteMetaFile(log.NewNopLogger(), db.db.Dir(), &shipper.Meta{
+		Version:  shipper.MetaVersion1,
+		Uploaded: []ulid.ULID{shippedBlock},
+	}))
+
+	err = db.updateCachedShippedBlocks()
+	require.NoError(t, err)
+
+	require.Equal(t, len(db.getCachedShippedBlocks()), 1)
+}
+
 func TestIngester_closeAndDeleteUserTSDBIfIdle_shouldNotCloseTSDBIfShippingIsInProgress(t *testing.T) {
 	ctx := context.Background()
 	cfg := defaultIngesterTestConfig(t)