diff --git a/go/cmd/vtworkerclient/vtworkerclient.go b/go/cmd/vtworkerclient/vtworkerclient.go index 997da72765..0e1874453b 100644 --- a/go/cmd/vtworkerclient/vtworkerclient.go +++ b/go/cmd/vtworkerclient/vtworkerclient.go @@ -55,7 +55,7 @@ func main() { logutil.LogEvent(logger, e) }) if err != nil { - log.Errorf("%+v", err) + log.Error(err) os.Exit(1) } } diff --git a/go/vt/worker/restartable_result_reader.go b/go/vt/worker/restartable_result_reader.go index 84649be867..90a5e8c20e 100644 --- a/go/vt/worker/restartable_result_reader.go +++ b/go/vt/worker/restartable_result_reader.go @@ -23,8 +23,6 @@ import ( "strings" "time" - "github.com/golang/glog" - "vitess.io/vitess/go/vt/vterrors" "golang.org/x/net/context" @@ -117,7 +115,7 @@ func tryToConnect(r *RestartableResultReader) error { return fmt.Errorf("failed to initialize tablet connection: retryable %v, %v", retryable, err) } statsRetryCount.Add(1) - glog.Infof("retrying after error: %v", err) + log.Infof("retrying after error: %v", err) } } diff --git a/go/vt/worker/split_clone.go b/go/vt/worker/split_clone.go index 8eb5fefa2b..8537be596e 100644 --- a/go/vt/worker/split_clone.go +++ b/go/vt/worker/split_clone.go @@ -435,29 +435,6 @@ func (scw *SplitCloneWorker) Run(ctx context.Context) error { return nil } -func (scw *SplitCloneWorker) disableUniquenessCheckOnDestinationTablets(ctx context.Context) error { - for _, si := range scw.destinationShards { - tablets := scw.tsc.GetHealthyTabletStats(si.Keyspace(), si.ShardName(), topodatapb.TabletType_MASTER) - if len(tablets) != 1 { - return fmt.Errorf("should have exactly one MASTER tablet, have %v", len(tablets)) - } - tablet := tablets[0].Tablet - cmd := "SET UNIQUE_CHECKS=0" - scw.wr.Logger().Infof("disabling uniqueness checks on %v", topoproto.TabletAliasString(tablet.Alias)) - _, err := scw.wr.TabletManagerClient().ExecuteFetchAsApp(ctx, tablet, true, []byte(cmd), 0) - if err != nil { - return fmt.Errorf("should have exactly one MASTER tablet, have %v", len(tablets)) - } - scw.cleaner.Record("EnableUniquenessChecks", topoproto.TabletAliasString(tablet.Alias), func(ctx context.Context, wr *wrangler.Wrangler) error { - cmd := "SET UNIQUE_CHECKS=1" - _, err := scw.wr.TabletManagerClient().ExecuteFetchAsApp(ctx, tablet, true, []byte(cmd), 0) - return err - }) - } - - return nil -} - func (scw *SplitCloneWorker) run(ctx context.Context) error { // Phase 1: read what we need to do. if err := scw.init(ctx); err != nil {