turn-off internode in trace console (#536)

This commit is contained in:
Harshavardhana
2020-12-29 15:07:37 -08:00
committed by GitHub
parent e5c96a0787
commit eeb95b2bf6
3 changed files with 14 additions and 10 deletions

View File

@@ -48,14 +48,15 @@ type callStats struct {
Ttfb string `json:"timeToFirstByte"`
}
type serviceTraceOpts struct {
AllTraffic bool
ErrOnly bool
}
// startTraceInfo starts trace of the servers
func startTraceInfo(ctx context.Context, conn WSConn, client MinioAdmin) error {
// trace all traffic
allTraffic := true
// Trace failed requests only
errOnly := false
func startTraceInfo(ctx context.Context, conn WSConn, client MinioAdmin, opts serviceTraceOpts) error {
// Start listening on all trace activity.
traceCh := client.serviceTrace(ctx, allTraffic, errOnly)
traceCh := client.serviceTrace(ctx, opts.AllTraffic, opts.ErrOnly)
for {
select {
case <-ctx.Done():

View File

@@ -83,7 +83,7 @@ func TestAdminTrace(t *testing.T) {
writesCount++
return nil
}
if err := startTraceInfo(ctx, mockWSConn, adminClient); err != nil {
if err := startTraceInfo(ctx, mockWSConn, adminClient, serviceTraceOpts{AllTraffic: true, ErrOnly: false}); err != nil {
t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
}
// check that the TestReceiver got the same number of data from trace.
@@ -95,7 +95,7 @@ func TestAdminTrace(t *testing.T) {
connWriteMessageMock = func(messageType int, data []byte) error {
return fmt.Errorf("error on write")
}
if err := startTraceInfo(ctx, mockWSConn, adminClient); assert.Error(err) {
if err := startTraceInfo(ctx, mockWSConn, adminClient, serviceTraceOpts{}); assert.Error(err) {
assert.Equal("error on write", err.Error())
}
@@ -121,7 +121,7 @@ func TestAdminTrace(t *testing.T) {
connWriteMessageMock = func(messageType int, data []byte) error {
return nil
}
if err := startTraceInfo(ctx, mockWSConn, adminClient); assert.Error(err) {
if err := startTraceInfo(ctx, mockWSConn, adminClient, serviceTraceOpts{}); assert.Error(err) {
assert.Equal("error on trace", err.Error())
}
}

View File

@@ -253,7 +253,10 @@ func (wsc *wsAdminClient) trace() {
ctx := wsReadClientCtx(wsc.conn)
err := startTraceInfo(ctx, wsc.conn, wsc.client)
err := startTraceInfo(ctx, wsc.conn, wsc.client, serviceTraceOpts{
AllTraffic: false,
ErrOnly: false,
})
sendWsCloseMessage(wsc.conn, err)
}