1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
|
package logformat
import (
"strings"
"sync"
"testing"
"github.com/mimecast/dtail/internal/protocol"
)
func TestCSVLogFormat(t *testing.T) {
parser, err := NewParser("csv", nil)
if err != nil {
t.Errorf("Unable to create parser: %s", err.Error())
}
headers := []string{"name", "last_name", "color", "profession", "employee_number"}
dataLine1 := []string{"Paul", "Buetow", "Orange", "Site Reliability Engineer", "4242"}
dataLine2 := []string{"Peter", "Bauer", "Black", "CEO", "1"}
inputs := []string{
strings.Join(headers, protocol.CSVDelimiter),
strings.Join(dataLine1, protocol.CSVDelimiter),
strings.Join(dataLine2, protocol.CSVDelimiter),
}
const sourceID = "file-a"
// First line is the header!
if _, err := parser.MakeFields(inputs[0], sourceID); err != ErrIgnoreFields {
t.Errorf("Unable to parse the CSV header")
}
// First data line
fields, err := parser.MakeFields(inputs[1], sourceID)
if err != nil {
t.Errorf("Unable to parse first CSV data line: %s", err.Error())
}
if val := fields["name"]; val != "Paul" {
t.Errorf("Expected 'name' to be 'Paul' but got '%s'", val)
}
if val := fields["employee_number"]; val != "4242" {
t.Errorf("Expected 'employee_number' to be '4242' but got '%s'", val)
}
// Second data line
fields, err = parser.MakeFields(inputs[2], sourceID)
if err != nil {
t.Errorf("Unable to parse first CSV data line: %s", err.Error())
}
if val := fields["last_name"]; val != "Bauer" {
t.Errorf("Expected 'last_name' to be 'Bauer' but got '%s'", val)
}
if val := fields["color"]; val != "Black" {
t.Errorf("Expected 'color' to be 'Black' but got '%s'", val)
}
}
// TestCSVLogFormatMultiFileHeaders reproduces the bug where a single
// csvParser instance (as used by the Aggregate for every file
// in a mapreduce session) was treating the header row of every file after
// the first as a data row, silently corrupting aggregates.
func TestCSVLogFormatMultiFileHeaders(t *testing.T) {
parser, err := NewParser("csv", nil)
if err != nil {
t.Fatalf("Unable to create parser: %s", err.Error())
}
headersA := []string{"name", "value"}
headersB := []string{"color", "count"}
fileA := []string{
strings.Join(headersA, protocol.CSVDelimiter),
strings.Join([]string{"alpha", "1"}, protocol.CSVDelimiter),
strings.Join([]string{"beta", "2"}, protocol.CSVDelimiter),
}
fileB := []string{
strings.Join(headersB, protocol.CSVDelimiter),
strings.Join([]string{"orange", "3"}, protocol.CSVDelimiter),
strings.Join([]string{"black", "4"}, protocol.CSVDelimiter),
}
const sourceA = "file-a"
const sourceB = "file-b"
// First line of file A is its header.
if _, err := parser.MakeFields(fileA[0], sourceA); err != ErrIgnoreFields {
t.Fatalf("Expected header line of file A to be ignored, got err=%v", err)
}
for _, line := range fileA[1:] {
fields, err := parser.MakeFields(line, sourceA)
if err != nil {
t.Fatalf("Unable to parse data line %q of file A: %s", line, err.Error())
}
if _, ok := fields["name"]; !ok {
t.Errorf("Expected file A field 'name' for line %q, got %v", line, fields)
}
}
// First line of file B MUST also be treated as a header, not a data row.
if _, err := parser.MakeFields(fileB[0], sourceB); err != ErrIgnoreFields {
t.Fatalf("Expected header line of file B to be ignored (bug: header is being consumed as a data row), got err=%v", err)
}
// Data lines of file B must be mapped against file B's headers, not
// file A's.
for _, line := range fileB[1:] {
fields, err := parser.MakeFields(line, sourceB)
if err != nil {
t.Fatalf("Unable to parse data line %q of file B: %s", line, err.Error())
}
if _, ok := fields["color"]; !ok {
t.Errorf("Expected file B field 'color' for line %q, got %v", line, fields)
}
if _, ok := fields["name"]; ok {
t.Errorf("File B line %q should not carry file A field 'name'; got %v",
line, fields)
}
}
}
// TestCSVLogFormatConcurrentSameSourceInstall reproduces a TOCTOU bug in
// csvParser.MakeFields: the original code first called headerFor under
// RLock, and only if the header was missing did it call parseHeader under
// Lock. Two goroutines racing on the same sourceID could both observe
// "missing" and both return ErrIgnoreFields, silently dropping the loser's
// data row (the installer wrote the header; the non-installer still
// signalled "this line was a header" to the caller).
//
// With the fix, the check-and-install is a single critical section and
// exactly one of the two concurrent calls reports ErrIgnoreFields; the
// other maps its line against the installed header.
func TestCSVLogFormatConcurrentSameSourceInstall(t *testing.T) {
header := strings.Join([]string{"name", "value"}, protocol.CSVDelimiter)
data := strings.Join([]string{"alpha", "1"}, protocol.CSVDelimiter)
const attempts = 500
const sourceID = "file-race"
for attempt := 0; attempt < attempts; attempt++ {
parser, err := NewParser("csv", nil)
if err != nil {
t.Fatalf("attempt %d: unable to create parser: %s", attempt, err.Error())
}
lines := [2]string{header, data}
var results [2]struct {
fields map[string]string
err error
}
start := make(chan struct{})
var wg sync.WaitGroup
wg.Add(2)
for i := 0; i < 2; i++ {
i := i
go func() {
defer wg.Done()
<-start
results[i].fields, results[i].err = parser.MakeFields(lines[i], sourceID)
}()
}
close(start)
wg.Wait()
ignored := 0
for _, r := range results {
if r.err == ErrIgnoreFields {
ignored++
}
}
if ignored != 1 {
t.Fatalf("attempt %d: expected exactly one ErrIgnoreFields across two racing calls on the same sourceID, got %d; results=%+v",
attempt, ignored, results)
}
}
}
// TestCSVLogFormatConcurrentSources ensures the per-source header store is
// safe for concurrent access across multiple sourceIDs, matching how the
// aggregator drives the parser from batched lines across files.
func TestCSVLogFormatConcurrentSources(t *testing.T) {
parser, err := NewParser("csv", nil)
if err != nil {
t.Fatalf("Unable to create parser: %s", err.Error())
}
header := strings.Join([]string{"name", "value"}, protocol.CSVDelimiter)
data := strings.Join([]string{"alpha", "1"}, protocol.CSVDelimiter)
const workers = 16
const iterations = 64
var wg sync.WaitGroup
wg.Add(workers)
for w := 0; w < workers; w++ {
go func(id int) {
defer wg.Done()
sourceID := "source-" + string(rune('a'+id))
if _, err := parser.MakeFields(header, sourceID); err != ErrIgnoreFields {
t.Errorf("worker %d: expected header to be ignored, got err=%v", id, err)
return
}
for i := 0; i < iterations; i++ {
fields, err := parser.MakeFields(data, sourceID)
if err != nil {
t.Errorf("worker %d: parse err=%v", id, err)
return
}
if fields["name"] != "alpha" {
t.Errorf("worker %d: expected name=alpha, got %q", id, fields["name"])
return
}
}
}(w)
}
wg.Wait()
}
|
