Skip to content

fix: Adding a defer func to connecttoTelemetryservice() to prevent CNI fro… #1800

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

Merged
merged 3 commits into from
Feb 11, 2023
Merged

fix: Adding a defer func to connecttoTelemetryservice() to prevent CNI fro… #1800

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c542b85
Adding a defer func to connecttoTelemetryservice() to prevent CNI fro…
behzad-mir Feb 10, 2023
795b0d5
fix: addressing the comments for telemetry defer function.
behzad-mir Feb 10, 2023
606431f
fix: addressing the comments for telemetry defer func.
behzad-mir Feb 10, 2023
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
48 changes: 25 additions & 23 deletions telemetry/telemetrybuffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/Azure/azure-container-networking/common"
"github.com/Azure/azure-container-networking/log"
"github.com/Azure/azure-container-networking/platform"
"github.com/pkg/errors"
)

// TelemetryConfig - telemetry config read by telemetry service
Expand Down Expand Up @@ -328,34 +327,37 @@ func (tb *TelemetryBuffer) ConnectCNIToTelemetryService(telemetryNumRetries, tel
path, dir := getTelemetryServiceDirectory()
args := []string{"-d", dir}
for attempt := 0; attempt < 2; attempt++ {
if err := tb.Connect(); err != nil {
log.Logf("Connection to telemetry socket failed: %v", err)
if runtime.GOOS == "windows" {
if err = netPlugin.LockKeyValueStore(); err != nil {
log.Logf("lock acquire error: %v", err)
return errors.Wrap(err, "lock acquire error")
}
}
if err = tb.Cleanup(FdName); err != nil {
return errors.Wrap(err, "cleanup failed")
}
if err = StartTelemetryService(path, args); err != nil {
return errors.Wrap(err, "StartTelemetryService failed")
tb.startAndConnectTelemetryService(telemetryNumRetries, telemetryWaitTimeInMilliseconds, netPlugin, path, args)
}
return nil
}

// This function is getting called from ConnectCNIToTelemetryService() in each attempt inside for loop
// This function has been created to be able to add defer within the for loop
func (tb *TelemetryBuffer) startAndConnectTelemetryService(telemetryNumRetries, telemetryWaitTimeInMilliseconds int, netPlugin *cni.Plugin, path string, args []string) {
if err := tb.Connect(); err != nil {
log.Logf("Connection to telemetry socket failed: %v", err)
if runtime.GOOS == "windows" {
Copy link
Member

@tamilmani1989 tamilmani1989 Feb 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also place defer under this if..so no need to check if windows in 2 places

Copy link
Contributor Author

@behzad-mir behzad-mir Feb 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in the new commit

if err = netPlugin.LockKeyValueStore(); err != nil {
log.Logf("lock acquire error: %v", err)
}
WaitForTelemetrySocket(telemetryNumRetries, time.Duration(telemetryWaitTimeInMilliseconds))
if runtime.GOOS == "windows" {
defer func() {
if err = netPlugin.UnLockKeyValueStore(); err != nil {
log.Logf("failed to relinquish lock error: %v", err)
return errors.Wrap(err, "failed to relinquish lock error")
}
}
} else {
tb.Connected = true
log.Logf("Connected to telemetry service")
return nil
}()
}
if err = tb.Cleanup(FdName); err != nil {
log.Logf("cleanup failed: %v", err)
}
if err = StartTelemetryService(path, args); err != nil {
log.Logf("StartTelemetryService failed: %v", err)
}
WaitForTelemetrySocket(telemetryNumRetries, time.Duration(telemetryWaitTimeInMilliseconds))
} else {
tb.Connected = true
log.Logf("Connected to telemetry service")
}
return nil
}

func getTelemetryServiceDirectory() (path string, dir string) {
Expand Down