unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Fix race condition when updating process being waited on (#1694)

Browse Source
This commit is contained in:
Dominic Wong
2020-06-10 09:36:41 +01:00
committed by GitHub
parent cdd8f9fd82
commit 8e81cea96f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/service.go
View File

@@ -197,11 +197,20 @@ func (s *service) Error() error {
// Wait waits for the service to finish running // Wait waits for the service to finish running
func (s *service) Wait() { func (s *service) Wait() {
// wait for process to exit // wait for process to exit
err := s.Process.Wait(s.PID) s.RLock()
thisPID := s.PID
s.RUnlock()
err := s.Process.Wait(thisPID)
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
if s.PID.ID != thisPID.ID {
// trying to update when it's already been switched out, ignore
logger.Warnf("Trying to update a process status but PID doesn't match. Old %s, New %s. Skipping update.", thisPID.ID, s.PID.ID)
return
}
// save the error // save the error
if err != nil { if err != nil {
if logger.V(logger.ErrorLevel, logger.DefaultLogger) { if logger.V(logger.ErrorLevel, logger.DefaultLogger) {