fix: incorrect release of sharky locations (#2848)

ethersphere · Mar 16, 2022 · dda5606 · dda5606
1 parent 447d24d
commit dda5606
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/pkg/localstore/mode_put.go b/pkg/localstore/mode_put.go
@@ -295,7 +295,12 @@ func (db *DB) putRequest(
 			return false, 0, 0, err
 		}
 
-		l, err := sharky.LocationFromBinary(previous.Location)
+		previousIdx, err := db.retrievalDataIndex.Get(previous)
+		if err != nil {
+			return false, 0, 0, fmt.Errorf("could not fetch previous item: %w", err)
+		}
+
+		l, err := sharky.LocationFromBinary(previousIdx.Location)
 		if err != nil {
 			return false, 0, 0, err
 		}
@@ -383,7 +388,12 @@ func (db *DB) putUpload(
 			return false, 0, fmt.Errorf("same slot remove: %w", err)
 		}
 
-		l, err := sharky.LocationFromBinary(previous.Location)
+		previousIdx, err := db.retrievalDataIndex.Get(previous)
+		if err != nil {
+			return false, 0, fmt.Errorf("could not fetch previous item: %w", err)
+		}
+
+		l, err := sharky.LocationFromBinary(previousIdx.Location)
 		if err != nil {
 			return false, 0, err
 		}
@@ -443,7 +453,12 @@ func (db *DB) putSync(batch *leveldb.Batch, loc *releaseLocations, binIDs map[ui
 			return false, 0, 0, err
 		}
 
-		l, err := sharky.LocationFromBinary(previous.Location)
+		previousIdx, err := db.retrievalDataIndex.Get(previous)
+		if err != nil {
+			return false, 0, 0, fmt.Errorf("could not fetch previous item: %w", err)
+		}
+
+		l, err := sharky.LocationFromBinary(previousIdx.Location)
 		if err != nil {
 			return false, 0, 0, err
 		}

diff --git a/pkg/localstore/mode_put_test.go b/pkg/localstore/mode_put_test.go
@@ -320,6 +320,14 @@ func TestModePutSyncUpload_SameIndex(t *testing.T) {
 	if !yes {
 		t.Fatal("chunk should be there")
 	}
+
+	out, err := db.retrievalDataIndex.Get(chunkToItem(chunks[1]))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	validateData(t, db, out, chunks[1].Data())
+
 	binIDs := make(map[uint8]uint64)
 
 	for _, ch := range chunks {

diff --git a/pkg/sharky/store.go b/pkg/sharky/store.go
@@ -187,7 +187,7 @@ func (s *Store) Release(ctx context.Context, loc Location) error {
 	s.metrics.TotalReleaseCalls.Inc()
 	if err == nil {
 		shard := strconv.Itoa(int(sh.index))
-		s.metrics.CurrentShardSize.WithLabelValues(shard).Inc()
+		s.metrics.CurrentShardSize.WithLabelValues(shard).Dec()
 		s.metrics.ShardFragmentation.WithLabelValues(shard).Sub(float64(s.maxDataSize - int(loc.Length)))
 	} else {
 		s.metrics.TotalReleaseCallsErr.Inc()