Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions endpoints/globus/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"net/url"
"path/filepath"
"strings"
"time"

"github.com/google/uuid"
"github.com/mitchellh/mapstructure"
Expand Down Expand Up @@ -252,6 +253,16 @@ func (ep *Endpoint) Transfer(destination endpoints.Endpoint, files []endpoints.F
return uuid.UUID{}, err
}

// Occasionally, Globus returns a zero-valued UUID (uuid.Nil) and no error (network burp?).
// So we pause and resubmit in this case
for submissionId == uuid.Nil {
time.Sleep(time.Second)
submissionId, err = ep.getSubmissionId()
if err != nil {
return uuid.UUID{}, err
}
}

// now, submit the transfer task itself
return ep.submitTransfer(destination, submissionId, files)
}
Expand Down
2 changes: 1 addition & 1 deletion services/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
// Version numbers
var majorVersion = 0
var minorVersion = 13
var patchVersion = 3
var patchVersion = 4

// Version string
var version = fmt.Sprintf("%d.%d.%d", majorVersion, minorVersion, patchVersion)
Loading