projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9701: Use a collection.OrderedDict instead of a simple dict to hold bufferblocks...
[arvados.git]
/
services
/
datamanager
/
datamanager.go
diff --git
a/services/datamanager/datamanager.go
b/services/datamanager/datamanager.go
index c1a5cbed75b6cd5439b439a1d1c81b900bf5505e..5250d175ffa9995779c47d2fbaefedc992f09096 100644
(file)
--- a/
services/datamanager/datamanager.go
+++ b/
services/datamanager/datamanager.go
@@
-22,6
+22,7
@@
var (
logEventTypePrefix string
logFrequencySeconds int
minutesBetweenRuns int
logEventTypePrefix string
logFrequencySeconds int
minutesBetweenRuns int
+ collectionBatchSize int
dryRun bool
)
dryRun bool
)
@@
-38,6
+39,10
@@
func init() {
"minutes-between-runs",
0,
"How many minutes we wait between data manager runs. 0 means run once and exit.")
"minutes-between-runs",
0,
"How many minutes we wait between data manager runs. 0 means run once and exit.")
+ flag.IntVar(&collectionBatchSize,
+ "collection-batch-size",
+ 1000,
+ "How many collections to request in each batch.")
flag.BoolVar(&dryRun,
"dry-run",
false,
flag.BoolVar(&dryRun,
"dry-run",
false,
@@
-76,7
+81,7
@@
func main() {
var arvLogger *logger.Logger
var arvLogger *logger.Logger
-func singlerun(arv arvadosclient.ArvadosClient) error {
+func singlerun(arv
*
arvadosclient.ArvadosClient) error {
var err error
if isAdmin, err := util.UserIsAdmin(arv); err != nil {
return errors.New("Error verifying admin token: " + err.Error())
var err error
if isAdmin, err := util.UserIsAdmin(arv); err != nil {
return errors.New("Error verifying admin token: " + err.Error())
@@
-108,10
+113,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,7
+142,7
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
rlbss.Count)
}
rlbss.Count)
}
- kc, err := keepclient.MakeKeepClient(
&
arv)
+ kc, err := keepclient.MakeKeepClient(arv)
if err != nil {
return fmt.Errorf("Error setting up keep client %v", err.Error())
}
if err != nil {
return fmt.Errorf("Error setting up keep client %v", err.Error())
}
@@
-181,31
+185,36
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
}
// BuildDataFetcher returns a data fetcher that fetches data from remote servers.
}
// BuildDataFetcher returns a data fetcher that fetches data from remote servers.
-func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
- return func(arvLogger *logger.Logger,
+func BuildDataFetcher(arv *arvadosclient.ArvadosClient) summary.DataFetcher {
+ 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,
collection.GetCollectionsParams{
Client: arv,
Logger: arvLogger,
- BatchSize: 50})
+ BatchSize: collectionBatchSize})
+ 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
}
}
}
}