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

Adding a check if the container is still being monitord before readin… #306

Merged
merged 4 commits into from
Jun 5, 2024
Merged

Adding a check if the container is still being monitord before readin… #306

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eb0aae
Adding a check if the container is still being monitord before readin…
amitschendel Jun 5, 2024
3db3807
Adding context instead of if statement
amitschendel Jun 5, 2024
b1d3557
Using channel to close traceloop perf buffer reading
amitschendel Jun 5, 2024
b65c43a
Rename variable
amitschendel Jun 5, 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
33 changes: 22 additions & 11 deletions pkg/containerwatcher/v1/container_watcher_private.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ func (ch *IGContainerWatcher) containerCallback(notif containercollection.PubSub
ch.timeBasedContainers.Add(notif.Container.Runtime.ContainerID)
}

traceloopCancelChannel := make(chan struct{})

switch notif.Type {
case containercollection.EventTypeAddContainer:
logger.L().Info("start monitor on container", helpers.String("container ID", notif.Container.Runtime.ContainerID), helpers.String("k8s workload", k8sContainerID))
Expand All @@ -41,21 +43,29 @@ func (ch *IGContainerWatcher) containerCallback(notif containercollection.PubSub
logger.L().Fatal("attaching container to syscall tracer", helpers.String("container ID", notif.Container.Runtime.ContainerID), helpers.String("k8s workload", k8sContainerID), helpers.Error(err))
}

// Read the syscall tracer events in a separate goroutine.
// Read the syscall tracer events in a separate goroutine until the container is removed (signaled from the traceloopCancelChannel).
go func() {
for {
evs, err := ch.syscallTracer.Read(notif.Container.Runtime.ContainerID)
if err != nil {
logger.L().Debug("syscalls perf buffer closed", helpers.String("error", err.Error()))
select {
case <-traceloopCancelChannel:
logger.L().Info("stop traceloop on container - container has terminated",
helpers.String("container ID", notif.Container.Runtime.ContainerID),
helpers.String("k8s workload", k8sContainerID))
return
default:
evs, err := ch.syscallTracer.Read(notif.Container.Runtime.ContainerID)
if err != nil {
logger.L().Debug("syscalls perf buffer closed", helpers.String("error", err.Error()))
return
}
for _, ev := range evs {
ev.SetContainerMetadata(notif.Container)
ch.syscallEventCallback(ev)
}

// Sleep for a while before reading the next batch of events.
time.Sleep(5 * time.Second) // TODO: make this configurable.
}
for _, ev := range evs {
ev.SetContainerMetadata(notif.Container)
ch.syscallEventCallback(ev)
}

// Sleep for a while before reading the next batch of events.
time.Sleep(2 * time.Second) // TODO: make this configurable.
}
}()
}
Expand All @@ -73,6 +83,7 @@ func (ch *IGContainerWatcher) containerCallback(notif containercollection.PubSub
logger.L().Info("stop monitor on container - container has terminated",
helpers.String("container ID", notif.Container.Runtime.ContainerID),
helpers.String("k8s workload", k8sContainerID))
close(traceloopCancelChannel)
ch.preRunningContainersIDs.Remove(notif.Container.Runtime.ContainerID)
ch.timeBasedContainers.Remove(notif.Container.Runtime.ContainerID)
ch.syscallTracer.Detach(notif.Container.Mntns)
Expand Down
Loading