Use original "Return zst Decoder to sync.pool when finished #770" fix

This fix does not suffer from the segfault seen under high load with #771.
buchgr · Nov 24, 2024 · edba5fa · edba5fa
1 parent a563ac2
commit edba5fa
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/server/grpc_bytestream.go b/server/grpc_bytestream.go
@@ -365,12 +365,6 @@ func (s *grpcServer) Write(srv bytestream.ByteStream_WriteServer) error {
 	resourceNameChan := make(chan string, 1)
 
 	cmp := casblob.Identity
-	var dec *syncpool.DecoderWrapper
-	defer func() {
-		if dec != nil {
-			dec.Close()
-		}
-	}()
 
 	go func() {
 		firstIteration := true
@@ -436,8 +430,7 @@ func (s *grpcServer) Write(srv bytestream.ByteStream_WriteServer) error {
 
 				var rc io.ReadCloser = pr
 				if cmp == casblob.Zstandard {
-					var ok bool
-					dec, ok = decoderPool.Get().(*syncpool.DecoderWrapper)
+					dec, ok := decoderPool.Get().(*syncpool.DecoderWrapper)
 					if !ok {
 						s.accessLogger.Printf("GRPC BYTESTREAM WRITE FAILED: %s", errDecoderPoolFail)
 						recvResult <- errDecoderPoolFail
@@ -453,6 +446,7 @@ func (s *grpcServer) Write(srv bytestream.ByteStream_WriteServer) error {
 				}
 
 				go func() {
+					defer rc.Close()
 					err := s.cache.Put(srv.Context(), cache.CAS, hash, size, rc)
 					putResult <- err
 				}()