From 3bab887a06155a712c02e072c9bded0ff1a47ebb Mon Sep 17 00:00:00 2001 From: Jan Kisel Date: Mon, 18 Nov 2024 09:20:20 +0100 Subject: [PATCH 1/2] Revert "Update CLI to use grpc transport by default (#6495)" This reverts commit 55be2007a9bcca6862f57b2a405de59d0380fee7. --- CHANGELOG.md | 2 -- tools/cli/app.go | 2 +- tools/cli/factory.go | 46 ++++++++++++++++++++++---------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a37ab6955f..4452007c711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,6 @@ You can find a list of previous releases on the [github releases](https://github ## [Unreleased] Global ratelimiter, see [detailed doc](https://github.com/uber/cadence/blob/master/common/quotas/global/doc.go) -Update CLI to use GRPC transport by default (originally tchannel). - ## [1.2.13] - 2024-09-25 See [Release Note](https://github.com/uber/cadence/releases/tag/v1.2.13) for details diff --git a/tools/cli/app.go b/tools/cli/app.go index 800af4fd115..ad3cc8b28a7 100644 --- a/tools/cli/app.go +++ b/tools/cli/app.go @@ -116,7 +116,7 @@ func NewCliApp(cf ClientFactory, opts ...CLIAppOptions) *cli.App { &cli.StringFlag{ Name: FlagTransport, Aliases: []string{"t"}, - Usage: "optional argument for transport protocol format, either 'grpc' or 'tchannel'. Defaults to grpc if not provided", + Usage: "optional argument for transport protocol format, either 'grpc' or 'tchannel'. Defaults to tchannel if not provided", EnvVars: []string{"CADENCE_CLI_TRANSPORT_PROTOCOL"}, }, &cli.StringFlag{ diff --git a/tools/cli/factory.go b/tools/cli/factory.go index 797f15123e1..b5b748e9a10 100644 --- a/tools/cli/factory.go +++ b/tools/cli/factory.go @@ -124,15 +124,15 @@ func (b *clientFactory) ServerFrontendClient(c *cli.Context) (frontend.Client, e return nil, commoncli.Problem("failed to create frontend client dependency", err) } clientConfig := b.dispatcher.ClientConfig(cadenceFrontendService) - if c.String(FlagTransport) == thriftTransport { - return thrift.NewFrontendClient(serverFrontend.New(clientConfig)), nil + if c.String(FlagTransport) == grpcTransport { + return grpcClient.NewFrontendClient( + apiv1.NewDomainAPIYARPCClient(clientConfig), + apiv1.NewWorkflowAPIYARPCClient(clientConfig), + apiv1.NewWorkerAPIYARPCClient(clientConfig), + apiv1.NewVisibilityAPIYARPCClient(clientConfig), + ), nil } - return grpcClient.NewFrontendClient( - apiv1.NewDomainAPIYARPCClient(clientConfig), - apiv1.NewWorkflowAPIYARPCClient(clientConfig), - apiv1.NewWorkerAPIYARPCClient(clientConfig), - apiv1.NewVisibilityAPIYARPCClient(clientConfig), - ), nil + return thrift.NewFrontendClient(serverFrontend.New(clientConfig)), nil } // ServerAdminClient builds an admin client (based on server side thrift interface) @@ -142,10 +142,10 @@ func (b *clientFactory) ServerAdminClient(c *cli.Context) (admin.Client, error) return nil, commoncli.Problem("failed to create admin client dependency", err) } clientConfig := b.dispatcher.ClientConfig(cadenceFrontendService) - if c.String(FlagTransport) == thriftTransport { - return thrift.NewAdminClient(serverAdmin.New(clientConfig)), nil + if c.String(FlagTransport) == grpcTransport { + return grpcClient.NewAdminClient(adminv1.NewAdminAPIYARPCClient(clientConfig)), nil } - return grpcClient.NewAdminClient(adminv1.NewAdminAPIYARPCClient(clientConfig)), nil + return thrift.NewAdminClient(serverAdmin.New(clientConfig)), nil } // ServerFrontendClientForMigration builds a frontend client (based on server side thrift interface) @@ -155,15 +155,15 @@ func (b *clientFactory) ServerFrontendClientForMigration(c *cli.Context) (fronte return nil, commoncli.Problem("failed to create frontend client dependency", err) } clientConfig := b.dispatcherMigration.ClientConfig(cadenceFrontendService) - if c.String(FlagTransport) == thriftTransport { - return thrift.NewFrontendClient(serverFrontend.New(clientConfig)), nil + if c.String(FlagTransport) == grpcTransport { + return grpcClient.NewFrontendClient( + apiv1.NewDomainAPIYARPCClient(clientConfig), + apiv1.NewWorkflowAPIYARPCClient(clientConfig), + apiv1.NewWorkerAPIYARPCClient(clientConfig), + apiv1.NewVisibilityAPIYARPCClient(clientConfig), + ), nil } - return grpcClient.NewFrontendClient( - apiv1.NewDomainAPIYARPCClient(clientConfig), - apiv1.NewWorkflowAPIYARPCClient(clientConfig), - apiv1.NewWorkerAPIYARPCClient(clientConfig), - apiv1.NewVisibilityAPIYARPCClient(clientConfig), - ), nil + return thrift.NewFrontendClient(serverFrontend.New(clientConfig)), nil } // ServerAdminClientForMigration builds an admin client (based on server side thrift interface) @@ -173,10 +173,10 @@ func (b *clientFactory) ServerAdminClientForMigration(c *cli.Context) (admin.Cli return nil, commoncli.Problem("failed to create admin client dependency", err) } clientConfig := b.dispatcherMigration.ClientConfig(cadenceFrontendService) - if c.String(FlagTransport) == thriftTransport { - return thrift.NewAdminClient(serverAdmin.New(clientConfig)), nil + if c.String(FlagTransport) == grpcTransport { + return grpcClient.NewAdminClient(adminv1.NewAdminAPIYARPCClient(clientConfig)), nil } - return grpcClient.NewAdminClient(adminv1.NewAdminAPIYARPCClient(clientConfig)), nil + return thrift.NewAdminClient(serverAdmin.New(clientConfig)), nil } // ElasticSearchClient builds an ElasticSearch client @@ -235,7 +235,7 @@ func (b *clientFactory) ensureDispatcherForMigration(c *cli.Context) error { } func (b *clientFactory) newClientDispatcher(c *cli.Context, hostPortOverride string) (*yarpc.Dispatcher, error) { - shouldUseGrpc := c.String(FlagTransport) != thriftTransport + shouldUseGrpc := c.String(FlagTransport) == grpcTransport hostPort := tchannelPort if shouldUseGrpc { From 3916c07e02a75ac69f4465ca77bbd7b139766215 Mon Sep 17 00:00:00 2001 From: Jan Kisel Date: Mon, 18 Nov 2024 11:19:13 +0100 Subject: [PATCH 2/2] empty commit