Skip to content

Commit

Permalink
Merge branch 'master' of github.com:grpc/grpc-go into fix-status-inco…
Browse files Browse the repository at this point in the history
…mpatability
  • Loading branch information
arjan-bal committed Oct 21, 2024
2 parents 7dd0e15 + 98959d9 commit 6009694
Show file tree
Hide file tree
Showing 94 changed files with 5,136 additions and 4,225 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ jobs:
- name: Run coverage
run: go test -coverprofile=coverage.out -coverpkg=./... ./...

- name: Run coverage with new pickfirst
run: GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST=true go test -coverprofile=coverage_new_pickfirst.out -coverpkg=./... ./...

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ jobs:
- type: tests
goversion: '1.21'

- type: tests
goversion: '1.22'
testflags: -race
grpcenv: 'GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST=true'

steps:
# Setup the environment.
- name: Setup GOARCH
Expand Down
202 changes: 37 additions & 165 deletions balancer/grpclb/grpc_lb_v1/load_balancer.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions balancer/pickfirst/internal/internal.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright 2024 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

// Package internal contains code internal to the pickfirst package.
package internal

import "math/rand"

// RandShuffle pseudo-randomizes the order of addresses.
var RandShuffle = rand.Shuffle
Loading

0 comments on commit 6009694

Please sign in to comment.