Hi,
On Thu, 09 Apr 2020 19:14:59 +0530 Pirate Praveen
<prav...@onenetbeyond.org> wrote:
> Package: gitaly
> Version: 1.86.0+dfsg1-1
> Severity: important
> Control: block 956218 by -1
>
> gitaly master branch in salsa was building fine till yesterday. It
> started failing today after golang-google-grpc was updated to 1.27.1
> from 1.22.1
>
> # gitlab.com/gitlab-org/gitaly/internal/rubyserver/balancer
>
src/gitlab.com/gitlab-org/gitaly/internal/rubyserver/balancer/balancer.go:123:70:
> undefined: resolver.BuildOption
>
src/gitlab.com/gitlab-org/gitaly/internal/rubyserver/balancer/balancer.go:220:37:
> undefined: resolver.ResolveNowOption
>
I have a patch which fixes this. It builds fine for me.
Not sure if this is the best way to solve the problem, but this might
just work for now.
Thanks and regards,
Nilesh
--- a/internal/rubyserver/balancer/balancer.go
+++ b/internal/rubyserver/balancer/balancer.go
@@ -120,7 +120,7 @@
// Build ignores its resolver.Target argument. That means it does not
// care what "address" the caller wants to resolve. We always resolve to
// the current list of address for local gitaly-ruby processes.
-func (b *builder) Build(_ resolver.Target, cc resolver.ClientConn, _ resolver.BuildOption) (resolver.Resolver, error) {
+func (b *builder) Build(_ resolver.Target, cc resolver.ClientConn, _ resolver.BuildOptions) (resolver.Resolver, error) {
cc.NewServiceConfig(`{"LoadBalancingPolicy":"round_robin"}`)
return newGitalyResolver(cc, b.addressUpdates), nil
}
@@ -217,7 +217,7 @@
return r
}
-func (r *gitalyResolver) ResolveNow(resolver.ResolveNowOption) {
+func (r *gitalyResolver) ResolveNow(resolver.ResolveNowOptions) {
r.resolveNow <- struct{}{}
}
_______________________________________________
Pkg-go-maintainers mailing list
Pkg-go-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-go-maintainers
