Add logs to .Get methods

Shopify · Oct 10, 2024 · b6e9789 · b6e9789
1 parent ff8fdc5
commit b6e9789
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 1 deletion.
diff --git a/go/vt/topo/cell_info.go b/go/vt/topo/cell_info.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	"vitess.io/vitess/go/sets"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/vterrors"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
@@ -70,6 +71,7 @@ func (ts *Server) GetCellInfo(ctx context.Context, cell string, strongRead bool)
 	filePath := pathForCellInfo(cell)
 	contents, _, err := conn.Get(ctx, filePath)
 	if err != nil {
+		log.Warningf("GetCellInfo failed for cell %s: %v", cell, err)
 		return nil, err
 	}
 
@@ -115,6 +117,7 @@ func (ts *Server) UpdateCellInfoFields(ctx context.Context, cell string, update
 		case IsErrType(err, NoNode):
 			// Nothing to do.
 		default:
+			log.Warningf("GetCellInfo failed for cell %s: %v", cell, err)
 			return err
 		}
 

diff --git a/go/vt/topo/cells_aliases.go b/go/vt/topo/cells_aliases.go
@@ -22,6 +22,7 @@ import (
 
 	"context"
 
+	"vitess.io/vitess/go/vt/log"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 )
 
@@ -56,6 +57,7 @@ func (ts *Server) GetCellsAliases(ctx context.Context, strongRead bool) (ret map
 			aliasPath := pathForCellsAlias(alias)
 			contents, _, err := conn.Get(ctx, aliasPath)
 			if err != nil {
+				log.Warningf("GetCellsAliases failed for alias %s: %v", alias, err)
 				return nil, err
 			}
 
@@ -83,6 +85,7 @@ func (ts *Server) GetCellsAlias(ctx context.Context, name string, strongRead boo
 	aliasPath := pathForCellsAlias(name)
 	contents, _, err := conn.Get(ctx, aliasPath)
 	if err != nil {
+		log.Warningf("GetCellsAlias failed for alias %s: %v", name, err)
 		return nil, err
 	}
 
@@ -146,6 +149,7 @@ func (ts *Server) UpdateCellsAlias(ctx context.Context, alias string, update fun
 		case IsErrType(err, NoNode):
 			// Nothing to do.
 		default:
+			log.Warningf("GetCellsAlias failed for alias %s: %v", alias, err)
 			return err
 		}
 

diff --git a/go/vt/topo/external_vitess_cluster.go b/go/vt/topo/external_vitess_cluster.go
@@ -21,6 +21,7 @@ import (
 	"path"
 
 	"vitess.io/vitess/go/event"
+	"vitess.io/vitess/go/vt/log"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/topo/events"
 	"vitess.io/vitess/go/vt/vterrors"
@@ -72,6 +73,7 @@ func (ts *Server) GetExternalVitessCluster(ctx context.Context, clusterName stri
 		return nil, nil
 	case err == nil:
 	default:
+		log.Warningf("GetExternalVitessCluster failed for cluster %s: %v", clusterName, err)
 		return nil, err
 	}
 	vc := &topodatapb.ExternalVitessCluster{}

diff --git a/go/vt/topo/keyspace.go b/go/vt/topo/keyspace.go
@@ -196,6 +196,7 @@ func (ts *Server) GetKeyspace(ctx context.Context, keyspace string) (*KeyspaceIn
 	keyspacePath := path.Join(KeyspacesPath, keyspace, KeyspaceFile)
 	data, version, err := ts.globalCell.Get(ctx, keyspacePath)
 	if err != nil {
+		log.Warningf("GetKeyspace failed for keyspace %s: %v", keyspace, err)
 		return nil, err
 	}
 

diff --git a/go/vt/topo/metadata.go b/go/vt/topo/metadata.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"path"
 
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
 
 	"vitess.io/vitess/go/event"
@@ -35,6 +36,7 @@ func (ts *Server) UpsertMetadata(ctx context.Context, key string, val string) er
 
 	if err != nil {
 		if !IsErrType(err, NoNode) {
+			log.Warningf("UpsertMetadata failed for key %s: %v", key, err)
 			return err
 		}
 
@@ -92,6 +94,7 @@ func (ts *Server) getMetadata(ctx context.Context, key string) (string, error) {
 	keyPath := path.Join(MetadataPath, key)
 	contents, _, err := ts.globalCell.Get(ctx, keyPath)
 	if err != nil {
+		log.Warningf("getMetadata failed for key %s: %v", key, err)
 		return "", err
 	}
 

diff --git a/go/vt/topo/replication.go b/go/vt/topo/replication.go
@@ -190,6 +190,7 @@ func (ts *Server) UpdateShardReplicationFields(ctx context.Context, cell, keyspa
 				return vterrors.Wrap(err, "bad ShardReplication data")
 			}
 		default:
+			log.Warningf("GetShardReplication failed for cell %s, keyspace %s, shard %s: %v", cell, keyspace, shard, err)
 			return err
 		}
 
@@ -239,6 +240,7 @@ func (ts *Server) GetShardReplication(ctx context.Context, cell, keyspace, shard
 	nodePath := path.Join(KeyspacesPath, keyspace, ShardsPath, shard, ShardReplicationFile)
 	data, _, err := conn.Get(ctx, nodePath)
 	if err != nil {
+		log.Warningf("GetShardReplication failed for cell %s, keyspace %s, shard %s: %v", cell, keyspace, shard, err)
 		return nil, err
 	}
 

diff --git a/go/vt/topo/shard.go b/go/vt/topo/shard.go
@@ -214,8 +214,8 @@ func (ts *Server) GetShard(ctx context.Context, keyspace, shard string) (*ShardI
 	shardPath := shardFilePath(keyspace, shard)
 
 	data, version, err := ts.globalCell.Get(ctx, shardPath)
-
 	if err != nil {
+		log.Warningf("GetShard failed for keyspace %s, shard %s: %v", keyspace, shard, err)
 		return nil, err
 	}
 

diff --git a/go/vt/topo/srv_keyspace.go b/go/vt/topo/srv_keyspace.go
@@ -23,6 +23,7 @@ import (
 	"path"
 	"sync"
 
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/vterrors"
 
 	"vitess.io/vitess/go/vt/concurrency"
@@ -686,6 +687,7 @@ func (ts *Server) GetSrvKeyspace(ctx context.Context, cell, keyspace string) (*t
 	nodePath := srvKeyspaceFileName(keyspace)
 	data, _, err := conn.Get(ctx, nodePath)
 	if err != nil {
+		log.Warningf("GetSrvKeyspace failed for cell %s, keyspace %s: %v", cell, keyspace, err)
 		return nil, err
 	}
 	srvKeyspace := &topodatapb.SrvKeyspace{}

diff --git a/go/vt/topo/srv_vschema.go b/go/vt/topo/srv_vschema.go
@@ -121,6 +121,7 @@ func (ts *Server) GetSrvVSchema(ctx context.Context, cell string) (*vschemapb.Sr
 	nodePath := SrvVSchemaFile
 	data, _, err := conn.Get(ctx, nodePath)
 	if err != nil {
+		log.Warningf("GetSrvVSchema failed for cell %s: %v", cell, err)
 		return nil, err
 	}
 	srvVSchema := &vschemapb.SrvVSchema{}

diff --git a/go/vt/topo/stats_conn.go b/go/vt/topo/stats_conn.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"vitess.io/vitess/go/stats"
+	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/proto/vtrpc"
 	"vitess.io/vitess/go/vt/vterrors"
 )
@@ -109,6 +110,7 @@ func (st *StatsConn) Get(ctx context.Context, filePath string) ([]byte, Version,
 	defer topoStatsConnTimings.Record(statsKey, startTime)
 	bytes, version, err := st.conn.Get(ctx, filePath)
 	if err != nil {
+		log.Warningf("Get failed for cell %s, filePath %s: %v", st.cell, filePath, err)
 		topoStatsConnErrors.Add(statsKey, int64(1))
 		return bytes, version, err
 	}

diff --git a/go/vt/topo/vschema.go b/go/vt/topo/vschema.go
@@ -58,6 +58,7 @@ func (ts *Server) GetVSchema(ctx context.Context, keyspace string) (*vschemapb.K
 	nodePath := path.Join(KeyspacesPath, keyspace, VSchemaFile)
 	data, _, err := ts.globalCell.Get(ctx, nodePath)
 	if err != nil {
+		log.Warningf("GetVSchema failed for keyspace %s: %v", keyspace, err)
 		return nil, err
 	}
 	var vs vschemapb.Keyspace
@@ -115,6 +116,7 @@ func (ts *Server) GetRoutingRules(ctx context.Context) (*vschemapb.RoutingRules,
 		if IsErrType(err, NoNode) {
 			return rr, nil
 		}
+		log.Warningf("GetRoutingRules failed for cell %s: %v", ts.globalCell, err)
 		return nil, err
 	}
 	err = rr.UnmarshalVT(data)
@@ -150,6 +152,7 @@ func (ts *Server) GetShardRoutingRules(ctx context.Context) (*vschemapb.ShardRou
 		if IsErrType(err, NoNode) {
 			return srr, nil
 		}
+		log.Warningf("GetShardRoutingRules failed for cell %s: %v", ts.globalCell, err)
 		return nil, err
 	}
 	err = srr.UnmarshalVT(data)

diff --git a/go/vt/topo/wildcards.go b/go/vt/topo/wildcards.go
@@ -288,5 +288,6 @@ func (ts *Server) resolveRecursive(ctx context.Context, cell string, parts []str
 		// The path doesn't exist, don't return anything.
 		return nil, nil
 	}
+	log.Warningf("Get failed for cell %s, filePath %s: %v", cell, p, err)
 	return nil, err
 }
diff --git a/go/vt/topo/workflow.go b/go/vt/topo/workflow.go
@@ -21,6 +21,7 @@ import (
 
 	"context"
 
+	"vitess.io/vitess/go/vt/log"
 	workflowpb "vitess.io/vitess/go/vt/proto/workflow"
 )
 
@@ -83,6 +84,7 @@ func (ts *Server) GetWorkflow(ctx context.Context, uuid string) (*WorkflowInfo,
 	filePath := pathForWorkflow(uuid)
 	contents, version, err := ts.globalCell.Get(ctx, filePath)
 	if err != nil {
+		log.Warningf("GetWorkflow failed for cell %s, filePath %s: %v", ts.globalCell, filePath, err)
 		return nil, err
 	}