Merge branch '296-port-range-availability' into 'master'

fix: revise port range availability after deleting invalid clone containers (#296)

Closes #296

See merge request postgres-ai/database-lab!344

Author: agneum

pkg/client/dblabapi/clone.go

@@ -136,7 +136,7 @@ func (c *Client) CreateClone(ctx context.Context, cloneRequest types.CloneCreate
 	}
 
 	if clone.Status.Code != models.StatusOK {
-		return nil, errors.Errorf("failed to create clone, unexpected status given: %v", clone.Status.Code)
+		return nil, errors.Errorf("failed to create clone, unexpected status given. %v: %s", clone.Status.Code, clone.Status.Message)
 	}
 
 	return clone, nil

pkg/services/cloning/base.go

@@ -96,7 +96,7 @@ func (c *Base) Run(ctx context.Context) error {
 	}
 
 	if err := c.RestoreClonesState(); err != nil {
-		return fmt.Errorf("failed to load sessions: %w", err)
+		log.Err("Failed to load stored sessions:", err)
 	}
 
 	c.filterRunningClones(ctx)
@@ -105,6 +105,10 @@ func (c *Base) Run(ctx context.Context) error {
 		return fmt.Errorf("failed to cleanup invalid clones: %w", err)
 	}
 
+	if err := c.provision.RevisePortPool(); err != nil {
+		return fmt.Errorf("failed to revise port pool: %w", err)
+	}
+
 	go c.runIdleCheck(ctx)
 
 	return nil

pkg/services/cloning/storage.go

@@ -77,6 +77,8 @@ func (c *Base) filterRunningClones(ctx context.Context) {
 		if !c.provision.IsCloneRunning(ctx, util.GetCloneName(wrapper.Session.Port)) {
 			delete(c.clones, cloneID)
 		}
+
+		c.incrementCloneNumber(wrapper.Clone.Snapshot.ID)
 	}
 }
 

pkg/services/provision/mode_local.go

@@ -84,6 +84,7 @@ func New(ctx context.Context, cfg *Config, dbCfg *resources.DB, docker *client.C
 		portChecker:  &localPortChecker{},
 		pm:           pm,
 		networkID:    networkID,
+		ports:        make([]bool, cfg.PortPool.To-cfg.PortPool.From),
 	}
 
 	return p, nil
@@ -114,8 +115,8 @@ func isValidConfigModeLocal(config Config) error {
 
 // Init inits provision.
 func (p *Provisioner) Init() error {
-	if err := p.initPortPool(); err != nil {
-		return errors.Wrap(err, "failed to init port pool")
+	if err := p.RevisePortPool(); err != nil {
+		return errors.Wrap(err, "failed to revise port pool")
 	}
 
 	imageExists, err := docker.ImageExists(p.runner, p.config.DockerImage)
@@ -408,20 +409,21 @@ func (p *Provisioner) getSnapshot(snapshotID string) (*resources.Snapshot, error
 	return &snapshots[0], nil
 }
 
-func (p *Provisioner) initPortPool() error {
-	portOpts := p.config.PortPool
-	size := portOpts.To - portOpts.From
-	p.ports = make([]bool, size)
-
-	log.Msg(fmt.Sprintf("checking availability of the port range [%d - %d]", portOpts.From, portOpts.To))
+// RevisePortPool checks and aligns availability of the port range.
+func (p *Provisioner) RevisePortPool() error {
+	log.Msg(fmt.Sprintf("Revising availability of the port range [%d - %d]", p.config.PortPool.From, p.config.PortPool.To))
 
 	host, err := externalIP()
 	if err != nil {
 		return err
 	}
 
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
 	availablePorts := 0
-	for port := portOpts.From; port < portOpts.To; port++ {
+
+	for port := p.config.PortPool.From; port < p.config.PortPool.To; port++ {
 		if err := p.portChecker.checkPortAvailability(host, port); err != nil {
 			log.Msg(fmt.Sprintf("port %d is not available, marking as busy", port))
 
@@ -431,11 +433,12 @@ func (p *Provisioner) initPortPool() error {
 
 			continue
 		}
-		availablePorts++
-	}
 
-	if availablePorts == 0 {
-		return NewNoRoomError("no available ports")
+		if err := p.setPortStatus(port, false); err != nil {
+			log.Err(fmt.Sprintf("cannot free port %d: %s", port, err))
+		}
+
+		availablePorts++
 	}
 
 	log.Msg(availablePorts, " ports are available")

pkg/services/provision/mode_local_test.go

@@ -1,38 +1,30 @@
 package provision
 
 import (
-	"sync"
+	"context"
 	"testing"
 	"time"
 
+	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/models"
+	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/pool"
 	"gitlab.com/postgres-ai/database-lab/v2/pkg/services/provision/resources"
 )
 
-type mockPortChecker struct{}
-
-func (m mockPortChecker) checkPortAvailability(_ string, _ uint) error {
-	return nil
-}
-
 func TestPortAllocation(t *testing.T) {
-	p := &Provisioner{
-		mu: &sync.Mutex{},
-		config: &Config{
-			PortPool: PortPool{
-				From: 6000,
-				To:   6002,
-			},
+	cfg := &Config{
+		PortPool: PortPool{
+			From: 6000,
+			To:   6002,
 		},
-		portChecker: &mockPortChecker{},
 	}
 
-	// Initialize port pool.
-	require.NoError(t, p.initPortPool())
+	p, err := New(context.Background(), cfg, &resources.DB{}, &client.Client{}, &pool.Manager{}, "networkID")
+	require.NoError(t, err)
 
 	// Allocate a new port.
 	port, err := p.allocatePort()
@@ -150,11 +142,11 @@ func TestBuildPoolEntry(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		pool := tc.pool
-		pool.SetStatus(tc.poolStatus)
+		p := tc.pool
+		p.SetStatus(tc.poolStatus)
 
 		testFSManager := mockFSManager{
-			pool:      pool,
+			pool:      p,
 			cloneList: tc.cloneList,
 		}