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

fix data race from getDefaultTransport 这个api会产生data race #218

Merged
merged 2 commits into from
Mar 23, 2022
Merged

fix data race from getDefaultTransport 这个api会产生data race #218

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d71da8
fix data race from getDefaultTransport
wubin1989 Mar 22, 2022
55ac04e
update getDefaultTransport function
wubin1989 Mar 23, 2022
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
3 changes: 3 additions & 0 deletions protocol/http/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,12 @@ var (
once sync.Once
// defaultTransport http.Transport
defaultTransport *http.Transport
lock sync.Mutex
)

func getDefaultTransport(insecureSkipVerify bool) *http.Transport {
lock.Lock()
Copy link
Member

Choose a reason for hiding this comment

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

直接把 once 挪到外层可以么？

Copy link
Contributor Author

Choose a reason for hiding this comment

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

如果想最简单最优雅，可以这样改：

func getDefaultTransport(insecureSkipVerify bool) *http.Transport {
	once.Do(func() {
		defaultTransport = &http.Transport{
			MaxIdleConns:        defaultMaxConnsPerHost,
			MaxIdleConnsPerHost: defaultMaxConnsPerHost,
			DialContext: (&net.Dialer{
				KeepAlive: defaultKeepAliveSecond,
				Timeout:   defaultTimeoutBySecond,
			}).DialContext,
		}
		if insecureSkipVerify {
			defaultTransport.TLSClientConfig = &tls.Config{
				InsecureSkipVerify: insecureSkipVerify,
			}
		}
	})
	return defaultTransport
}

我看defaultTransport这个单例只有在这个函数里有赋值操作，所以不做nil检查也是可以的。如果不放心就按你说的，在once.Do的入参函数里先做nil检查再赋值。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

你告诉我怎么改，我马上改好再提一次

Copy link
Member

@zouyx zouyx Mar 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

如果想最简单最优雅，可以这样改：

func getDefaultTransport(insecureSkipVerify bool) *http.Transport {
	once.Do(func() {
		defaultTransport = &http.Transport{
			MaxIdleConns:        defaultMaxConnsPerHost,
			MaxIdleConnsPerHost: defaultMaxConnsPerHost,
			DialContext: (&net.Dialer{
				KeepAlive: defaultKeepAliveSecond,
				Timeout:   defaultTimeoutBySecond,
			}).DialContext,
		}
		if insecureSkipVerify {
			defaultTransport.TLSClientConfig = &tls.Config{
				InsecureSkipVerify: insecureSkipVerify,
			}
		}
	})
	return defaultTransport
}

我看defaultTransport这个单例只有在这个函数里有赋值操作，所以不做nil检查也是可以的。如果不放心就按你说的，在once.Do的入参函数里先做nil检查再赋值。

其实我的意思就是这个- -

Copy link
Contributor Author

Choose a reason for hiding this comment

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

收到

defer lock.Unlock()
if defaultTransport == nil {
once.Do(func() {
defaultTransport = &http.Transport{
Expand Down