container/(docker|podman): align code

Align the code between the implementations for easier comparison;
mostly renaming some vars, changing order, and syncing comments.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

container/docker/handler.go

@@ -81,10 +81,10 @@ type containerHandler struct {
 	// The IP address of the container
 	ipAddress string
 
-	includedMetrics container.MetricSet
+	metrics container.MetricSet
 
 	// the devicemapper poolname
-	poolName string
+	thinPoolName string
 
 	// zfsParent is the parent for docker zfs
 	zfsParent string
@@ -127,7 +127,7 @@ func newContainerHandler(
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	dockerVersion []int,
-	includedMetrics container.MetricSet,
+	metrics container.MetricSet,
 	thinPoolName string,
 	thinPoolWatcher *devicemapper.ThinPoolWatcher,
 	zfsWatcher *zfs.ZfsWatcher,
@@ -187,19 +187,18 @@ func newContainerHandler(
 	}
 
 	// Do not report network metrics for containers that share netns with another container.
-	metrics := common.RemoveNetMetrics(includedMetrics, ctnr.HostConfig.NetworkMode.IsContainer())
+	includedMetrics := common.RemoveNetMetrics(metrics, ctnr.HostConfig.NetworkMode.IsContainer())
 
-	// TODO: extract object mother method
 	handler := &containerHandler{
 		machineInfoFactory: machineInfoFactory,
 		cgroupPaths:        cgroupPaths,
-		fsInfo:             fsInfo,
 		storageDriver:      storageDriver,
-		poolName:           thinPoolName,
+		fsInfo:             fsInfo,
 		rootfsStorageDir:   rootfsStorageDir,
 		envs:               make(map[string]string),
 		labels:             ctnr.Config.Labels,
-		includedMetrics:    metrics,
+		metrics:            includedMetrics,
+		thinPoolName:       thinPoolName,
 		zfsParent:          zfsParent,
 	}
 	// Health status may be nil if no health check is configured
@@ -209,7 +208,6 @@ func newContainerHandler(
 	// Timestamp returned by Docker is in time.RFC3339Nano format.
 	handler.creationTime, err = time.Parse(time.RFC3339Nano, ctnr.Created)
 	if err != nil {
-		// This should not happen, report the error just in case
 		return nil, fmt.Errorf("failed to parse the create timestamp %q for container %q: %v", ctnr.Created, id, err)
 	}
 	handler.libcontainerHandler = containerlibcontainer.NewHandler(cgroupManager, rootFs, ctnr.State.Pid, metrics)
@@ -222,7 +220,7 @@ func newContainerHandler(
 		Namespace: DockerNamespace,
 	}
 	handler.image = ctnr.Config.Image
-	// Only adds restartcount label if it's greater than 0
+
 	if ctnr.RestartCount > 0 {
 		handler.labels["restartcount"] = strconv.Itoa(ctnr.RestartCount)
 	}
@@ -236,11 +234,10 @@ func newContainerHandler(
 		containerID := strings.TrimPrefix(networkMode, "container:")
 		c, err := client.ContainerInspect(context.Background(), containerID)
 		if err != nil {
-			return nil, fmt.Errorf("failed to inspect container %q: %v", id, err)
+			return nil, fmt.Errorf("failed to inspect container %q: %v", containerID, err)
 		}
 		ipAddress = c.NetworkSettings.IPAddress
 	}
-
 	handler.ipAddress = ipAddress
 
 	if includedMetrics.Has(container.DiskUsageMetrics) {
@@ -253,7 +250,7 @@ func newContainerHandler(
 		}
 	}
 
-	// split env vars to get metadata map.
+	// Split env vars to get metadata map.
 	for _, exposedEnv := range metadataEnvAllowList {
 		if exposedEnv == "" {
 			// if no dockerEnvWhitelist provided, len(metadataEnvAllowList) == 1, metadataEnvAllowList[0] == ""
@@ -296,25 +293,13 @@ func DetermineDeviceStorage(storageDriver StorageDriver, storageDir string, rwLa
 	return
 }
 
-func (h *containerHandler) Start() {
-	if h.fsHandler != nil {
-		h.fsHandler.Start()
-	}
-}
-
-func (h *containerHandler) Cleanup() {
-	if h.fsHandler != nil {
-		h.fsHandler.Stop()
-	}
-}
-
 func (h *containerHandler) ContainerReference() (info.ContainerReference, error) {
 	return h.reference, nil
 }
 
 func (h *containerHandler) GetSpec() (info.ContainerSpec, error) {
-	hasFilesystem := h.includedMetrics.Has(container.DiskUsageMetrics)
-	hasNetwork := h.includedMetrics.Has(container.NetworkUsageMetrics)
+	hasFilesystem := h.metrics.Has(container.DiskUsageMetrics)
+	hasNetwork := h.metrics.Has(container.NetworkUsageMetrics)
 	spec, err := common.GetSpec(h.cgroupPaths, h.machineInfoFactory, hasNetwork, hasFilesystem)
 	if err != nil {
 		return info.ContainerSpec{}, err
@@ -337,20 +322,23 @@ func (h *containerHandler) GetStats() (*info.ContainerStats, error) {
 	stats.Health.Status = h.healthStatus
 
 	// Get filesystem stats.
-	err = FsStats(stats, h.machineInfoFactory, h.includedMetrics, h.storageDriver,
-		h.fsHandler, h.fsInfo, h.poolName, h.rootfsStorageDir, h.zfsParent)
+	err = FsStats(stats, h.machineInfoFactory, h.metrics, h.storageDriver,
+		h.fsHandler, h.fsInfo, h.thinPoolName, h.rootfsStorageDir, h.zfsParent)
 	if err != nil {
 		return stats, err
 	}
 
 	return stats, nil
 }
 
-func (h *containerHandler) ListContainers(listType container.ListType) ([]info.ContainerReference, error) {
-	// No-op for Docker driver.
+func (h *containerHandler) ListContainers(container.ListType) ([]info.ContainerReference, error) {
 	return []info.ContainerReference{}, nil
 }
 
+func (h *containerHandler) ListProcesses(container.ListType) ([]int, error) {
+	return h.libcontainerHandler.GetProcesses()
+}
+
 func (h *containerHandler) GetCgroupPath(resource string) (string, error) {
 	var res string
 	if !cgroups.IsCgroup2UnifiedMode() {
@@ -371,14 +359,22 @@ func (h *containerHandler) GetContainerIPAddress() string {
 	return h.ipAddress
 }
 
-func (h *containerHandler) ListProcesses(listType container.ListType) ([]int, error) {
-	return h.libcontainerHandler.GetProcesses()
-}
-
 func (h *containerHandler) Exists() bool {
 	return common.CgroupExists(h.cgroupPaths)
 }
 
+func (h *containerHandler) Cleanup() {
+	if h.fsHandler != nil {
+		h.fsHandler.Stop()
+	}
+}
+
+func (h *containerHandler) Start() {
+	if h.fsHandler != nil {
+		h.fsHandler.Start()
+	}
+}
+
 func (h *containerHandler) Type() container.ContainerType {
 	return container.ContainerTypeDocker
 }

container/podman/handler.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"path"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -43,30 +44,38 @@ type containerHandler struct {
 	// (e.g.: "cpu" -> "/sys/fs/cgroup/cpu/test")
 	cgroupPaths map[string]string
 
+	// the docker storage driver
 	storageDriver    docker.StorageDriver
 	fsInfo           fs.FsInfo
 	rootfsStorageDir string
 
+	// Time at which this container was created.
 	creationTime time.Time
 
 	// Metadata associated with the container.
 	envs   map[string]string
 	labels map[string]string
 
+	// Image name used for this container.
 	image string
 
 	networkMode dockercontainer.NetworkMode
 
+	// Filesystem handler.
 	fsHandler common.FsHandler
 
+	// The IP address of the container
 	ipAddress string
 
 	metrics container.MetricSet
 
+	// the devicemapper poolname
 	thinPoolName string
 
+	// zfsParent is the parent for docker zfs
 	zfsParent string
 
+	// Reference to the container
 	reference info.ContainerReference
 
 	libcontainerHandler *containerlibcontainer.Handler
@@ -89,6 +98,7 @@ func newContainerHandler(
 	// Create the cgroup paths.
 	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems, name)
 
+	// Generate the equivalent cgroup manager for this container.
 	cgroupManager, err := containerlibcontainer.NewCgroupManager(name, cgroupPaths)
 	if err != nil {
 		return nil, err
@@ -118,6 +128,8 @@ func newContainerHandler(
 		return nil, err
 	}
 
+	// Determine the rootfs storage dir OR the pool name to determine the device.
+	// For devicemapper, we only need the thin pool name, and that is passed in to this call
 	rootfsStorageDir, zfsParent, zfsFilesystem, err := determineDeviceStorage(storageDriver, storageDir, rwLayerID)
 	if err != nil {
 		return nil, err
@@ -131,7 +143,6 @@ func newContainerHandler(
 		storageDriver:      storageDriver,
 		fsInfo:             fsInfo,
 		rootfsStorageDir:   rootfsStorageDir,
-		ipAddress:          ctnr.NetworkSettings.IPAddress,
 		envs:               make(map[string]string),
 		labels:             ctnr.Config.Labels,
 		image:              ctnr.Config.Image,
@@ -155,21 +166,23 @@ func newContainerHandler(
 	}
 
 	if ctnr.RestartCount > 0 {
-		handler.labels["restartcount"] = fmt.Sprint(ctnr.RestartCount)
+		handler.labels["restartcount"] = strconv.Itoa(ctnr.RestartCount)
 	}
 
 	// Obtain the IP address for the container.
 	// If the NetworkMode starts with 'container:' then we need to use the IP address of the container specified.
 	// This happens in cases such as kubernetes where the containers doesn't have an IP address itself and we need to use the pod's address
-	networkMode := string(handler.networkMode)
-	if handler.ipAddress == "" && strings.HasPrefix(networkMode, "container:") {
+	ipAddress := ctnr.NetworkSettings.IPAddress
+	networkMode := string(ctnr.HostConfig.NetworkMode)
+	if ipAddress == "" && strings.HasPrefix(networkMode, "container:") {
 		containerID := strings.TrimPrefix(networkMode, "container:")
 		c, err := InspectContainer(containerID)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to inspect container %q: %v", containerID, err)
 		}
-		handler.ipAddress = c.NetworkSettings.IPAddress
+		ipAddress = c.NetworkSettings.IPAddress
 	}
+	handler.ipAddress = ipAddress
 
 	if metrics.Has(container.DiskUsageMetrics) {
 		handler.fsHandler = &docker.FsHandler{
@@ -250,6 +263,7 @@ func (h *containerHandler) GetStats() (*info.ContainerStats, error) {
 		stats.Network = info.NetworkStats{}
 	}
 
+	// Get filesystem stats.
 	err = docker.FsStats(stats, h.machineInfoFactory, h.metrics, h.storageDriver,
 		h.fsHandler, h.fsInfo, h.thinPoolName, h.rootfsStorageDir, h.zfsParent)
 	if err != nil {
@@ -259,11 +273,11 @@ func (h *containerHandler) GetStats() (*info.ContainerStats, error) {
 	return stats, nil
 }
 
-func (h *containerHandler) ListContainers(listType container.ListType) ([]info.ContainerReference, error) {
+func (h *containerHandler) ListContainers(container.ListType) ([]info.ContainerReference, error) {
 	return []info.ContainerReference{}, nil
 }
 
-func (h *containerHandler) ListProcesses(listType container.ListType) ([]int, error) {
+func (h *containerHandler) ListProcesses(container.ListType) ([]int, error) {
 	return h.libcontainerHandler.GetProcesses()
 }
 
@@ -274,7 +288,7 @@ func (h *containerHandler) GetCgroupPath(resource string) (string, error) {
 	}
 	cgroupPath, ok := h.cgroupPaths[res]
 	if !ok {
-		return "", fmt.Errorf("couldn't find path for resource %q for container %q", resource, h.reference.Name)
+		return "", fmt.Errorf("could not find path for resource %q for container %q", resource, h.reference.Name)
 	}
 
 	return cgroupPath, nil