projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7491: Ensure status channel stays open until all upload workers finish.
[arvados.git]
/
sdk
/
go
/
keepclient
/
support.go
diff --git
a/sdk/go/keepclient/support.go
b/sdk/go/keepclient/support.go
index ee308dd0d4a1895d1b4fd6cbcb378cd3a19b4916..51e3e082b683e01ca153d352e54b8e53db9a9893 100644
(file)
--- a/
sdk/go/keepclient/support.go
+++ b/
sdk/go/keepclient/support.go
@@
-85,12
+85,8
@@
func (this *KeepClient) DiscoverKeepServers() error {
// Get keep services from api server
err := this.Arvados.Call("GET", "keep_services", "", "accessible", nil, &m)
// Get keep services from api server
err := this.Arvados.Call("GET", "keep_services", "", "accessible", nil, &m)
-
- // If there is error getting keep services, get list of keep disks
if err != nil {
if err != nil {
- if err := this.Arvados.List("keep_disks", nil, &m); err != nil {
- return err
- }
+ return err
}
listed := make(map[string]bool)
}
listed := make(map[string]bool)
@@
-232,7
+228,17
@@
func (this KeepClient) putReplicas(
// Used to communicate status from the upload goroutines
upload_status := make(chan uploadStatus)
// Used to communicate status from the upload goroutines
upload_status := make(chan uploadStatus)
- defer close(upload_status)
+ defer func() {
+ // Wait for any abandoned uploads (e.g., we started
+ // two uploads and the first replied with replicas=2)
+ // to finish before closing the status channel.
+ go func() {
+ for active > 0 {
+ <-upload_status
+ }
+ close(upload_status)
+ }()
+ }()
// Desired number of replicas
remaining_replicas := this.Want_replicas
// Desired number of replicas
remaining_replicas := this.Want_replicas