scott/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2026-02-04 18:00:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

avoid close 'nil' panics if any (#18890)

Browse Source 
brings a generic implementation that
prints a stack trace for 'nil' channel
closes(), if not safely closes it.
This commit is contained in:
Harshavardhana
2024-01-28 10:04:17 -08:00
committed by GitHub
parent 38de8e6936
commit 1d3bd02089
47 changed files with 150 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/storage-rest-server.go
View File

@@ -778,7 +778,7 @@ func (c *closeNotifier) Read(p []byte) (n int, err error) {
n, err = c.rc.Read(p)
if err != nil {
if c.done != nil {
close(c.done)
xioutil.SafeClose(c.done)
c.done = nil
}
}
@@ -787,7 +787,7 @@ func (c *closeNotifier) Read(p []byte) (n int, err error) {
func (c *closeNotifier) Close() error {
if c.done != nil {
close(c.done)
xioutil.SafeClose(c.done)
c.done = nil
}
return c.rc.Close()
@@ -826,10 +826,10 @@ func keepHTTPReqResponseAlive(w http.ResponseWriter, r *http.Request) (resp func
} else {
write([]byte{0})
}
close(doneCh)
xioutil.SafeClose(doneCh)
return
}
defer close(doneCh)
defer xioutil.SafeClose(doneCh)
// Initiate ticker after body has been read.
ticker := time.NewTicker(time.Second * 10)
for {
@@ -889,7 +889,7 @@ func keepHTTPResponseAlive(w http.ResponseWriter) func(error) {
}
}
}
defer close(doneCh)
defer xioutil.SafeClose(doneCh)
ticker := time.NewTicker(time.Second * 10)
defer ticker.Stop()
for {
@@ -1027,7 +1027,7 @@ func streamHTTPResponse(w http.ResponseWriter) *httpStreamResponse {
} else {
write([]byte{0})
}
close(doneCh)
xioutil.SafeClose(doneCh)
return
case block := <-blockCh:
var tmp [5]byte