Browse Source
fix: volume Deadlock when exception is thrown (#3613)
* fix: volume Deadlock when exception is thrown
* adjust log level
pull/3616/head
famosss
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
0 deletions
-
weed/server/volume_server_handlers.go
|
|
@ -50,6 +50,8 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque |
|
|
select { |
|
|
select { |
|
|
case <-r.Context().Done(): |
|
|
case <-r.Context().Done(): |
|
|
glog.V(4).Infof("request cancelled from %s: %v", r.RemoteAddr, r.Context().Err()) |
|
|
glog.V(4).Infof("request cancelled from %s: %v", r.RemoteAddr, r.Context().Err()) |
|
|
|
|
|
w.WriteHeader(http.StatusInternalServerError) |
|
|
|
|
|
vs.inFlightDownloadDataLimitCond.L.Unlock() |
|
|
return |
|
|
return |
|
|
default: |
|
|
default: |
|
|
glog.V(4).Infof("wait because inflight download data %d > %d", inFlightDownloadSize, vs.concurrentDownloadLimit) |
|
|
glog.V(4).Infof("wait because inflight download data %d > %d", inFlightDownloadSize, vs.concurrentDownloadLimit) |
|
|
|
