Cleanup

Author: ValentaTomas

packages/orchestrator/internal/sandbox/uffd/uffd.go

@@ -145,8 +145,6 @@ func (u *Uffd) handle(sandboxId string) error {
 		}
 	}()
 
-	fmt.Fprintf(os.Stderr, "uffd: serving: %d\n", len(m))
-
 	u.readyCh <- struct{}{}
 
 	err = uffd.Serve(
@@ -156,7 +154,6 @@ func (u *Uffd) handle(sandboxId string) error {
 		zap.L().With(logger.WithSandboxID(sandboxId)),
 	)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "serve error %v", err)
 		return fmt.Errorf("failed handling uffd: %w", err)
 	}
 

packages/orchestrator/internal/sandbox/uffd/userfaultfd/serve.go

@@ -14,7 +14,6 @@ E -- write (WP|WRITE flag) --> F(remove WP) --> C
 import (
 	"errors"
 	"fmt"
-	"os"
 	"syscall"
 	"unsafe"
 
@@ -33,15 +32,14 @@ func (u *userfaultfd) Serve(
 	fdExit *fdexit.FdExit,
 	logger *zap.Logger,
 ) error {
-	defer fmt.Fprintf(os.Stderr, "exiting serve >>>>>>>>>>>>")
 	pollFds := []unix.PollFd{
 		{Fd: int32(u.fd), Events: unix.POLLIN},
 		{Fd: int32(fdExit.Reader()), Events: unix.POLLIN},
 	}
 
 	var eg errgroup.Group
 
-	missingChunksBeingHandled := map[int64]struct{}{}
+	handledPages := map[int64]struct{}{}
 
 outerLoop:
 	for {
@@ -143,11 +141,11 @@ outerLoop:
 		// This prevents serving missing pages multiple times.
 		// For normal sized pages with swap on, the behavior seems not to be properly described in docs
 		// and it's not clear if the missing can be legitimately triggered multiple times.
-		if _, ok := missingChunksBeingHandled[offset]; ok {
+		if _, ok := handledPages[offset]; ok {
 			continue
 		}
 
-		missingChunksBeingHandled[offset] = struct{}{}
+		handledPages[offset] = struct{}{}
 
 		eg.Go(func() error {
 			defer func() {