kola: iso.*: don't leak http server

Author: nikita-dubrovskii

mantle/kola/tests/iso/live-iso.go

@@ -1,8 +1,10 @@
 package iso
 
 import (
+	"context"
 	_ "embed"
 	"fmt"
+	"log"
 	"net"
 	"net/http"
 	"os"
@@ -203,17 +205,6 @@ func isoLiveInstall(c cluster.TestCluster, opts IsoTestOpts) {
 		c.Fatal("Cannot use `--add-nm-keyfile` with offline mode")
 	}
 
-	qc, ok := c.Cluster.(*qemu.Cluster)
-	if !ok {
-		c.Fatalf("Unsupported cluster type")
-	}
-	if opts.enable4k {
-		qc.EnforceNative4k()
-	}
-	if opts.enableMultipath {
-		qc.EnforceMultipath()
-	}
-
 	tempdir, err := os.MkdirTemp("/var/tmp", "iso")
 	if err != nil {
 		c.Fatal(err)
@@ -222,12 +213,22 @@ func isoLiveInstall(c cluster.TestCluster, opts IsoTestOpts) {
 		os.RemoveAll(tempdir)
 	}()
 
-	if err := isoRunTest(qc, opts, tempdir); err != nil {
+	if err := isoRunTest(c, opts, tempdir); err != nil {
 		c.Fatal(err)
 	}
 }
 
-func isoRunTest(qc *qemu.Cluster, opts IsoTestOpts, tempdir string) error {
+func isoRunTest(c cluster.TestCluster, opts IsoTestOpts, tempdir string) error {
+	qc, ok := c.Cluster.(*qemu.Cluster)
+	if !ok {
+		return errors.Errorf("Unsupported cluster type")
+	}
+	if opts.enable4k {
+		qc.EnforceNative4k()
+	}
+	if opts.enableMultipath {
+		qc.EnforceMultipath()
+	}
 	keys, err := qc.Keys()
 	if err != nil {
 		return err
@@ -320,11 +321,21 @@ func isoRunTest(qc *qemu.Cluster, opts IsoTestOpts, tempdir string) error {
 		targetConfig.AddConfigSource(baseurl + "/target.ign")
 		serializedTargetConfig = targetConfig.String()
 
-		//nolint // Yeah this leaks
+		ctx := c.Context()
+		mux := http.NewServeMux()
+		mux.Handle("/", http.FileServer(http.Dir(tempdir)))
+		srv := &http.Server{Handler: mux}
+
+		go func() {
+			if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
+				log.Printf("http serve: %v", err)
+			}
+		}()
+
+		// stop server when ctx is canceled
 		go func() {
-			mux := http.NewServeMux()
-			mux.Handle("/", http.FileServer(http.Dir(tempdir)))
-			http.Serve(listener, mux)
+			<-ctx.Done()
+			_ = srv.Shutdown(context.Background())
 		}()
 	}
 

mantle/kola/tests/iso/live-pxe.go

@@ -1,7 +1,9 @@
 package iso
 
 import (
+	"context"
 	"fmt"
+	"log"
 	"net"
 	"net/http"
 	"os"
@@ -203,7 +205,7 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {
 		os.RemoveAll(tempdir)
 	}()
 
-	pxe, err := createPXE(tempdir, opts)
+	pxe, err := createPXE(c.Context(), tempdir, opts)
 	if err != nil {
 		c.Fatal(errors.Wrapf(err, "setting up install"))
 	}
@@ -326,7 +328,7 @@ type PXE struct {
 	bootfile      string
 }
 
-func createPXE(tempdir string, opts IsoTestOpts) (*PXE, error) {
+func createPXE(ctx context.Context, tempdir string, opts IsoTestOpts) (*PXE, error) {
 	kernel := kola.CosaBuild.Meta.BuildArtifacts.LiveKernel.Path
 	initramfs := kola.CosaBuild.Meta.BuildArtifacts.LiveInitramfs.Path
 	rootfs := kola.CosaBuild.Meta.BuildArtifacts.LiveRootfs.Path
@@ -403,11 +405,20 @@ func createPXE(tempdir string, opts IsoTestOpts) (*PXE, error) {
 		return nil, errors.Errorf("Unhandled boottype %s", pxe.boottype)
 	}
 
-	//nolint // Yeah this leaks
+	mux := http.NewServeMux()
+	mux.Handle("/", http.FileServer(http.Dir(tftpdir)))
+	srv := &http.Server{Handler: mux}
+
+	go func() {
+		if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			log.Printf("http serve: %v", err)
+		}
+	}()
+
+	// stop server when ctx is canceled
 	go func() {
-		mux := http.NewServeMux()
-		mux.Handle("/", http.FileServer(http.Dir(tftpdir)))
-		http.Serve(listener, mux)
+		<-ctx.Done()
+		_ = srv.Shutdown(context.Background())
 	}()
 
 	return pxe, nil