From 00b18b4da4dc828ea882225ac72be666acbe71ff Mon Sep 17 00:00:00 2001
From: Jarek Kowalski <jaak@jkowalski.net>
Date: Fri, 20 Jul 2018 18:26:14 -0800
Subject: [PATCH] switched to consistent listing of block indexes

---
 block/block_manager.go         | 19 ++++++++++++++-----
 internal/storagetesting/map.go |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/block/block_manager.go b/block/block_manager.go
index c493c6a86..75d813f8c 100644
--- a/block/block_manager.go
+++ b/block/block_manager.go
@@ -8,6 +8,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"math"
 	"math/rand"
 	"os"
 	"reflect"
@@ -1021,7 +1022,13 @@ func (bm *Manager) assertLocked() {
 
 // Refresh reloads the committed block indexes.
 func (bm *Manager) Refresh(ctx context.Context) (bool, error) {
+	bm.mu.Lock()
+	defer bm.mu.Unlock()
+
+	log.Debugf("Refresh started")
+	t0 := time.Now()
 	_, updated, err := bm.loadPackIndexesUnlocked(ctx)
+	log.Debugf("Refresh completed in %v and updated=%v", time.Since(t0), updated)
 	return updated, err
 }
 
@@ -1031,20 +1038,22 @@ type cachedList struct {
 }
 
 // listIndexBlocksFromStorage returns the list of index blocks in the given storage.
-// If 'full' is set to true, this function lists and returns all blocks,
-// if 'full' is false, the function returns only blocks from the last 2 compactions.
 // The list of blocks is not guaranteed to be sorted.
 func listIndexBlocksFromStorage(ctx context.Context, st storage.Storage) ([]IndexInfo, error) {
+	snapshot, err := storage.ListAllBlocksConsistent(ctx, st, newIndexBlockPrefix, math.MaxInt32)
+	if err != nil {
+		return nil, err
+	}
+
 	var results []IndexInfo
-	err := st.ListBlocks(ctx, newIndexBlockPrefix, func(it storage.BlockMetadata) error {
+	for _, it := range snapshot {
 		ii := IndexInfo{
 			FileName:  it.BlockID,
 			Timestamp: it.Timestamp,
 			Length:    it.Length,
 		}
 		results = append(results, ii)
-		return nil
-	})
+	}
 
 	return results, err
 }
diff --git a/internal/storagetesting/map.go b/internal/storagetesting/map.go
index 464a3705e..f5f2f7e80 100644
--- a/internal/storagetesting/map.go
+++ b/internal/storagetesting/map.go
@@ -66,7 +66,6 @@ func (s *mapStorage) DeleteBlock(ctx context.Context, id string) error {
 
 func (s *mapStorage) ListBlocks(ctx context.Context, prefix string, callback func(storage.BlockMetadata) error) error {
 	s.mutex.RLock()
-	s.mutex.RUnlock()
 
 	keys := []string{}
 	for k := range s.data {
@@ -74,6 +73,7 @@ func (s *mapStorage) ListBlocks(ctx context.Context, prefix string, callback fun
 			keys = append(keys, k)
 		}
 	}
+	s.mutex.RUnlock()
 
 	sort.Strings(keys)