projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '6264-cwl-runner' closes #6264
[arvados.git]
/
services
/
datamanager
/
summary
/
file.go
diff --git
a/services/datamanager/summary/file.go
b/services/datamanager/summary/file.go
index 15c369900ca57a42e837b1884e34372e4fa2a732..8c37e99ade723a5c51a1f80f6c203dce504100d3 100644
(file)
--- a/
services/datamanager/summary/file.go
+++ b/
services/datamanager/summary/file.go
@@
-26,6
+26,10
@@
var (
readDataFrom string
)
readDataFrom string
)
+type DataFetcher func(arvLogger *logger.Logger,
+ readCollections *collection.ReadCollections,
+ keepServerInfo *keep.ReadServers)
+
func init() {
flag.StringVar(&writeDataTo,
"write-data-to",
func init() {
flag.StringVar(&writeDataTo,
"write-data-to",
@@
-71,6
+75,10
@@
func MaybeWriteData(arvLogger *logger.Logger,
}
}
}
}
+func ShouldReadData() bool {
+ return readDataFrom != ""
+}
+
// Reads data that we've written to a file.
//
// This is useful for development, so that we don't need to read all
// Reads data that we've written to a file.
//
// This is useful for development, so that we don't need to read all
@@
-78,11
+86,12
@@
func MaybeWriteData(arvLogger *logger.Logger,
//
// This should not be used outside of development, since you'll be
// working with stale data.
//
// This should not be used outside of development, since you'll be
// working with stale data.
-func
Maybe
ReadData(arvLogger *logger.Logger,
+func ReadData(arvLogger *logger.Logger,
readCollections *collection.ReadCollections,
readCollections *collection.ReadCollections,
- keepServerInfo *keep.ReadServers)
bool
{
+ keepServerInfo *keep.ReadServers) {
if readDataFrom == "" {
if readDataFrom == "" {
- return false
+ loggerutil.FatalWithMessage(arvLogger,
+ "ReadData() called with empty filename.")
} else {
summaryFile, err := os.Open(readDataFrom)
if err != nil {
} else {
summaryFile, err := os.Open(readDataFrom)
if err != nil {
@@
-101,12
+110,11
@@
func MaybeReadData(arvLogger *logger.Logger,
// re-summarize data, so that we can update our summarizing
// functions without needing to do all our network i/o
// re-summarize data, so that we can update our summarizing
// functions without needing to do all our network i/o
- data.ReadCollections.Summarize()
-
keep.ComputeBlockReplicationCounts(&data.KeepServerInfo
)
+ data.ReadCollections.Summarize(
arvLogger
)
+
data.KeepServerInfo.Summarize(arvLogger
)
*readCollections = data.ReadCollections
*keepServerInfo = data.KeepServerInfo
log.Printf("Read summary data from: %s", readDataFrom)
*readCollections = data.ReadCollections
*keepServerInfo = data.KeepServerInfo
log.Printf("Read summary data from: %s", readDataFrom)
- return true
}
}
}
}