Merge pull request #657 from rancher/fix-sync-loop

Fix node sync loop
rancher · Oct 13, 2022 · fd27a0a · fd27a0a
2 parents 2587292 + 26153c4
commit fd27a0a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/plugins/logging/pkg/agent/node.go b/plugins/logging/pkg/agent/node.go
@@ -136,7 +136,6 @@ func (l *LoggingNode) doSync(ctx context.Context) {
 	case node.ConfigStatus_NeedsUpdate:
 		l.logger.Info("updating logging node config")
 		l.updateConfig(syncResp.UpdatedConfig)
-		go l.doSync(ctx)
 	}
 
 	l.conditions.Clear(CondConfigSync)

diff --git a/plugins/logging/pkg/backend/sync.go b/plugins/logging/pkg/backend/sync.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"github.com/google/go-cmp/cmp"
 	capabilityv1 "github.com/rancher/opni/pkg/apis/capability/v1"
 	opnicorev1 "github.com/rancher/opni/pkg/apis/core/v1"
 	"github.com/rancher/opni/pkg/auth/cluster"
@@ -15,7 +16,7 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/testing/protocmp"
 )
 
 func (b *LoggingBackend) Status(ctx context.Context, req *capabilityv1.StatusRequest) (*capabilityv1.NodeCapabilityStatus, error) {
@@ -94,7 +95,7 @@ func (b *LoggingBackend) Sync(ctx context.Context, req *node.SyncRequest) (*node
 }
 
 func (b *LoggingBackend) buildResponse(old, new *node.LoggingCapabilityConfig) *node.SyncResponse {
-	if proto.Equal(old, new) {
+	if cmp.Equal(old, new, protocmp.Transform()) {
 		return &node.SyncResponse{
 			ConfigStatus: node.ConfigStatus_UpToDate,
 		}

diff --git a/plugins/metrics/pkg/agent/node.go b/plugins/metrics/pkg/agent/node.go
@@ -172,7 +172,6 @@ func (m *MetricsNode) doSync(ctx context.Context) {
 	case node.ConfigStatus_NeedsUpdate:
 		m.logger.Info("updating metrics node config")
 		m.updateConfig(syncResp.UpdatedConfig)
-		go m.doSync(ctx)
 	}
 
 	m.conditions.Clear(CondConfigSync)

diff --git a/plugins/metrics/pkg/backend/metrics.go b/plugins/metrics/pkg/backend/metrics.go
@@ -9,10 +9,11 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
+	"github.com/google/go-cmp/cmp"
 	capabilityv1 "github.com/rancher/opni/pkg/apis/capability/v1"
 	corev1 "github.com/rancher/opni/pkg/apis/core/v1"
 	managementv1 "github.com/rancher/opni/pkg/apis/management/v1"
@@ -349,7 +350,7 @@ func (m *MetricsBackend) Sync(ctx context.Context, req *node.SyncRequest) (*node
 
 // the calling function must have exclusive ownership of both old and new
 func buildResponse(old, new *node.MetricsCapabilityConfig) *node.SyncResponse {
-	if proto.Equal(old, new) {
+	if cmp.Equal(old, new, protocmp.Transform()) {
 		return &node.SyncResponse{
 			ConfigStatus: node.ConfigStatus_UpToDate,
 		}