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 ce7d6874122cd520d918d083c1b6deedc0a009f8..8c37e99ade723a5c51a1f80f6c203dce504100d3 100644 (file)
--- a/services/datamanager/summary/file.go
+++ b/services/datamanager/summary/file.go
@@ -26,6 +26,10 @@ var (
        readDataFrom string
 )
 
+type DataFetcher func(arvLogger *logger.Logger,
+       readCollections *collection.ReadCollections,
+       keepServerInfo *keep.ReadServers)
+
 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
@@ -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.
-func MaybeReadData(arvLogger *logger.Logger,
+func ReadData(arvLogger *logger.Logger,
        readCollections *collection.ReadCollections,
-       keepServerInfo *keep.ReadServers) bool {
+       keepServerInfo *keep.ReadServers) {
        if readDataFrom == "" {
-               return false
+               loggerutil.FatalWithMessage(arvLogger,
+                       "ReadData() called with empty filename.")
        } else {
                summaryFile, err := os.Open(readDataFrom)
                if err != nil {
@@ -107,6 +116,5 @@ func MaybeReadData(arvLogger *logger.Logger,
                *readCollections = data.ReadCollections
                *keepServerInfo = data.KeepServerInfo
                log.Printf("Read summary data from: %s", readDataFrom)
-               return true
        }
 }