Slack sync upstream 2018.08.09r2

go/mysql/conn_params.go

@@ -34,6 +34,10 @@ type ConnParams struct {
 	SslCert    string `json:"ssl_cert"`
 	SslKey     string `json:"ssl_key"`
 	ServerName string `json:"server_name"`
+
+	// The following is only set when the deprecated "dbname" flags are
+	// supplied and will be removed.
+	DeprecatedDBName string
 }
 
 // EnableSSL will set the right flag on the parameters.

go/vt/dbconfigs/dbconfigs.go

@@ -124,6 +124,9 @@ func registerPerUserFlags(dbc *userConfig, userKey string) {
 	flag.StringVar(&dbc.param.SslCaPath, "db-config-"+userKey+"-ssl-ca-path", "", "deprecated: use db_ssl_ca_path")
 	flag.StringVar(&dbc.param.SslCert, "db-config-"+userKey+"-ssl-cert", "", "deprecated: use db_ssl_cert")
 	flag.StringVar(&dbc.param.SslKey, "db-config-"+userKey+"-ssl-key", "", "deprecated: use db_ssl_key")
+
+	flag.StringVar(&dbc.param.DeprecatedDBName, "db-config-"+userKey+"-dbname", "", "deprecated: dbname does not need to be explicitly configured")
+
 }
 
 // AppWithDB returns connection parameters for app with dbname set.

go/vt/servenv/grpc_server.go

@@ -83,6 +83,10 @@ var (
 	// The lower bound for window size is 64K and any value smaller than that will be ignored.
 	GRPCInitialWindowSize = flag.Int("grpc_server_initial_window_size", 0, "grpc server initial window size")
 
+	// EnforcementPolicy MinTime that sets the keepalive enforcement policy on the server.
+	// This is the minimum amount of time a client should wait before sending a keepalive ping.
+	GRPCKeepAliveEnforcementPolicyMinTime = flag.Duration("grpc_server_keepalive_enforcement_policy_min_time", 5*time.Minute, "grpc server minimum keepalive time")
+
 	authPlugin Authenticator
 )
 
@@ -143,6 +147,11 @@ func createGRPCServer() {
 		opts = append(opts, grpc.InitialWindowSize(int32(*GRPCInitialWindowSize)))
 	}
 
+	ep := keepalive.EnforcementPolicy{
+		MinTime: *GRPCKeepAliveEnforcementPolicyMinTime,
+	}
+	opts = append(opts, grpc.KeepaliveEnforcementPolicy(ep))
+
 	if GRPCMaxConnectionAge != nil {
 		ka := keepalive.ServerParameters{
 			MaxConnectionAge: *GRPCMaxConnectionAge,