From 1366ca58405b87720684332ac55f0ee3d3ded532 Mon Sep 17 00:00:00 2001 From: Dom Del Nano Date: Mon, 23 Dec 2024 14:09:29 +0000 Subject: [PATCH] Remove unneeded changes Signed-off-by: Dom Del Nano --- src/pixie_cli/pkg/vizier/connector.go | 10 ---------- src/pixie_cli/pkg/vizier/script.go | 3 --- 2 files changed, 13 deletions(-) diff --git a/src/pixie_cli/pkg/vizier/connector.go b/src/pixie_cli/pkg/vizier/connector.go index 5bba872af5c..cf7bbaf8f30 100644 --- a/src/pixie_cli/pkg/vizier/connector.go +++ b/src/pixie_cli/pkg/vizier/connector.go @@ -233,10 +233,6 @@ func checkForTransientGRPCFailure(s *status.Status) bool { return false } -func checkForDeadlineExceeded(s *status.Status) bool { - return s.Code() == codes.DeadlineExceeded -} - func checkForJWTExpired(s *status.Status) bool { return s.Code() == codes.Unauthenticated && strings.Contains(s.Message(), "invalid auth token") } @@ -272,8 +268,6 @@ func (c *Connector) handleStream(ctx context.Context, state *streamState, first state.firstErr = s.Err() } return retry - } else if checkForDeadlineExceeded(s) { - return doNotRetry } } } @@ -356,10 +350,6 @@ func (c *Connector) ExecuteScriptStream(ctx context.Context, script *script.Exec } s.resp, err = c.restartConnAndResumeExecute(ctx, s.queryID) if err != nil { - if _, ok := status.FromError(err); ok { - cliUtils.Errorf("Stream failed with error: %s", err.Error()) - return - } continue } shouldRetry = c.handleStream(ctx, s, false) diff --git a/src/pixie_cli/pkg/vizier/script.go b/src/pixie_cli/pkg/vizier/script.go index 92732989379..3fe97c53599 100644 --- a/src/pixie_cli/pkg/vizier/script.go +++ b/src/pixie_cli/pkg/vizier/script.go @@ -34,8 +34,6 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" - log "github.com/sirupsen/logrus" - apiutils "px.dev/pixie/src/api/go/pxapi/utils" "px.dev/pixie/src/api/proto/vizierpb" "px.dev/pixie/src/pixie_cli/pkg/components" @@ -398,7 +396,6 @@ func RunSimpleHealthCheckScript(br *script.BundleManager, cloudAddr string, clus resp, err := runHealthCheckScript(v, execScript) if scriptErr, ok := err.(*ScriptExecutionError); ok { if scriptErr.Code() == CodeCompilerError { - log.Warn("Detected an older vizier running. Please upgrade to the latest version.") // If the script compilation failed, we fall back to the old health check script. execScript, err = br.GetScript(script.AgentStatusScript) if err != nil {