Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize: Fix error reporting during server shutdown process #1065 #1086

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

optimize: Fix error reporting during server shutdown process #1065 #1086

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
570ef65
optimize(hz) : tcp host:port use of closed network connection on serv…
Apr 7, 2024
3e9a341
Merge branch 'cloudwego:develop' into fix_Shutdown_Ques
YarBor Apr 22, 2024
c2767b6
fix comment
Jun 5, 2024
63b675c
Merge branch 'fix_Shutdown_Ques' of github.com:YarBor/hertz into fix_…
Jun 5, 2024
74b81a4
Merge branch 'develop' into fix_Shutdown_Ques
GuangmingLuo Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions pkg/network/standard/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,19 @@ import (
"crypto/tls"
"net"
"sync"
"sync/atomic"
"time"

"github.com/cloudwego/hertz/pkg/common/config"
"github.com/cloudwego/hertz/pkg/common/hlog"
"github.com/cloudwego/hertz/pkg/network"
)

const (
transportAlive int32 = 0
Copy link
Member

@welkeyever welkeyever May 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this constant useless?

transportShutdown int32 = 1
)

type transport struct {
// Per-connection buffer size for requests' reading.
// This also limits the maximum header size.
Expand All @@ -36,6 +42,7 @@ type transport struct {
// and/or multi-KB headers (for example, BIG cookies).
//
// Default buffer size is used if not set.
isCallShutDown int32
readBufferSize int
network string
addr string
Expand Down Expand Up @@ -68,8 +75,11 @@ func (t *transport) serve() (err error) {
conn, err := t.ln.Accept()
var c network.Conn
if err != nil {
hlog.SystemLogger().Errorf("Error=%s", err.Error())
return err
if !t.IsCallShutdown() {
hlog.SystemLogger().Errorf("Error=%s", err.Error())
return err
}
return nil
}

if t.OnAccept != nil {
Expand Down Expand Up @@ -100,7 +110,12 @@ func (t *transport) Close() error {
return t.Shutdown(ctx)
}

func (t *transport) IsCallShutdown() bool {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only for internal use, maybe no need to public it?

return atomic.LoadInt32(&t.isCallShutDown) == transportShutdown
}

func (t *transport) Shutdown(ctx context.Context) error {
atomic.StoreInt32(&t.isCallShutDown, transportShutdown)
defer func() {
network.UnlinkUdsFile(t.network, t.addr) //nolint:errcheck
}()
Expand Down