Skip to content

Commit 7f056b8

Browse files
author
Ricardo Lüders
committed
fix: limit node by role and better error log
1 parent 663b367 commit 7f056b8

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

pkg/gatherers/clusterconfig/gather_node_logs.go

+14-8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"compress/gzip"
66
"context"
77
"fmt"
8+
"io"
89
"strconv"
910

1011
"github.com/openshift/insights-operator/pkg/gatherers/common"
@@ -63,7 +64,7 @@ func (g *Gatherer) GatherNodeLogs(ctx context.Context) ([]record.Record, []error
6364
}
6465

6566
func gatherNodeLogs(ctx context.Context, client corev1client.CoreV1Interface) ([]record.Record, []error) {
66-
nodes, err := client.Nodes().List(ctx, metav1.ListOptions{})
67+
nodes, err := client.Nodes().List(ctx, metav1.ListOptions{LabelSelector: "node-role.kubernetes.io/master"})
6768
if err != nil {
6869
return nil, []error{err}
6970
}
@@ -119,19 +120,24 @@ func nodeLogString(ctx context.Context, req *rest.Request) (string, error) {
119120
return "", err
120121
}
121122
defer func() {
122-
_ = in.Close()
123+
if closeErr := in.Close(); closeErr != nil {
124+
klog.Errorf("failed to close the request stream: %v", closeErr)
125+
}
123126
}()
124127

125-
r, err := gzip.NewReader(in)
126-
var scanner *bufio.Scanner
127-
if err != nil {
128-
scanner = bufio.NewScanner(in)
128+
var reader io.Reader
129+
if r, err := gzip.NewReader(in); err != nil {
130+
klog.Warningf("failed to create gzip reader: %v. Reading uncompressed data.", err)
131+
reader = in
129132
} else {
130133
defer func() {
131-
_ = r.Close()
134+
if closeErr := r.Close(); closeErr != nil {
135+
klog.Errorf("failed to close the gzip reader: %v", closeErr)
136+
}
132137
}()
133-
scanner = bufio.NewScanner(r)
138+
reader = r
134139
}
140+
scanner := bufio.NewScanner(reader)
135141

136142
messagesToSearch := nodeLogsMessagesFilter()
137143
return common.FilterLogFromScanner(scanner, messagesToSearch, true, func(lines []string) []string {

0 commit comments

Comments
 (0)