X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9059fc9d13db73bde93b589955a941af44b4447d..b49229f98012d7c08ce02b8d28dbcc165c8a6c53:/services/keep-balance/block_state.go

diff --git a/services/keep-balance/block_state.go b/services/keep-balance/block_state.go
index 958cdb596b..029f8c6c07 100644
--- a/services/keep-balance/block_state.go
+++ b/services/keep-balance/block_state.go
@@ -7,7 +7,7 @@ package main
 import (
 	"sync"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 // Replica is a file on disk (or object in an S3 bucket, or blob in an
@@ -18,21 +18,54 @@ type Replica struct {
 	Mtime int64
 }
 
-// BlockState indicates the number of desired replicas (according to
-// the collections we know about) and the replicas actually stored
-// (according to the keepstore indexes we know about).
+// BlockState indicates the desired storage class and number of
+// replicas (according to the collections we know about) and the
+// replicas actually stored (according to the keepstore indexes we
+// know about).
 type BlockState struct {
+	Refs     map[string]bool // pdh => true (only tracked when len(Replicas)==0)
+	RefCount int
 	Replicas []Replica
-	Desired  int
+	Desired  map[string]int
+	// TODO: Support combinations of classes ("private + durable")
+	// by replacing the map[string]int with a map[*[]string]int
+	// here, where the map keys come from a pool of semantically
+	// distinct class combinations.
+	//
+	// TODO: Use a pool of semantically distinct Desired maps to
+	// conserve memory (typically there are far more BlockState
+	// objects in memory than distinct Desired profiles).
 }
 
+var defaultClasses = []string{"default"}
+
 func (bs *BlockState) addReplica(r Replica) {
 	bs.Replicas = append(bs.Replicas, r)
+	// Free up memory wasted by tracking PDHs that will never be
+	// reported (see comment in increaseDesired)
+	bs.Refs = nil
 }
 
-func (bs *BlockState) increaseDesired(n int) {
-	if bs.Desired < n {
-		bs.Desired = n
+func (bs *BlockState) increaseDesired(pdh string, classes []string, n int) {
+	if pdh != "" && len(bs.Replicas) == 0 {
+		// Note we only track PDHs if there's a possibility
+		// that we will report the list of referring PDHs,
+		// i.e., if we haven't yet seen a replica.
+		if bs.Refs == nil {
+			bs.Refs = map[string]bool{}
+		}
+		bs.Refs[pdh] = true
+	}
+	bs.RefCount++
+	if len(classes) == 0 {
+		classes = defaultClasses
+	}
+	for _, class := range classes {
+		if bs.Desired == nil {
+			bs.Desired = map[string]int{class: n}
+		} else if d, ok := bs.Desired[class]; !ok || d < n {
+			bs.Desired[class] = n
+		}
 	}
 }
 
@@ -88,12 +121,15 @@ func (bsm *BlockStateMap) AddReplicas(mnt *KeepMount, idx []arvados.KeepServiceI
 }
 
 // IncreaseDesired updates the map to indicate the desired replication
-// for the given blocks is at least n.
-func (bsm *BlockStateMap) IncreaseDesired(n int, blocks []arvados.SizedDigest) {
+// for the given blocks in the given storage class is at least n.
+//
+// If pdh is non-empty, it will be tracked and reported in the "lost
+// blocks" report.
+func (bsm *BlockStateMap) IncreaseDesired(pdh string, classes []string, n int, blocks []arvados.SizedDigest) {
 	bsm.mutex.Lock()
 	defer bsm.mutex.Unlock()
 
 	for _, blkid := range blocks {
-		bsm.get(blkid).increaseDesired(n)
+		bsm.get(blkid).increaseDesired(pdh, classes, n)
 	}
 }