diff --git a/go/cmd/vtgate/status.go b/go/cmd/vtgate/status.go
index effd4d66e78..612c9ea5a43 100644
--- a/go/cmd/vtgate/status.go
+++ b/go/cmd/vtgate/status.go
@@ -27,7 +27,7 @@ var (
{{range $i, $skn := .SrvKeyspaceNames}}
| {{github_com_youtube_vitess_vtctld_srv_cell $skn.Cell}} |
- {{if $skn.LastError}}{{$skn.LastError}}
Client: {{$skn.LastErrorHTML}}{{else}}{{range $j, $value := $skn.Value}}{{github_com_youtube_vitess_vtctld_srv_keyspace $skn.Cell $value}} {{end}}{{end}} |
+ {{if $skn.LastError}}{{$skn.LastError}}{{else}}{{range $j, $value := $skn.Value}}{{github_com_youtube_vitess_vtctld_srv_keyspace $skn.Cell $value}} {{end}}{{end}} |
{{end}}
@@ -45,7 +45,7 @@ var (
| {{github_com_youtube_vitess_vtctld_srv_cell $sk.Cell}} |
{{github_com_youtube_vitess_vtctld_srv_keyspace $sk.Cell $sk.Keyspace}} |
- {{if $sk.LastError}}{{$sk.LastError}}
Client: {{$sk.LastErrorHTML}}{{else}}{{$sk.StatusAsHTML}}{{end}} |
+ {{if $sk.LastError}}{{$sk.LastError}}{{else}}{{$sk.StatusAsHTML}}{{end}} |
{{end}}
@@ -67,7 +67,7 @@ var (
{{github_com_youtube_vitess_vtctld_srv_keyspace $ep.Cell $ep.Keyspace}} |
{{github_com_youtube_vitess_vtctld_srv_shard $ep.Cell $ep.Keyspace $ep.Shard}} |
{{github_com_youtube_vitess_vtctld_srv_type $ep.Cell $ep.Keyspace $ep.Shard $ep.TabletType}} |
- {{if $ep.LastError}}{{$ep.LastError}}
Client: {{$ep.LastErrorHTML}}{{else}}{{$ep.StatusAsHTML}}{{end}} |
+ {{if $ep.LastError}}{{$ep.LastError}}{{else}}{{$ep.StatusAsHTML}}{{end}} |
{{end}}
diff --git a/go/vt/vtgate/gorpcvtgateservice/server.go b/go/vt/vtgate/gorpcvtgateservice/server.go
index 76db6c02813..bb9532c6b9d 100644
--- a/go/vt/vtgate/gorpcvtgateservice/server.go
+++ b/go/vt/vtgate/gorpcvtgateservice/server.go
@@ -9,7 +9,6 @@ import (
"flag"
"time"
- "github.com/youtube/vitess/go/vt/callinfo"
"github.com/youtube/vitess/go/vt/rpc"
"github.com/youtube/vitess/go/vt/servenv"
"github.com/youtube/vitess/go/vt/vtgate"
@@ -32,7 +31,7 @@ func (vtg *VTGate) Execute(ctx context.Context, query *proto.Query, reply *proto
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.Execute(callinfo.RPCWrapCallInfo(ctx), query, reply)
+ return vtg.server.Execute(ctx, query, reply)
}
// ExecuteShard is the RPC version of vtgateservice.VTGateService method
@@ -40,7 +39,7 @@ func (vtg *VTGate) ExecuteShard(ctx context.Context, query *proto.QueryShard, re
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.ExecuteShard(callinfo.RPCWrapCallInfo(ctx), query, reply)
+ return vtg.server.ExecuteShard(ctx, query, reply)
}
// ExecuteKeyspaceIds is the RPC version of vtgateservice.VTGateService method
@@ -48,7 +47,7 @@ func (vtg *VTGate) ExecuteKeyspaceIds(ctx context.Context, query *proto.Keyspace
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.ExecuteKeyspaceIds(callinfo.RPCWrapCallInfo(ctx), query, reply)
+ return vtg.server.ExecuteKeyspaceIds(ctx, query, reply)
}
// ExecuteKeyRanges is the RPC version of vtgateservice.VTGateService method
@@ -56,7 +55,7 @@ func (vtg *VTGate) ExecuteKeyRanges(ctx context.Context, query *proto.KeyRangeQu
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.ExecuteKeyRanges(callinfo.RPCWrapCallInfo(ctx), query, reply)
+ return vtg.server.ExecuteKeyRanges(ctx, query, reply)
}
// ExecuteEntityIds is the RPC version of vtgateservice.VTGateService method
@@ -64,7 +63,7 @@ func (vtg *VTGate) ExecuteEntityIds(ctx context.Context, query *proto.EntityIdsQ
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.ExecuteEntityIds(callinfo.RPCWrapCallInfo(ctx), query, reply)
+ return vtg.server.ExecuteEntityIds(ctx, query, reply)
}
// ExecuteBatchShard is the RPC version of vtgateservice.VTGateService method
@@ -72,7 +71,7 @@ func (vtg *VTGate) ExecuteBatchShard(ctx context.Context, batchQuery *proto.Batc
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.ExecuteBatchShard(callinfo.RPCWrapCallInfo(ctx), batchQuery, reply)
+ return vtg.server.ExecuteBatchShard(ctx, batchQuery, reply)
}
// ExecuteBatchKeyspaceIds is the RPC version of
@@ -81,13 +80,13 @@ func (vtg *VTGate) ExecuteBatchKeyspaceIds(ctx context.Context, batchQuery *prot
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.ExecuteBatchKeyspaceIds(callinfo.RPCWrapCallInfo(ctx), batchQuery, reply)
+ return vtg.server.ExecuteBatchKeyspaceIds(ctx, batchQuery, reply)
}
// StreamExecute is the RPC version of vtgateservice.VTGateService method
func (vtg *VTGate) StreamExecute(ctx context.Context, query *proto.Query, sendReply func(interface{}) error) (err error) {
defer vtg.server.HandlePanic(&err)
- return vtg.server.StreamExecute(callinfo.RPCWrapCallInfo(ctx), query, func(value *proto.QueryResult) error {
+ return vtg.server.StreamExecute(ctx, query, func(value *proto.QueryResult) error {
return sendReply(value)
})
}
@@ -95,7 +94,7 @@ func (vtg *VTGate) StreamExecute(ctx context.Context, query *proto.Query, sendRe
// StreamExecuteShard is the RPC version of vtgateservice.VTGateService method
func (vtg *VTGate) StreamExecuteShard(ctx context.Context, query *proto.QueryShard, sendReply func(interface{}) error) (err error) {
defer vtg.server.HandlePanic(&err)
- return vtg.server.StreamExecuteShard(callinfo.RPCWrapCallInfo(ctx), query, func(value *proto.QueryResult) error {
+ return vtg.server.StreamExecuteShard(ctx, query, func(value *proto.QueryResult) error {
return sendReply(value)
})
}
@@ -104,7 +103,7 @@ func (vtg *VTGate) StreamExecuteShard(ctx context.Context, query *proto.QuerySha
// vtgateservice.VTGateService method
func (vtg *VTGate) StreamExecuteKeyRanges(ctx context.Context, query *proto.KeyRangeQuery, sendReply func(interface{}) error) (err error) {
defer vtg.server.HandlePanic(&err)
- return vtg.server.StreamExecuteKeyRanges(callinfo.RPCWrapCallInfo(ctx), query, func(value *proto.QueryResult) error {
+ return vtg.server.StreamExecuteKeyRanges(ctx, query, func(value *proto.QueryResult) error {
return sendReply(value)
})
}
@@ -113,7 +112,7 @@ func (vtg *VTGate) StreamExecuteKeyRanges(ctx context.Context, query *proto.KeyR
// vtgateservice.VTGateService method
func (vtg *VTGate) StreamExecuteKeyspaceIds(ctx context.Context, query *proto.KeyspaceIdQuery, sendReply func(interface{}) error) (err error) {
defer vtg.server.HandlePanic(&err)
- return vtg.server.StreamExecuteKeyspaceIds(callinfo.RPCWrapCallInfo(ctx), query, func(value *proto.QueryResult) error {
+ return vtg.server.StreamExecuteKeyspaceIds(ctx, query, func(value *proto.QueryResult) error {
return sendReply(value)
})
}
@@ -123,7 +122,7 @@ func (vtg *VTGate) Begin(ctx context.Context, noInput *rpc.Unused, outSession *p
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.Begin(callinfo.RPCWrapCallInfo(ctx), outSession)
+ return vtg.server.Begin(ctx, outSession)
}
// Commit is the RPC version of vtgateservice.VTGateService method
@@ -131,7 +130,7 @@ func (vtg *VTGate) Commit(ctx context.Context, inSession *proto.Session, noOutpu
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.Commit(callinfo.RPCWrapCallInfo(ctx), inSession)
+ return vtg.server.Commit(ctx, inSession)
}
// Rollback is the RPC version of vtgateservice.VTGateService method
@@ -139,7 +138,7 @@ func (vtg *VTGate) Rollback(ctx context.Context, inSession *proto.Session, noOut
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.Rollback(callinfo.RPCWrapCallInfo(ctx), inSession)
+ return vtg.server.Rollback(ctx, inSession)
}
// SplitQuery is the RPC version of vtgateservice.VTGateService method
@@ -147,7 +146,7 @@ func (vtg *VTGate) SplitQuery(ctx context.Context, req *proto.SplitQueryRequest,
defer vtg.server.HandlePanic(&err)
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(*rpcTimeout))
defer cancel()
- return vtg.server.SplitQuery(callinfo.RPCWrapCallInfo(ctx), req, reply)
+ return vtg.server.SplitQuery(ctx, req, reply)
}
// New returns a new VTGate service
diff --git a/go/vt/vtgate/srv_topo_server.go b/go/vt/vtgate/srv_topo_server.go
index 8e2aa5fadc6..d7cd43b3774 100644
--- a/go/vt/vtgate/srv_topo_server.go
+++ b/go/vt/vtgate/srv_topo_server.go
@@ -16,7 +16,6 @@ import (
log "github.com/golang/glog"
"github.com/youtube/vitess/go/stats"
- "github.com/youtube/vitess/go/vt/callinfo"
"github.com/youtube/vitess/go/vt/topo"
"golang.org/x/net/context"
)
@@ -469,10 +468,10 @@ func (server *ResilientSrvTopoServer) GetEndPoints(context context.Context, cell
// SrvKeyspaceNamesCacheStatus is the current value for SrvKeyspaceNames
type SrvKeyspaceNamesCacheStatus struct {
- Cell string
- Value []string
- LastError error
- LastErrorHTML template.HTML
+ Cell string
+ Value []string
+ LastError error
+ LastErrorContext context.Context
}
// SrvKeyspaceNamesCacheStatusList is used for sorting
@@ -495,11 +494,11 @@ func (skncsl SrvKeyspaceNamesCacheStatusList) Swap(i, j int) {
// SrvKeyspaceCacheStatus is the current value for a SrvKeyspace object
type SrvKeyspaceCacheStatus struct {
- Cell string
- Keyspace string
- Value *topo.SrvKeyspace
- LastError error
- LastErrorHTML template.HTML
+ Cell string
+ Keyspace string
+ Value *topo.SrvKeyspace
+ LastError error
+ LastErrorContext context.Context
}
// StatusAsHTML returns an HTML version of our status.
@@ -554,12 +553,12 @@ func (skcsl SrvKeyspaceCacheStatusList) Swap(i, j int) {
// SrvShardCacheStatus is the current value for a SrvShard object
type SrvShardCacheStatus struct {
- Cell string
- Keyspace string
- Shard string
- Value *topo.SrvShard
- LastError error
- LastErrorHTML template.HTML
+ Cell string
+ Keyspace string
+ Shard string
+ Value *topo.SrvShard
+ LastError error
+ LastErrorContext context.Context
}
// StatusAsHTML returns an HTML version of our status.
@@ -604,14 +603,14 @@ func (sscsl SrvShardCacheStatusList) Swap(i, j int) {
// EndPointsCacheStatus is the current value for an EndPoints object
type EndPointsCacheStatus struct {
- Cell string
- Keyspace string
- Shard string
- TabletType topo.TabletType
- Value *topo.EndPoints
- OriginalValue *topo.EndPoints
- LastError error
- LastErrorHTML template.HTML
+ Cell string
+ Keyspace string
+ Shard string
+ TabletType topo.TabletType
+ Value *topo.EndPoints
+ OriginalValue *topo.EndPoints
+ LastError error
+ LastErrorContext context.Context
}
// StatusAsHTML returns an HTML version of our status.
@@ -699,10 +698,10 @@ func (server *ResilientSrvTopoServer) CacheStatus() *ResilientSrvTopoServerCache
for _, entry := range server.srvKeyspaceNamesCache {
entry.mutex.Lock()
result.SrvKeyspaceNames = append(result.SrvKeyspaceNames, &SrvKeyspaceNamesCacheStatus{
- Cell: entry.cell,
- Value: entry.value,
- LastError: entry.lastError,
- LastErrorHTML: callinfo.HTMLFromContext(entry.lastErrorContext),
+ Cell: entry.cell,
+ Value: entry.value,
+ LastError: entry.lastError,
+ LastErrorContext: entry.lastErrorContext,
})
entry.mutex.Unlock()
}
@@ -710,11 +709,11 @@ func (server *ResilientSrvTopoServer) CacheStatus() *ResilientSrvTopoServerCache
for _, entry := range server.srvKeyspaceCache {
entry.mutex.Lock()
result.SrvKeyspaces = append(result.SrvKeyspaces, &SrvKeyspaceCacheStatus{
- Cell: entry.cell,
- Keyspace: entry.keyspace,
- Value: entry.value,
- LastError: entry.lastError,
- LastErrorHTML: callinfo.HTMLFromContext(entry.lastErrorContext),
+ Cell: entry.cell,
+ Keyspace: entry.keyspace,
+ Value: entry.value,
+ LastError: entry.lastError,
+ LastErrorContext: entry.lastErrorContext,
})
entry.mutex.Unlock()
}
@@ -722,12 +721,12 @@ func (server *ResilientSrvTopoServer) CacheStatus() *ResilientSrvTopoServerCache
for _, entry := range server.srvShardCache {
entry.mutex.Lock()
result.SrvShards = append(result.SrvShards, &SrvShardCacheStatus{
- Cell: entry.cell,
- Keyspace: entry.keyspace,
- Shard: entry.shard,
- Value: entry.value,
- LastError: entry.lastError,
- LastErrorHTML: callinfo.HTMLFromContext(entry.lastErrorContext),
+ Cell: entry.cell,
+ Keyspace: entry.keyspace,
+ Shard: entry.shard,
+ Value: entry.value,
+ LastError: entry.lastError,
+ LastErrorContext: entry.lastErrorContext,
})
entry.mutex.Unlock()
}
@@ -735,14 +734,14 @@ func (server *ResilientSrvTopoServer) CacheStatus() *ResilientSrvTopoServerCache
for _, entry := range server.endPointsCache {
entry.mutex.Lock()
result.EndPoints = append(result.EndPoints, &EndPointsCacheStatus{
- Cell: entry.cell,
- Keyspace: entry.keyspace,
- Shard: entry.shard,
- TabletType: entry.tabletType,
- Value: entry.value,
- OriginalValue: entry.originalValue,
- LastError: entry.lastError,
- LastErrorHTML: callinfo.HTMLFromContext(entry.lastErrorContext),
+ Cell: entry.cell,
+ Keyspace: entry.keyspace,
+ Shard: entry.shard,
+ TabletType: entry.tabletType,
+ Value: entry.value,
+ OriginalValue: entry.originalValue,
+ LastError: entry.lastError,
+ LastErrorContext: entry.lastErrorContext,
})
entry.mutex.Unlock()
}
diff --git a/test/vtgatev2_test.py b/test/vtgatev2_test.py
index 0925e701686..4c48be57d77 100755
--- a/test/vtgatev2_test.py
+++ b/test/vtgatev2_test.py
@@ -714,11 +714,7 @@ def tablet_start(self, tablet, tablet_type, lameduck_period='0.5s'):
# target_tablet_type=tablet_type)
def test_status_with_error(self):
- """Tests that the status page loads correctly after a VTGate error.
-
- More than anything, this is a smoke test for CallInfo working correctly.
- """
- return
+ """Tests that the status page loads correctly after a VTGate error."""
vtgate_conn = get_connection()
cursor = vtgate_conn.cursor('INVALID_KEYSPACE', 'replica', keyspace_ids=['0'])
# We expect to see a DatabaseError due to an invalid keyspace
@@ -726,8 +722,6 @@ def test_status_with_error(self):
cursor.execute('select * from vt_insert_test', {})
# Page should have loaded successfully
self.assertIn('