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

Jump to bottom

fix(profiler): data race accessing s.server #15

Merged
merged 3 commits into from
Feb 19, 2024
Merged

fix(profiler): data race accessing s.server #15

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05cec5f
fix(profiler): typo
c3y1huang Feb 2, 2024
061c696
fix(profiler): data race accessing s.server
c3y1huang Feb 2, 2024
51d4b89
fix: typo
c3y1huang Feb 19, 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
31 changes: 22 additions & 9 deletions profiler/profiler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (s *Server) EnableProfiler(portNumber int32) (string, error) {
s.lock.Lock()
defer s.lock.Unlock()

logrus.Info("Prepareing to enable the profiler")
logrus.Info("Preparing to enable the profiler")

if s.server != nil {
return "", fmt.Errorf("profiler server is already running at %v", s.server.Addr)
Expand All @@ -164,33 +164,46 @@ func (s *Server) EnableProfiler(portNumber int32) (string, error) {
}

profilerAddr := fmt.Sprintf(":%d", profilerPort)
s.server = &http.Server{
newServer := &http.Server{
Addr: profilerAddr,
ReadHeaderTimeout: 10 * time.Second,
}
go func() {
if err := s.server.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) {
logrus.WithError(err).Warnf("Get error when start profiler server %v", s.server.Addr)
s.server = nil
if err := newServer.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) {
logrus.WithError(err).Warnf("Get error when start profiler server %v", newServer.Addr)
s.errMsg = err.Error()
return
}
logrus.Infof("Profiler server (%v) is closed", s.server.Addr)
logrus.Infof("Profiler server (%v) is closed", newServer.Addr)
}()

logrus.Infof("Waiting the profiler server(%v) to start", s.server.Addr)
logrus.Infof("Waiting the profiler server(%v) to start", newServer.Addr)
// Wait for the profiler server to start, and check the profiler server.
var retryErr error
retryCount := 3
for i := 0; i < retryCount; i++ {
conn, err := net.DialTimeout("tcp", s.server.Addr, 1*time.Second)
conn, err := net.DialTimeout("tcp", newServer.Addr, 1*time.Second)
if err == nil {
_ = conn.Close()
retryErr = nil
break
}

retryErr = err
}
if s.server == nil {

if retryErr != nil {
_ = newServer.Close()
return retryErr.Error(), fmt.Errorf("timeout connecting to profiler server(%v)", profilerAddr)
}

if s.errMsg != "" {
_ = newServer.Close()
return s.errMsg, fmt.Errorf("failed to start profiler server(%v)", profilerAddr)
}

s.server = newServer

defer func() {
s.errMsg = ""
}()
Expand Down
Loading