Skip to content

Commit 108e3d9

Browse files
NathanBaulchinfovivek2020
authored andcommitted
*: fix minor typos (grpc#7487)
* Fix typos * Fix reflecton tests
1 parent 0716f4a commit 108e3d9

File tree

88 files changed

+135
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+135
-135
lines changed

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Security Policy
22

3-
For information on gRPC Security Policy and reporting potentional security issues, please see [gRPC CVE Process](https://github.com/grpc/proposal/blob/master/P4-grpc-cve-process.md).
3+
For information on gRPC Security Policy and reporting potential security issues, please see [gRPC CVE Process](https://github.com/grpc/proposal/blob/master/P4-grpc-cve-process.md).

backoff/backoff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type Config struct {
3939
MaxDelay time.Duration
4040
}
4141

42-
// DefaultConfig is a backoff configuration with the default values specfied
42+
// DefaultConfig is a backoff configuration with the default values specified
4343
// at https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md.
4444
//
4545
// This should be useful for callers who want to configure backoff with

balancer/grpclb/grpclb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ type lbBalancer struct {
219219
// All backends addresses, with metadata set to nil. This list contains all
220220
// backend addresses in the same order and with the same duplicates as in
221221
// serverlist. When generating picker, a SubConn slice with the same order
222-
// but with only READY SCs will be gerenated.
222+
// but with only READY SCs will be generated.
223223
backendAddrsWithoutMetadata []resolver.Address
224224
// Roundrobin functionalities.
225225
state connectivity.State

balancer/grpclb/grpclb_util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func (s) TestLBCache_ShutdownTimer_New_Race(t *testing.T) {
252252
go func() {
253253
for i := 0; i < 1000; i++ {
254254
// Shutdown starts a timer with 1 ns timeout, the NewSubConn will
255-
// race with with the timer.
255+
// race with the timer.
256256
sc.Shutdown()
257257
sc, _ = ccc.NewSubConn([]resolver.Address{{Addr: "address1"}}, balancer.NewSubConnOptions{})
258258
}

balancer/pickfirst/pickfirst.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (b *pickfirstBalancer) UpdateClientConnState(state balancer.ClientConnState
155155
// Endpoints not set, process addresses until we migrate resolver
156156
// emissions fully to Endpoints. The top channel does wrap emitted
157157
// addresses with endpoints, however some balancers such as weighted
158-
// target do not forwarrd the corresponding correct endpoints down/split
158+
// target do not forward the corresponding correct endpoints down/split
159159
// endpoints properly. Once all balancers correctly forward endpoints
160160
// down, can delete this else conditional.
161161
addrs = state.ResolverState.Addresses

balancer/rls/cache.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type cacheEntry struct {
4747
// headerData is received in the RLS response and is to be sent in the
4848
// X-Google-RLS-Data header for matching RPCs.
4949
headerData string
50-
// expiryTime is the absolute time at which this cache entry entry stops
50+
// expiryTime is the absolute time at which this cache entry stops
5151
// being valid. When an RLS request succeeds, this is set to the current
5252
// time plus the max_age field from the LB policy config.
5353
expiryTime time.Time
@@ -223,7 +223,7 @@ func (dc *dataCache) resize(size int64) (backoffCancelled bool) {
223223
backoffCancelled = true
224224
}
225225
}
226-
dc.deleteAndcleanup(key, entry)
226+
dc.deleteAndCleanup(key, entry)
227227
}
228228
dc.maxSize = size
229229
return backoffCancelled
@@ -249,7 +249,7 @@ func (dc *dataCache) evictExpiredEntries() bool {
249249
if entry.expiryTime.After(now) || entry.backoffExpiryTime.After(now) {
250250
continue
251251
}
252-
dc.deleteAndcleanup(key, entry)
252+
dc.deleteAndCleanup(key, entry)
253253
evicted = true
254254
}
255255
return evicted
@@ -339,23 +339,23 @@ func (dc *dataCache) removeEntryForTesting(key cacheKey) {
339339
if !ok {
340340
return
341341
}
342-
dc.deleteAndcleanup(key, entry)
342+
dc.deleteAndCleanup(key, entry)
343343
}
344344

345345
// deleteAndCleanup performs actions required at the time of deleting an entry
346346
// from the data cache.
347347
// - the entry is removed from the map of entries
348348
// - current size of the data cache is update
349349
// - the key is removed from the LRU
350-
func (dc *dataCache) deleteAndcleanup(key cacheKey, entry *cacheEntry) {
350+
func (dc *dataCache) deleteAndCleanup(key cacheKey, entry *cacheEntry) {
351351
delete(dc.entries, key)
352352
dc.currentSize -= entry.size
353353
dc.keys.removeEntry(key)
354354
}
355355

356356
func (dc *dataCache) stop() {
357357
for key, entry := range dc.entries {
358-
dc.deleteAndcleanup(key, entry)
358+
dc.deleteAndCleanup(key, entry)
359359
}
360360
dc.shutdown.Fire()
361361
}

balancer/rls/control_channel_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s) TestControlChannelThrottled(t *testing.T) {
6262

6363
select {
6464
case <-rlsReqCh:
65-
t.Fatal("RouteLookup RPC invoked when control channel is throtlled")
65+
t.Fatal("RouteLookup RPC invoked when control channel is throttled")
6666
case <-time.After(defaultTestShortTimeout):
6767
}
6868
}

balancer/rls/internal/keys/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ type matcher struct {
218218
names []string
219219
}
220220

221-
// Equal reports if m and are are equivalent headerKeys.
221+
// Equal reports if m and a are equivalent headerKeys.
222222
func (m matcher) Equal(a matcher) bool {
223223
if m.key != a.key {
224224
return false

balancer/rls/internal/test/e2e/rls_child_policy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (b *bal) Close() {
125125

126126
// run is a dummy goroutine to make sure that child policies are closed at the
127127
// end of tests. If they are not closed, these goroutines will be picked up by
128-
// the leakcheker and tests will fail.
128+
// the leak checker and tests will fail.
129129
func (b *bal) run() {
130130
<-b.done.Done()
131131
}

balancer/rls/picker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (p *rlsPicker) delegateToChildPoliciesLocked(dcEntry *cacheEntry, info bala
190190
state := (*balancer.State)(atomic.LoadPointer(&cpw.state))
191191
// Delegate to the child policy if it is not in TRANSIENT_FAILURE, or if
192192
// it is the last one (which handles the case of delegating to the last
193-
// child picker if all child polcies are in TRANSIENT_FAILURE).
193+
// child picker if all child policies are in TRANSIENT_FAILURE).
194194
if state.ConnectivityState != connectivity.TransientFailure || i == len(dcEntry.childPolicyWrappers)-1 {
195195
// Any header data received from the RLS server is stored in the
196196
// cache entry and needs to be sent to the actual backend in the

0 commit comments

Comments
 (0)