func main() {
flag.Parse()
if minutesBetweenRuns == 0 {
- err := singlerun(makeArvadosClient())
+ arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
- log.Fatalf("singlerun: %v", err)
+ loggerutil.FatalWithMessage(arvLogger, fmt.Sprintf("Error making arvados client: %v", err))
+ }
+ err = singlerun(arv)
+ if err != nil {
+ loggerutil.FatalWithMessage(arvLogger, fmt.Sprintf("singlerun: %v", err))
}
} else {
waitTime := time.Minute * time.Duration(minutesBetweenRuns)
for {
log.Println("Beginning Run")
- err := singlerun(makeArvadosClient())
+ arv, err := arvadosclient.MakeArvadosClient()
+ if err != nil {
+ loggerutil.FatalWithMessage(arvLogger, fmt.Sprintf("Error making arvados client: %v", err))
+ }
+ err = singlerun(arv)
if err != nil {
log.Printf("singlerun: %v", err)
}
}
}
-func makeArvadosClient() arvadosclient.ArvadosClient {
- arv, err := arvadosclient.MakeArvadosClient()
- if err != nil {
- log.Fatalf("Error setting up arvados client: %s", err)
- }
- return arv
-}
+var arvLogger *logger.Logger
func singlerun(arv arvadosclient.ArvadosClient) error {
var err error
return errors.New("Current user is not an admin. Datamanager requires a privileged token.")
}
- var arvLogger *logger.Logger
if logEventTypePrefix != "" {
arvLogger = logger.NewLogger(logger.LoggerParams{
Client: arv,
dataFetcher(arvLogger, &readCollections, &keepServerInfo)
- summary.MaybeWriteData(arvLogger, readCollections, keepServerInfo)
+ if readCollections.Err != nil {
+ return readCollections.Err
+ }
+
+ err = summary.MaybeWriteData(arvLogger, readCollections, keepServerInfo)
+ if err != nil {
+ return err
+ }
buckets := summary.BucketReplication(readCollections, keepServerInfo)
bucketCounts := buckets.Counts()
kc, err := keepclient.MakeKeepClient(&arv)
if err != nil {
- loggerutil.FatalWithMessage(arvLogger,
- fmt.Sprintf("Error setting up keep client %s", err.Error()))
+ return fmt.Errorf("Error setting up keep client %v", err.Error())
}
// Log that we're finished. We force the recording, since go will
&keepServerInfo,
replicationSummary.KeepBlocksNotInCollections)
- summary.WritePullLists(arvLogger, pullLists)
+ err = summary.WritePullLists(arvLogger, pullLists)
+ if err != nil {
+ return err
+ }
if trashErr != nil {
return err
BatchSize: 50})
}()
- *keepServerInfo = keep.GetKeepServersAndSummarize(
+ var err error
+ *keepServerInfo, err = keep.GetKeepServersAndSummarize(
keep.GetKeepServersParams{
Client: arv,
Logger: arvLogger,
Limit: 1000})
+ if err != nil {
+ return
+ }
+
*readCollections = <-collectionChannel
}
}