Skip to content

Commit 676b744

Browse files
Fix errcheck in ./common/membership/ (#3742)
* Fix errcheck in ./common/membership/
1 parent 957cfa4 commit 676b744

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

common/dynamicconfig/file_based_client_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ testGetBoolPropertyKey:
343343
mockLogger.EXPECT().Info("dynamic config changed for the key: testgetboolpropertykey oldValue: { constraints: {} value: false } newValue: { constraints: {} value: true }", gomock.Any())
344344
mockLogger.EXPECT().Info("dynamic config changed for the key: testgetboolpropertykey oldValue: { constraints: {{Namespace:global-samples-namespace}} value: true } newValue: { constraints: {{Namespace:global-samples-namespace}} value: false }", gomock.Any())
345345
mockLogger.EXPECT().Info(gomock.Any())
346-
client.update()
346+
s.NoError(client.update())
347347
s.NoError(err)
348348
close(doneCh)
349349
}
@@ -393,7 +393,7 @@ history.defaultActivityRetryPolicy:
393393

394394
mockLogger.EXPECT().Info("dynamic config changed for the key: history.defaultactivityretrypolicy oldValue: { constraints: {} value: map[BackoffCoefficient:3 InitialIntervalInSeconds:1 MaximumAttempts:0 MaximumIntervalCoefficient:100] } newValue: { constraints: {} value: map[BackoffCoefficient:2 InitialIntervalInSeconds:3 MaximumAttempts:0 MaximumIntervalCoefficient:100] }", gomock.Any())
395395
mockLogger.EXPECT().Info(gomock.Any())
396-
client.update()
396+
s.NoError(client.update())
397397
s.NoError(err)
398398
close(doneCh)
399399
}
@@ -446,7 +446,7 @@ testGetIntPropertyKey:
446446
mockLogger.EXPECT().Info("dynamic config changed for the key: testgetfloat64propertykey oldValue: nil newValue: { constraints: {{Namespace:samples-namespace}} value: 22 }", gomock.Any())
447447
mockLogger.EXPECT().Info("dynamic config changed for the key: testgetintpropertykey oldValue: nil newValue: { constraints: {} value: 2000 }", gomock.Any())
448448
mockLogger.EXPECT().Info(gomock.Any())
449-
client.update()
449+
s.NoError(client.update())
450450
s.NoError(err)
451451
close(doneCh)
452452
}
@@ -503,7 +503,7 @@ testGetFloat64PropertyKey:
503503
reader.EXPECT().ReadFile(gomock.Any()).Return(updatedFileData, nil)
504504

505505
mockLogger.EXPECT().Info(gomock.Any()).Times(1)
506-
client.update()
506+
s.NoError(client.update())
507507
s.NoError(err)
508508
close(doneCh)
509509
}

common/membership/grpc_resolver.go

+14-5
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ func (m *grpcBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts
8989
r: r,
9090
notifyCh: make(chan *ChangedEvent, 1),
9191
}
92-
resolver.start()
92+
if err := resolver.start(); err != nil {
93+
return nil, err
94+
}
9395
return resolver, nil
9496
}
9597

@@ -100,14 +102,17 @@ type grpcResolver struct {
100102
wg sync.WaitGroup
101103
}
102104

103-
func (m *grpcResolver) start() {
104-
m.r.AddListener(fmt.Sprintf("%p", m), m.notifyCh)
105+
func (m *grpcResolver) start() error {
106+
if err := m.r.AddListener(fmt.Sprintf("%p", m), m.notifyCh); err != nil {
107+
return err
108+
}
105109
m.wg.Add(1)
106110
go m.listen()
107111

108112
// Try once to get address synchronously. If this fails, it's okay, we'll listen for
109113
// changes and update the resolver later.
110114
m.resolve()
115+
return nil
111116
}
112117

113118
func (m *grpcResolver) listen() {
@@ -131,7 +136,9 @@ func (m *grpcResolver) resolve() {
131136
Addr: hostInfo.GetAddress(),
132137
})
133138
}
134-
m.cc.UpdateState(resolver.State{Addresses: addresses})
139+
if err := m.cc.UpdateState(resolver.State{Addresses: addresses}); err != nil {
140+
fmt.Printf("error updating state in gRPC resolver: %v", err)
141+
}
135142
}
136143

137144
func (m *grpcResolver) ResolveNow(_ resolver.ResolveNowOptions) {
@@ -142,7 +149,9 @@ func (m *grpcResolver) ResolveNow(_ resolver.ResolveNowOptions) {
142149
}
143150

144151
func (m *grpcResolver) Close() {
145-
m.r.RemoveListener(fmt.Sprintf("%p", m))
152+
if err := m.r.RemoveListener(fmt.Sprintf("%p", m)); err != nil {
153+
fmt.Printf("error removing listener from gRPC resolver: %v", err)
154+
}
146155
close(m.notifyCh)
147156
m.wg.Wait() // wait until listen() exits
148157
}

common/membership/rpMonitor_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ import (
2828
"testing"
2929
"time"
3030

31-
"go.temporal.io/server/common/primitives"
3231
"golang.org/x/exp/maps"
3332

33+
"go.temporal.io/server/common/primitives"
34+
3435
"github.com/stretchr/testify/require"
3536
"github.com/stretchr/testify/suite"
3637
)
@@ -67,7 +68,7 @@ func (s *RpoSuite) TestRingpopMonitor() {
6768

6869
// Force refresh now and drain the notification channel
6970
resolver, _ := rpm.GetResolver(serviceName)
70-
resolver.(*ringpopServiceResolver).refresh()
71+
s.NoError(resolver.(*ringpopServiceResolver).refresh())
7172
drainChannel(listenCh)
7273

7374
s.T().Log("Killing host 1")

0 commit comments

Comments
 (0)