projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7607-getting-started-flag
[arvados.git]
/
services
/
datamanager
/
datamanager.go
diff --git
a/services/datamanager/datamanager.go
b/services/datamanager/datamanager.go
index ba7446e7548823156ec7de7d9208e059bd0c3c34..604a6db2f4a16ac97aea4579111f0d909c6c5d9e 100644
(file)
--- a/
services/datamanager/datamanager.go
+++ b/
services/datamanager/datamanager.go
@@
-108,10
+108,9
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
dataFetcher = BuildDataFetcher(arv)
}
dataFetcher = BuildDataFetcher(arv)
}
- dataFetcher(arvLogger, &readCollections, &keepServerInfo)
-
- if readCollections.Err != nil {
- return readCollections.Err
+ err = dataFetcher(arvLogger, &readCollections, &keepServerInfo)
+ if err != nil {
+ return err
}
err = summary.MaybeWriteData(arvLogger, readCollections, keepServerInfo)
}
err = summary.MaybeWriteData(arvLogger, readCollections, keepServerInfo)
@@
-138,6
+137,11
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
rlbss.Count)
}
rlbss.Count)
}
+ kc, err := keepclient.MakeKeepClient(&arv)
+ if err != nil {
+ return fmt.Errorf("Error setting up keep client %v", err.Error())
+ }
+
// Log that we're finished. We force the recording, since go will
// not wait for the write timer before exiting.
if arvLogger != nil {
// Log that we're finished. We force the recording, since go will
// not wait for the write timer before exiting.
if arvLogger != nil {
@@
-151,12
+155,6
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
})
}
})
}
- // Not dry-run; issue changes to keepstore
- kc, err := keepclient.MakeKeepClient(&arv)
- if err != nil {
- return fmt.Errorf("Error setting up keep client %v", err.Error())
- }
-
pullServers := summary.ComputePullServers(kc,
&keepServerInfo,
readCollections.BlockToDesiredReplication,
pullServers := summary.ComputePullServers(kc,
&keepServerInfo,
readCollections.BlockToDesiredReplication,
@@
-183,30
+181,35
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
// BuildDataFetcher returns a data fetcher that fetches data from remote servers.
func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
// BuildDataFetcher returns a data fetcher that fetches data from remote servers.
func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
- return func(arvLogger *logger.Logger,
+ return func(
+ arvLogger *logger.Logger,
readCollections *collection.ReadCollections,
readCollections *collection.ReadCollections,
- keepServerInfo *keep.ReadServers) {
- collectionChannel := make(chan collection.ReadCollections)
-
+ keepServerInfo *keep.ReadServers,
+ ) error {
+ collDone := make(chan struct{})
+ var collErr error
go func() {
go func() {
-
collectionChannel <-
collection.GetCollectionsAndSummarize(
+
*readCollections, collErr =
collection.GetCollectionsAndSummarize(
collection.GetCollectionsParams{
Client: arv,
Logger: arvLogger,
BatchSize: 50})
collection.GetCollectionsParams{
Client: arv,
Logger: arvLogger,
BatchSize: 50})
+ collDone <- struct{}{}
}()
}()
- var
e
rr error
- *keepServerInfo,
e
rr = keep.GetKeepServersAndSummarize(
+ var
keepE
rr error
+ *keepServerInfo,
keepE
rr = keep.GetKeepServersAndSummarize(
keep.GetKeepServersParams{
Client: arv,
Logger: arvLogger,
Limit: 1000})
keep.GetKeepServersParams{
Client: arv,
Logger: arvLogger,
Limit: 1000})
- if err != nil {
- return
- }
+ <- collDone
- *readCollections = <-collectionChannel
+ // Return a nil error only if both parts succeeded.
+ if collErr != nil {
+ return collErr
+ }
+ return keepErr
}
}
}
}