From b29456984082a9be07792ba8f493a8a9820c9c99 Mon Sep 17 00:00:00 2001
From: Michal Niewrzal <michal@storj.io>
Date: Tue, 10 Dec 2019 15:28:46 +0100
Subject: [PATCH] segment-reaper: fix for not analyzing last project in detect
 command

This change fixes issue where last project in DB was not analyzed to
find zombie segments

Change-Id: I9efd8a39a65f72d85c7aae325a0e4e3cc1cb9afb
---
 cmd/segment-reaper/detect.go        |  2 +-
 cmd/segment-reaper/observer.go      |  9 ++++++
 cmd/segment-reaper/observer_test.go | 45 +++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/cmd/segment-reaper/detect.go b/cmd/segment-reaper/detect.go
index 5a329da0b..617124a83 100644
--- a/cmd/segment-reaper/detect.go
+++ b/cmd/segment-reaper/detect.go
@@ -88,7 +88,7 @@ func cmdDetect(cmd *cobra.Command, args []string) (err error) {
 		return err
 	}
 
-	err = metainfo.IterateDatabase(ctx, db, observer)
+	err = observer.detectZombieSegments(ctx)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/segment-reaper/observer.go b/cmd/segment-reaper/observer.go
index fd7142613..6494fa833 100644
--- a/cmd/segment-reaper/observer.go
+++ b/cmd/segment-reaper/observer.go
@@ -187,6 +187,15 @@ func (obsvr *observer) processSegment(ctx context.Context, path metainfo.ScopedP
 	return nil
 }
 
+func (obsvr *observer) detectZombieSegments(ctx context.Context) error {
+	err := metainfo.IterateDatabase(ctx, obsvr.db, obsvr)
+	if err != nil {
+		return err
+	}
+
+	return obsvr.analyzeProject(ctx)
+}
+
 // analyzeProject analyzes the objects in obsv.objects field for detecting bad
 // segments and writing them to objs.writer.
 func (obsvr *observer) analyzeProject(ctx context.Context) error {
diff --git a/cmd/segment-reaper/observer_test.go b/cmd/segment-reaper/observer_test.go
index ae7a155f4..aec70f2b5 100644
--- a/cmd/segment-reaper/observer_test.go
+++ b/cmd/segment-reaper/observer_test.go
@@ -6,6 +6,8 @@ package main
 import (
 	"bytes"
 	"context"
+	"encoding/base64"
+	"encoding/csv"
 	"fmt"
 	"math"
 	"math/rand"
@@ -19,6 +21,7 @@ import (
 	"github.com/skyrings/skyring-common/tools/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/zap/zaptest"
 
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/storj"
@@ -603,3 +606,45 @@ func assertObserver(t *testing.T, obsvr *observer, testdata testdataObjects) {
 		}
 	}
 }
+
+func TestObserver_processSegment_switch_project(t *testing.T) {
+	ctx := testcontext.New(t)
+	defer ctx.Cleanup()
+
+	// need bolddb to have DB with concurrent access support
+	db, err := metainfo.NewStore(zaptest.NewLogger(t), "bolt://"+ctx.File("pointers.db"))
+	require.NoError(t, err)
+	defer ctx.Check(db.Close)
+
+	buffer := new(bytes.Buffer)
+	writer := csv.NewWriter(buffer)
+	defer ctx.Check(writer.Error)
+
+	observer, err := newObserver(db, writer, nil, nil)
+	require.NoError(t, err)
+
+	// project IDs are pregenerated to avoid issues with iteration order
+	now := time.Now()
+	project1 := "7176d6a8-3a83-7ae7-e084-5fdbb1a17ac1"
+	project2 := "890dd9f9-6461-eb1b-c3d1-73af7252b9a4"
+
+	// zombie segment for project 1
+	_, err = makeSegment(ctx, db, storj.JoinPaths(project1, "s0", "bucket1", "path1"), now)
+	require.NoError(t, err)
+
+	// zombie segment for project 2
+	_, err = makeSegment(ctx, db, storj.JoinPaths(project2, "s0", "bucket1", "path1"), now)
+	require.NoError(t, err)
+
+	err = observer.detectZombieSegments(ctx)
+	require.NoError(t, err)
+
+	writer.Flush()
+
+	result := buffer.String()
+	for _, projectID := range []string{project1, project2} {
+		encodedPath := base64.StdEncoding.EncodeToString([]byte("path1"))
+		pathPrefix := strings.Join([]string{projectID, "s0", "bucket1", encodedPath, now.UTC().Format(time.RFC3339Nano)}, ",")
+		assert.Containsf(t, result, pathPrefix, "entry for projectID %s not found: %s", projectID)
+	}
+}