projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8015: Don't use Docker logging driver. Attach stdout/stderr before starting container.
[arvados.git]
/
services
/
datamanager
/
datamanager.go
diff --git
a/services/datamanager/datamanager.go
b/services/datamanager/datamanager.go
index 3c53b4ad2a2c59e6cea0b538ff1b7ca6f5999831..604a6db2f4a16ac97aea4579111f0d909c6c5d9e 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
+ dryRun bool
)
func init() {
)
func init() {
@@
-36,11
+37,16
@@
func init() {
flag.IntVar(&minutesBetweenRuns,
"minutes-between-runs",
0,
flag.IntVar(&minutesBetweenRuns,
"minutes-between-runs",
0,
- "How many minutes we wait betwen data manager runs. 0 means run once and exit.")
+ "How many minutes we wait between data manager runs. 0 means run once and exit.")
+ flag.BoolVar(&dryRun,
+ "dry-run",
+ false,
+ "Perform a dry run. Log how many blocks would be deleted/moved, but do not issue any changes to keepstore.")
}
func main() {
flag.Parse()
}
func main() {
flag.Parse()
+
if minutesBetweenRuns == 0 {
arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
if minutesBetweenRuns == 0 {
arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
@@
-79,7
+85,7
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
}
if logEventTypePrefix != "" {
}
if logEventTypePrefix != "" {
- arvLogger = logger.NewLogger(logger.LoggerParams{
+ arvLogger
, err
= logger.NewLogger(logger.LoggerParams{
Client: arv,
EventTypePrefix: logEventTypePrefix,
WriteInterval: time.Second * time.Duration(logFrequencySeconds)})
Client: arv,
EventTypePrefix: logEventTypePrefix,
WriteInterval: time.Second * time.Duration(logFrequencySeconds)})
@@
-102,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)
@@
-161,7
+166,7
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
&keepServerInfo,
replicationSummary.KeepBlocksNotInCollections)
&keepServerInfo,
replicationSummary.KeepBlocksNotInCollections)
- err = summary.WritePullLists(arvLogger, pullLists)
+ err = summary.WritePullLists(arvLogger, pullLists
, dryRun
)
if err != nil {
return err
}
if err != nil {
return err
}
@@
-169,37
+174,42
@@
func singlerun(arv arvadosclient.ArvadosClient) error {
if trashErr != nil {
return err
}
if trashErr != nil {
return err
}
- keep.SendTrashLists(
kc, trashLists
)
+ keep.SendTrashLists(
arvLogger, kc, trashLists, dryRun
)
return nil
}
// BuildDataFetcher returns a data fetcher that fetches data from remote servers.
func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
return nil
}
// 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
}
}
}
}