Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.4] Skip WatchRequestProgress test in grpc-proxy mode. #14151

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions clientv3/integration/watch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,9 @@ func TestConfigurableWatchProgressNotifyInterval(t *testing.T) {
}

func TestWatchRequestProgress(t *testing.T) {
if integration.ThroughProxy {
t.Skip("grpc-proxy does not support WatchProgress yet")
}
testCases := []struct {
name string
watchers []string
Expand Down
2 changes: 1 addition & 1 deletion integration/cluster_direct.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
)

const throughProxy = false
const ThroughProxy = false

func toGRPC(c *clientv3.Client) grpcAPI {
return grpcAPI{
Expand Down
2 changes: 1 addition & 1 deletion integration/cluster_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"go.etcd.io/etcd/proxy/grpcproxy/adapter"
)

const throughProxy = true
const ThroughProxy = true

var (
pmu sync.Mutex
Expand Down
2 changes: 1 addition & 1 deletion integration/v3_watch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ func TestV3WatchCancellation(t *testing.T) {
}

var expected string
if throughProxy {
if ThroughProxy {
// grpc proxy has additional 2 watches open
expected = "3"
} else {
Expand Down
3 changes: 2 additions & 1 deletion proxy/grpcproxy/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@ func (wps *watchProxyStream) recvLoop() error {
case *pb.WatchRequest_CancelRequest:
wps.delete(uv.CancelRequest.WatchId)
default:
panic("not implemented")
// Panic or Fatalf would allow network clients to crash the serve remotely.
//panic("not implemented")
}
}
}
Expand Down