Merge pull request #10027 from hexfusion/cherry-pick-a205cfe

etcdserver: cherry-pick #9861 to release-3.3

etcdserver/api/v3rpc/grpc.go

@@ -16,10 +16,7 @@ package v3rpc
 
 import (
 	"crypto/tls"
-	"io/ioutil"
 	"math"
-	"os"
-	"sync"
 
 	"github.com/coreos/etcd/etcdserver"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
@@ -28,7 +25,6 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-prometheus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/health"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
 )
@@ -39,9 +35,6 @@ const (
 	maxSendBytes      = math.MaxInt32
 )
 
-// integration tests call this multiple times, which is racey in gRPC side
-var grpclogOnce sync.Once
-
 func Server(s *etcdserver.EtcdServer, tls *tls.Config, gopts ...grpc.ServerOption) *grpc.Server {
 	var opts []grpc.ServerOption
 	opts = append(opts, grpc.CustomCodec(&codec{}))
@@ -79,16 +72,5 @@ func Server(s *etcdserver.EtcdServer, tls *tls.Config, gopts ...grpc.ServerOptio
 	// set zero values for metrics registered for this grpc server
 	grpc_prometheus.Register(grpcServer)
 
-	grpclogOnce.Do(func() {
-		if s.Cfg.Debug {
-			grpc.EnableTracing = true
-			// enable info, warning, error
-			grpclog.SetLoggerV2(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr))
-		} else {
-			// only discard info
-			grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr))
-		}
-	})
-
 	return grpcServer
 }

integration/embed_test.go

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !cluster_proxy
+
+// TODO: fix race conditions with setupLogging
+
 package integration
 
 import (