Merge pull request etcd-io#14151 from ahrtr/3.4_skip_TestWatchRequest…

…Progress_proxy [3.4] Skip WatchRequestProgress test in grpc-proxy mode.
ahrtr · Jun 28, 2022 · f169e5d · f169e5d
2 parents f1c59dc + 6958ee8
commit f169e5d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go
@@ -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

diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go
@@ -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{

diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go
@@ -26,7 +26,7 @@ import (
 	"go.etcd.io/etcd/proxy/grpcproxy/adapter"
 )
 
-const throughProxy = true
+const ThroughProxy = true
 
 var (
 	pmu     sync.Mutex

diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go
@@ -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 {

diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go
@@ -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")
 		}
 	}
 }