Skip to content

fixing log messages #6413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sougou merged 1 commit into from
Jul 9, 2020
Merged

fixing log messages #6413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions go/test/endtoend/backup/vtbackup/backup_only_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ func firstBackupTest(t *testing.T, tabletType string) {
cluster.VerifyRowsInTablet(t, replica1, keyspaceName, 1)

// backup the replica
log.Info("taking backup %s", time.Now())
log.Infof("taking backup %s", time.Now())
vtBackup(t, false)
log.Info("done taking backup %s", time.Now())
log.Infof("done taking backup %s", time.Now())

// check that the backup shows up in the listing
verifyBackupCount(t, shardKsName, len(backups)+1)
Expand Down Expand Up @@ -164,7 +164,7 @@ func firstBackupTest(t *testing.T, tabletType string) {
func vtBackup(t *testing.T, initialBackup bool) {
// Take the back using vtbackup executable
extraArgs := []string{"-allow_first_backup", "-db-credentials-file", dbCredentialFile}
log.Info("starting backup tablet %s", time.Now())
log.Infof("starting backup tablet %s", time.Now())
err := localCluster.StartVtbackup(newInitDBFile, initialBackup, keyspaceName, shardName, cell, extraArgs...)
require.Nil(t, err)
}
Expand Down Expand Up @@ -233,7 +233,7 @@ func initTablets(t *testing.T, startTablet bool, initShardMaster bool) {
func restore(t *testing.T, tablet *cluster.Vttablet, tabletType string, waitForState string) {
// Erase mysql/tablet dir, then start tablet with restore enabled.

log.Info("restoring tablet %s", time.Now())
log.Infof("restoring tablet %s", time.Now())
resetTabletDirectory(t, *tablet, true)

err := tablet.VttabletProcess.CreateDB(keyspaceName)
Expand Down
2 changes: 1 addition & 1 deletion go/test/endtoend/encryption/encryptedtransport/encrypted_transport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ func clusterSetUp(t *testing.T) (int, error) {
}

func createSignedCert(ca string, serial string, name string, commonName string) error {
log.Info("Creating signed cert and key %s", commonName)
log.Infof("Creating signed cert and key %s", commonName)
tmpProcess := exec.Command(
"vttlstest",
"-root", certDirectory,
Expand Down
2 changes: 1 addition & 1 deletion go/test/endtoend/sharding/verticalsplit/vertical_split_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ func checkClientConnRedirectionExecuteKeyrange(ctx context.Context, t *testing.T
}

func checkValues(t *testing.T, tablet *cluster.Vttablet, keyspace string, dbname string, table string, first int, count int) {
log.Info("Checking %d values from %s/%s starting at %d", count, dbname, table, first)
log.Infof("Checking %d values from %s/%s starting at %d", count, dbname, table, first)
qr, _ := tablet.VttabletProcess.QueryTablet(fmt.Sprintf("select id, msg from %s where id>=%d order by id limit %d", table, first, count), keyspace, true)
assert.Equal(t, count, len(qr.Rows), fmt.Sprintf("got wrong number of rows: %d != %d", len(qr.Rows), count))
i := 0
Expand Down
6 changes: 3 additions & 3 deletions go/vt/topo/vschema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ func (ts *Server) SaveVSchema(ctx context.Context, keyspace string, vschema *vsc

_, err = ts.globalCell.Update(ctx, nodePath, data, nil)
if err != nil {
log.Info("successfully updated vschema for keyspace %s: %v", keyspace, data)
log.Infof("successfully updated vschema for keyspace %s: %v", keyspace, data)
}
return err
}

// DeleteVSchema delete the keyspace if it exists
func (ts *Server) DeleteVSchema(ctx context.Context, keyspace string) error {
log.Info("deleting vschema for keyspace %s", keyspace)
log.Infof("deleting vschema for keyspace %s", keyspace)
nodePath := path.Join(KeyspacesPath, keyspace, VSchemaFile)
return ts.globalCell.Delete(ctx, nodePath, nil)
}
Expand All @@ -75,7 +75,7 @@ func (ts *Server) GetVSchema(ctx context.Context, keyspace string) (*vschemapb.K
func (ts *Server) EnsureVSchema(ctx context.Context, keyspace string) error {
vschema, err := ts.GetVSchema(ctx, keyspace)
if err != nil && !IsErrType(err, NoNode) {
log.Info("error in getting vschema for keyspace %s: %v", keyspace, err)
log.Infof("error in getting vschema for keyspace %s: %v", keyspace, err)
}
if vschema == nil || IsErrType(err, NoNode) {
err = ts.SaveVSchema(ctx, keyspace, &vschemapb.Keyspace{
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vttablet/filelogger/filelogger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (l *fileLogger) Stop() {

// Init starts logging to the given file path.
func Init(path string) (FileLogger, error) {
log.Info("Logging queries to file %s", path)
log.Infof("Logging queries to file %s", path)
logChan, err := tabletenv.StatsLogger.LogToFile(path, streamlog.GetFormatter(tabletenv.StatsLogger))
if err != nil {
return nil, err
Expand Down