projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10690-config-dump' refs #10690
[arvados.git]
/
services
/
crunch-run
/
upload.go
diff --git
a/services/crunch-run/upload.go
b/services/crunch-run/upload.go
index 3285fccb7685097bda7b7ecfcd800444a0ad6edc..a068a2a77b3c6805b1eecdfc73d1df2eefd50ed0 100644
(file)
--- a/
services/crunch-run/upload.go
+++ b/
services/crunch-run/upload.go
@@
-103,7
+103,7
@@
func (m *CollectionFileWriter) goUpload() {
finish <- errors
}
finish <- errors
}
-// CollectionWriter
makes
implements creating new Keep collections by opening files
+// CollectionWriter implements creating new Keep collections by opening files
// and writing to them.
type CollectionWriter struct {
IKeepClient
// and writing to them.
type CollectionWriter struct {
IKeepClient
@@
-187,6
+187,9
@@
func (m *CollectionWriter) ManifestText() (mt string, err error) {
m.mtx.Lock()
defer m.mtx.Unlock()
for _, v := range m.Streams {
m.mtx.Lock()
defer m.mtx.Unlock()
for _, v := range m.Streams {
+ if len(v.FileStreamSegments) == 0 {
+ continue
+ }
k := v.StreamName
if k == "." {
buf.WriteString(".")
k := v.StreamName
if k == "." {
buf.WriteString(".")
@@
-195,9
+198,13
@@
func (m *CollectionWriter) ManifestText() (mt string, err error) {
k = strings.Replace(k, "\n", "", -1)
buf.WriteString("./" + k)
}
k = strings.Replace(k, "\n", "", -1)
buf.WriteString("./" + k)
}
- for _, b := range v.Blocks {
- buf.WriteString(" ")
- buf.WriteString(b)
+ if len(v.Blocks) > 0 {
+ for _, b := range v.Blocks {
+ buf.WriteString(" ")
+ buf.WriteString(b)
+ }
+ } else {
+ buf.WriteString(" d41d8cd98f00b204e9800998ecf8427e+0")
}
for _, f := range v.FileStreamSegments {
buf.WriteString(" ")
}
for _, f := range v.FileStreamSegments {
buf.WriteString(" ")