Skip to content

agent: use proto.Equal instead of reflect.DeepEqual for node comparison #3249

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
Anduin2017 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

agent: use proto.Equal instead of reflect.DeepEqual for node comparison #3249

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
6 changes: 3 additions & 3 deletions agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"bytes"
"context"
"math/rand"
"reflect"
"sync"
"time"

"github.com/gogo/protobuf/proto"
"github.com/moby/swarmkit/v2/agent/exec"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/log"
Expand Down Expand Up @@ -249,7 +249,7 @@ func (a *Agent) run(ctx context.Context) {
// if the node description has changed, update it to the new one
// and close the session. The old session will be stopped and a
// new one will be created with the updated description
if !reflect.DeepEqual(nodeDescription, newNodeDescription) {
if !proto.Equal(nodeDescription, newNodeDescription) {
nodeDescription = newNodeDescription
// close the session
log.G(ctx).Info("agent: found node update")
Expand Down Expand Up @@ -652,5 +652,5 @@ func nodesEqual(a, b *api.Node) bool {
a.Status, b.Status = api.NodeStatus{}, api.NodeStatus{}
a.Meta, b.Meta = api.Meta{}, api.Meta{}

return reflect.DeepEqual(a, b)
return proto.Equal(a, b)
}