Skip to content

Commit eeb95b2

Browse files
turn-off internode in trace console (#536)
1 parent e5c96a0 commit eeb95b2

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

restapi/admin_trace.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@ type callStats struct {
4848
Ttfb string `json:"timeToFirstByte"`
4949
}
5050

51+
type serviceTraceOpts struct {
52+
AllTraffic bool
53+
ErrOnly bool
54+
}
55+
5156
// startTraceInfo starts trace of the servers
52-
func startTraceInfo(ctx context.Context, conn WSConn, client MinioAdmin) error {
53-
// trace all traffic
54-
allTraffic := true
55-
// Trace failed requests only
56-
errOnly := false
57+
func startTraceInfo(ctx context.Context, conn WSConn, client MinioAdmin, opts serviceTraceOpts) error {
5758
// Start listening on all trace activity.
58-
traceCh := client.serviceTrace(ctx, allTraffic, errOnly)
59+
traceCh := client.serviceTrace(ctx, opts.AllTraffic, opts.ErrOnly)
5960
for {
6061
select {
6162
case <-ctx.Done():

restapi/admin_trace_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestAdminTrace(t *testing.T) {
8383
writesCount++
8484
return nil
8585
}
86-
if err := startTraceInfo(ctx, mockWSConn, adminClient); err != nil {
86+
if err := startTraceInfo(ctx, mockWSConn, adminClient, serviceTraceOpts{AllTraffic: true, ErrOnly: false}); err != nil {
8787
t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
8888
}
8989
// check that the TestReceiver got the same number of data from trace.
@@ -95,7 +95,7 @@ func TestAdminTrace(t *testing.T) {
9595
connWriteMessageMock = func(messageType int, data []byte) error {
9696
return fmt.Errorf("error on write")
9797
}
98-
if err := startTraceInfo(ctx, mockWSConn, adminClient); assert.Error(err) {
98+
if err := startTraceInfo(ctx, mockWSConn, adminClient, serviceTraceOpts{}); assert.Error(err) {
9999
assert.Equal("error on write", err.Error())
100100
}
101101

@@ -121,7 +121,7 @@ func TestAdminTrace(t *testing.T) {
121121
connWriteMessageMock = func(messageType int, data []byte) error {
122122
return nil
123123
}
124-
if err := startTraceInfo(ctx, mockWSConn, adminClient); assert.Error(err) {
124+
if err := startTraceInfo(ctx, mockWSConn, adminClient, serviceTraceOpts{}); assert.Error(err) {
125125
assert.Equal("error on trace", err.Error())
126126
}
127127
}

restapi/ws_handle.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,10 @@ func (wsc *wsAdminClient) trace() {
253253

254254
ctx := wsReadClientCtx(wsc.conn)
255255

256-
err := startTraceInfo(ctx, wsc.conn, wsc.client)
256+
err := startTraceInfo(ctx, wsc.conn, wsc.client, serviceTraceOpts{
257+
AllTraffic: false,
258+
ErrOnly: false,
259+
})
257260

258261
sendWsCloseMessage(wsc.conn, err)
259262
}

0 commit comments

Comments
 (0)