Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: close connection on any return from azure-vnet-telemetry #2711

Merged
merged 5 commits into from
Apr 29, 2024
Merged

fix: close connection on any return from azure-vnet-telemetry #2711

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7599aa6
move error handling code to defer
QxBytes Apr 24, 2024
1f91d07
invert conditional
QxBytes Apr 26, 2024
43c16e1
address linter issues
QxBytes Apr 26, 2024
e8447f9
add close connection on telemetry unmarshal error unit test
QxBytes Apr 26, 2024
486483c
Revert "add close connection on telemetry unmarshal error unit test"
QxBytes Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 48 additions & 41 deletions telemetry/telemetrybuffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,55 +116,62 @@ func (tb *TelemetryBuffer) StartServer() error {
tb.connections = append(tb.connections, conn)
tb.mutex.Unlock()
go func() {
defer func() {
var index int
var value net.Conn
var found bool

tb.mutex.Lock()
defer tb.mutex.Unlock()

for index, value = range tb.connections {
if value == conn {
conn.Close()
found = true
break
}
}

if found {
tb.connections = remove(tb.connections, index)
}
}()

for {
reportStr, err := read(conn)
if err == nil {
var tmp map[string]interface{}
err = json.Unmarshal(reportStr, &tmp)
if err != nil {
return
}
var tmp map[string]interface{}
err = json.Unmarshal(reportStr, &tmp)
if err != nil {
if tb.logger != nil {
tb.logger.Error("StartServer: unmarshal error", zap.Error(err))
} else {
log.Logf("StartServer: unmarshal error:%v", err)
}
return
}
if _, ok := tmp["CniSucceeded"]; ok {
var cniReport CNIReport
err = json.Unmarshal([]byte(reportStr), &cniReport)
if err != nil {
if tb.logger != nil {
tb.logger.Error("StartServer: unmarshal error", zap.Error(err))
} else {
log.Logf("StartServer: unmarshal error:%v", err)
}
return
}
if _, ok := tmp["CniSucceeded"]; ok {
var cniReport CNIReport
json.Unmarshal([]byte(reportStr), &cniReport)
tb.data <- cniReport
} else if _, ok := tmp["Metric"]; ok {
var aiMetric AIMetric
json.Unmarshal([]byte(reportStr), &aiMetric)
tb.data <- aiMetric
} else {
if tb.logger != nil {
tb.logger.Info("StartServer: default", zap.Any("case", tmp))
} else {
log.Logf("StartServer: default case:%+v...", tmp)
}
tb.data <- cniReport
} else if _, ok := tmp["Metric"]; ok {
var aiMetric AIMetric
err = json.Unmarshal([]byte(reportStr), &aiMetric)
if err != nil {
return
}
tb.data <- aiMetric
} else {
var index int
var value net.Conn
var found bool

tb.mutex.Lock()
defer tb.mutex.Unlock()

for index, value = range tb.connections {
if value == conn {
conn.Close()
found = true
break
}
}

if found {
tb.connections = remove(tb.connections, index)
if tb.logger != nil {
tb.logger.Info("StartServer: default", zap.Any("case", tmp))
} else {
log.Logf("StartServer: default case:%+v...", tmp)
}

return
}
}
}()
Expand Down
Loading