mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-07 23:07:48 +02:00
c739e5cf78
Standalone weed s3 only shut its servers down when shutdownCtx was set, which only weed mini does. On SIGTERM the interrupt hooks ran and the process exited with requests still in flight, so clients saw connection resets during rolling restarts. Register an interrupt hook that drains every S3 HTTP(S) listener (including the local and unix socket ones, and the Iceberg and Lance servers) for up to 15s alongside a bounded gRPC GracefulStop, then closes the S3 API server, reusing the filer's shutdown helper. Serve exits now join that shutdown so the process does not exit mid-drain, and the secondary listeners tolerate http.ErrServerClosed instead of exiting fatally. Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com> Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
54 lines
1.2 KiB
Go
54 lines
1.2 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"sync"
|
|
"time"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
)
|
|
|
|
func gracefulStopGrpc(grpcS *grpc.Server, timeout time.Duration) {
|
|
glog.V(0).Infof("Gracefully stopping gRPC server")
|
|
stopped := make(chan struct{})
|
|
go func() {
|
|
grpcS.GracefulStop()
|
|
close(stopped)
|
|
}()
|
|
select {
|
|
case <-stopped:
|
|
glog.V(0).Infof("gRPC server stopped gracefully")
|
|
case <-time.After(timeout):
|
|
glog.V(0).Infof("gRPC server graceful stop timed out after %s, forcing stop", timeout)
|
|
grpcS.Stop()
|
|
}
|
|
}
|
|
|
|
// newGracefulShutdown joins shutdown callers while gRPC and HTTP drain concurrently.
|
|
func newGracefulShutdown(stopGrpc, closeServer func(), httpServers ...*http.Server) func() {
|
|
return sync.OnceFunc(func() {
|
|
shutdownCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
|
|
defer cancel()
|
|
var drained sync.WaitGroup
|
|
drained.Add(1)
|
|
go func() {
|
|
defer drained.Done()
|
|
stopGrpc()
|
|
}()
|
|
for _, server := range httpServers {
|
|
drained.Add(1)
|
|
go func() {
|
|
defer drained.Done()
|
|
if err := server.Shutdown(shutdownCtx); err != nil {
|
|
glog.Warningf("HTTP shutdown: %v", err)
|
|
}
|
|
}()
|
|
}
|
|
drained.Wait()
|
|
closeServer()
|
|
})
|
|
}
|