Skip to content

fix: eliminate data race on application mode and reason fields #252

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

Open
Aliexe-code wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: eliminate data race on application mode and reason fields #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions node/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ type application struct {
node *node
behavior gen.ApplicationBehavior
group lib.Map[gen.PID, bool]
mode gen.ApplicationMode
mode int32

started int64
parent gen.Atom
state int32
stopped chan struct{}
reason error
reason atomic.Value
}

func (a *application) start(mode gen.ApplicationMode, options gen.ApplicationOptionsExtra) error {
Expand Down Expand Up @@ -95,8 +95,8 @@ func (a *application) start(mode gen.ApplicationMode, options gen.ApplicationOpt
}

a.stopped = make(chan struct{})
a.node.log.Info("application %s (%s) started", a.spec.Name, a.mode)
a.mode = mode
atomic.StoreInt32(&a.mode, int32(mode))
a.node.log.Info("application %s (%s) started", a.spec.Name, gen.ApplicationMode(atomic.LoadInt32(&a.mode)))
a.parent = options.CorePID.Node

a.started = time.Now().Unix()
Expand Down Expand Up @@ -138,7 +138,7 @@ func (a *application) stop(force bool, timeout time.Duration) error {
a.registerAppRoute() // new state of the app

// update mode to prevent triggering 'permantent' mode
a.mode = gen.ApplicationModeTemporary
atomic.StoreInt32(&a.mode, int32(gen.ApplicationModeTemporary))

a.group.Range(func(pid gen.PID, _ bool) bool {
if force {
Expand All @@ -150,9 +150,9 @@ func (a *application) stop(force bool, timeout time.Duration) error {
})

if force {
a.reason = gen.TerminateReasonKill
a.reason.Store(gen.TerminateReasonKill)
} else {
a.reason = gen.TerminateReasonShutdown
a.reason.Store(gen.TerminateReasonShutdown)
}

select {
Expand All @@ -170,16 +170,16 @@ func (a *application) terminate(pid gen.PID, reason error) {
return
}

switch a.mode {
switch gen.ApplicationMode(atomic.LoadInt32(&a.mode)) {
case gen.ApplicationModePermanent:
state := atomic.SwapInt32(&a.state, int32(gen.ApplicationStateStopping))
if state == int32(gen.ApplicationStateStopping) {
// already in stopping
break
}
a.node.Log().
Info("application %s (%s) will be stopped due to termination of %s with reason: %s", a.spec.Name, a.mode, pid, reason)
a.reason = reason
Info("application %s (%s) will be stopped due to termination of %s with reason: %s", a.spec.Name, gen.ApplicationMode(atomic.LoadInt32(&a.mode)), pid, reason)
a.reason.Store(reason)
a.group.Range(func(pid gen.PID, _ bool) bool {
a.node.SendExit(pid, gen.TerminateReasonShutdown)
return true
Expand All @@ -190,14 +190,14 @@ func (a *application) terminate(pid gen.PID, reason error) {
break
}
a.node.Log().
Info("application %s (%s) will be stopped due to termination of %s with reason: %s", a.spec.Name, a.mode, pid, reason)
Info("application %s (%s) will be stopped due to termination of %s with reason: %s", a.spec.Name, gen.ApplicationMode(atomic.LoadInt32(&a.mode)), pid, reason)

state := atomic.SwapInt32(&a.state, int32(gen.ApplicationStateStopping))
if state == int32(gen.ApplicationStateStopping) {
// already in stopping
break
}
a.reason = reason
a.reason.Store(reason)
a.group.Range(func(pid gen.PID, _ bool) bool {
a.node.SendExit(pid, gen.TerminateReasonShutdown)
return true
Expand All @@ -211,8 +211,8 @@ func (a *application) terminate(pid gen.PID, reason error) {
return
}

if a.reason == nil {
a.reason = gen.TerminateReasonNormal
if a.reason.Load() == nil {
a.reason.Store(gen.TerminateReasonNormal)
}

old := atomic.SwapInt32(&a.state, int32(gen.ApplicationStateLoaded))
Expand All @@ -226,7 +226,7 @@ func (a *application) terminate(pid gen.PID, reason error) {
a.started = 0
a.parent = ""

a.node.log.Info("application %s (%s) stopped with reason %s", a.spec.Name, a.mode, a.reason)
a.node.log.Info("application %s (%s) stopped with reason %s", a.spec.Name, gen.ApplicationMode(atomic.LoadInt32(&a.mode)), a.reason.Load().(error))

if lib.Recover() {
defer func() {
Expand All @@ -238,7 +238,7 @@ func (a *application) terminate(pid gen.PID, reason error) {
}()
}

a.behavior.Terminate(a.reason)
a.behavior.Terminate(a.reason.Load().(error))

network := a.node.Network()
if network.Mode() != gen.NetworkModeEnabled {
Expand Down Expand Up @@ -269,7 +269,7 @@ func (a *application) info() gen.ApplicationInfo {
info.Description = a.spec.Description
info.Version = a.spec.Version
info.Depends = a.spec.Depends
info.Mode = a.mode
info.Mode = gen.ApplicationMode(atomic.LoadInt32(&a.mode))
info.Parent = a.parent
info.Uptime = time.Now().Unix() - a.started
info.Group = []gen.PID{}
Expand Down Expand Up @@ -303,8 +303,8 @@ func (a *application) registerAppRoute() {
Name: a.spec.Name,
Weight: a.spec.Weight,
Tags: a.spec.Tags,
Mode: a.mode,
State: gen.ApplicationState(a.state),
Mode: gen.ApplicationMode(atomic.LoadInt32(&a.mode)),
State: gen.ApplicationState(atomic.LoadInt32(&a.state)),
}
network := a.node.Network()
if network.Mode() != gen.NetworkModeEnabled {
Expand Down
2 changes: 1 addition & 1 deletion node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1591,7 +1591,7 @@ func (n *node) ApplicationLoad(app gen.ApplicationBehavior, args ...any) (name g
node: n,
behavior: app,
state: int32(gen.ApplicationStateLoaded),
mode: spec.Mode,
mode: int32(spec.Mode),
}
if _, exist := n.applications.LoadOrStore(spec.Name, a); exist {
return spec.Name, gen.ErrTaken
Expand Down