minor changes

Author: CMGS

config/cni.go

@@ -6,7 +6,12 @@ import (
 	"github.com/projecteru2/cocoon/utils"
 )
 
-const NetnsPath = "/var/run/netns"
+const (
+	NetnsPath = "/var/run/netns"
+	// NetnsPrefix prevents GC from deleting netns created by other tools
+	// (docker, containerd, etc.). Only netns matching this prefix are managed.
+	NetnsPrefix = "cocoon-"
+)
 
 // EnsureCNIDirs creates all static directories required by the CNI network provider.
 func (c *Config) EnsureCNIDirs() error {
@@ -26,6 +31,12 @@ func (c *Config) CNIIndexLock() string { return filepath.Join(c.cniDBDir(), "net
 func (c *Config) CNICacheDir() string { return filepath.Join(c.cniDir(), "cache") }
 
 // CNINetnsPath returns the named netns path for a VM.
+// Uses NetnsPrefix to namespace cocoon netns away from other tools.
 func (c *Config) CNINetnsPath(vmID string) string {
-	return filepath.Join(NetnsPath, vmID)
+	return filepath.Join(NetnsPath, NetnsPrefix+vmID)
+}
+
+// CNINetnsName returns the named netns name (without path) for a VM.
+func (c *Config) CNINetnsName(vmID string) string {
+	return NetnsPrefix + vmID
 }

gc/orchestrator.go

@@ -44,8 +44,13 @@ func (o *Orchestrator) Run(ctx context.Context) error {
 	var skipped []string
 	for _, m := range o.modules {
 		ok, err := m.getLocker().TryLock(ctx)
-		if err != nil || !ok {
-			logger.Warnf(ctx, "skip %s: lock busy", m.getName())
+		if err != nil {
+			logger.Warnf(ctx, "skip %s: TryLock error: %v", m.getName(), err)
+			skipped = append(skipped, m.getName())
+			continue
+		}
+		if !ok {
+			logger.Warnf(ctx, "skip %s: lock held by another operation", m.getName())
 			skipped = append(skipped, m.getName())
 			continue
 		}

hypervisor/cloudhypervisor/create.go

@@ -25,7 +25,10 @@ const CowSerial = "cocoon-cow"
 // the DB), we write a placeholder record first, then create directories and
 // prepare disks, and finally update the record to Created state.
 func (ch *CloudHypervisor) Create(ctx context.Context, vmCfg *types.VMConfig, storageConfigs []*types.StorageConfig, networkConfigs []*types.NetworkConfig, bootCfg *types.BootConfig) (*types.VM, error) {
-	id := hypervisor.GenerateID()
+	id, err := hypervisor.GenerateID()
+	if err != nil {
+		return nil, fmt.Errorf("generate VM ID: %w", err)
+	}
 	now := time.Now()
 
 	blobIDs := extractBlobIDs(storageConfigs, bootCfg)
@@ -60,7 +63,6 @@ func (ch *CloudHypervisor) Create(ctx context.Context, vmCfg *types.VMConfig, st
 	var (
 		preparedStorage []*types.StorageConfig
 		bootCopy        *types.BootConfig
-		err             error
 	)
 	if bootCfg != nil {
 		b := *bootCfg
@@ -136,6 +138,8 @@ func (ch *CloudHypervisor) prepareOCI(ctx context.Context, vmID string, vmCfg *t
 
 	// Append static IP configuration for each network interface.
 	// Format: ip=<client-IP>:<server>:<gw-IP>:<netmask>:<hostname>:<device>:<autoconf>
+	// The index i matches the CH --net ordering, which maps 1:1 to guest eth{i}.
+	// NICs with Network==nil (DHCP) still occupy their slot but get no ip= param.
 	if len(networkConfigs) > 0 {
 		cmdline.WriteString(" net.ifnames=0")
 		for i, n := range networkConfigs {
@@ -184,6 +188,7 @@ func (ch *CloudHypervisor) prepareCloudimg(ctx context.Context, vmID string, vmC
 		Hostname:     vmCfg.Name,
 		RootPassword: ch.conf.DefaultRootPassword,
 	}
+	// Index i matches CH --net order → guest eth{i}. See prepareOCI comment.
 	for i, n := range networkConfigs {
 		if n.Network != nil {
 			ones, _ := n.Network.Netmask.Size()

hypervisor/cloudhypervisor/gc.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/projecteru2/cocoon/config"
@@ -61,11 +62,13 @@ func (ch *CloudHypervisor) GCModule() gc.Module[chSnapshot] {
 			if snap.logDirs, err = utils.ScanSubdirs(ch.conf.CHLogDir()); err != nil {
 				return snap, err
 			}
-			// Scan named netns: entries in /var/run/netns/ that match VM IDs.
-			// These are bind-mount files (not dirs), so use ScanEntries.
+			// Scan named netns with the cocoon- prefix only.
+			// Other tools (docker, containerd) may have their own entries.
 			if entries, readErr := os.ReadDir(config.NetnsPath); readErr == nil {
 				for _, e := range entries {
-					snap.netnsNames = append(snap.netnsNames, e.Name())
+					if name, ok := strings.CutPrefix(e.Name(), config.NetnsPrefix); ok {
+						snap.netnsNames = append(snap.netnsNames, name)
+					}
 				}
 			}
 			return snap, nil

hypervisor/db.go

@@ -36,12 +36,12 @@ func (idx *VMIndex) Init() {
 }
 
 // GenerateID returns a random 16-character hex string (8 bytes of entropy).
-func GenerateID() string {
+func GenerateID() (string, error) {
 	var b [8]byte
 	if _, err := rand.Read(b[:]); err != nil {
-		panic("crypto/rand failed: " + err.Error())
+		return "", err
 	}
-	return hex.EncodeToString(b[:])
+	return hex.EncodeToString(b[:]), nil
 }
 
 // ResolveVMRef resolves a ref (exact ID, name, or ID prefix ≥3 chars) to a full VM ID.

network/cni/config.go

@@ -2,10 +2,15 @@ package cni
 
 import (
 	"context"
+	"fmt"
 
+	"github.com/projecteru2/cocoon/network"
 	"github.com/projecteru2/cocoon/types"
 )
 
 func (c *CNI) Config(_ context.Context, _ []*types.VMConfig) ([][]*types.NetworkConfig, error) {
+	if c.networkConfList == nil || c.cniConf == nil {
+		return nil, fmt.Errorf("%w: no conflist found in %s", network.ErrNotConfigured, c.conf.CNIConfDir)
+	}
 	panic("not implemented")
 }

network/network.go

@@ -2,10 +2,16 @@ package network
 
 import (
 	"context"
+	"errors"
 
 	"github.com/projecteru2/cocoon/types"
 )
 
+var (
+	ErrNotFound      = errors.New("network not found")
+	ErrNotConfigured = errors.New("network provider not configured")
+)
+
 type Network interface {
 	Type() string