3550: Merge branch 'master' into 3550-local-pipeline

[arvados.git] / services / keepstore / keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 79ce9684593d71cd27e936290f2dca9f1970bff9..06054f5205cf7d38b01b179ee5365230120ccc89 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -4,7 +4,6 @@ import (
        "bytes"
        "flag"
        "fmt"
-       "git.curoverse.com/arvados.git/services/keepstore/pull_list"
        "io/ioutil"
        "log"
        "net"
@@ -92,11 +91,12 @@ func (e *KeepError) Error() string {
 // Initialized by the --volumes flag (or by FindKeepVolumes).
 var KeepVM VolumeManager
 
-// The pull list manager is responsible for pulling blocks from other
-// Keep servers to ensure replication. When Keep receives a new "pull
-// list" from Data Manager, the pull manager is responsible for fetching
-// blocks on the list.
-var pullmgr *pull_list.Manager
+// The pull list manager is a singleton pull list (a list of blocks
+// that the current keepstore process should be pulling from remote
+// keepstore servers in order to increase data replication) with
+// atomic update methods that are safe to use from multiple
+// goroutines.
+var pullmgr *BlockWorkList
 
 // TODO(twp): continue moving as much code as possible out of main
 // so it can be effectively tested. Esp. handling and postprocessing