mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 07:41:27 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23d085c98f | ||
|
|
269e031761 |
No files matched your search
@@ -573,4 +573,29 @@ func TestRuntimeLiveInvariants(t *testing.T) {
|
||||
if row.Replicas != 3 {
|
||||
t.Fatalf("replicas: %+v", row)
|
||||
}
|
||||
|
||||
// Sleeper reads: candidate sweep + domain/status text lookups.
|
||||
_, err = db.Exec(`UPDATE services SET sleep_enabled = true, domain = 'rt.example.com', status = 'running' WHERE id = $1`, serviceID)
|
||||
must(err)
|
||||
cands, err := q.ListSleepCandidates(ctx)
|
||||
if err != nil {
|
||||
t.Fatalf("sleep candidates: %v", err)
|
||||
}
|
||||
var mine *sqlcdb.ListSleepCandidatesRow
|
||||
for i := range cands {
|
||||
if cands[i].ID == serviceID {
|
||||
mine = &cands[i]
|
||||
}
|
||||
}
|
||||
if mine == nil || mine.SleepIdleMinutes != 15 {
|
||||
t.Fatalf("candidate missing/idle wrong: %+v", mine)
|
||||
}
|
||||
dom, err := q.GetServiceDomainText(ctx, serviceID)
|
||||
if err != nil || dom != "rt.example.com" {
|
||||
t.Fatalf("domain text: %v %q", err, dom)
|
||||
}
|
||||
st, err := q.GetServiceStatusText(ctx, serviceID)
|
||||
if err != nil || st != "running" {
|
||||
t.Fatalf("status text: %v %q", err, st)
|
||||
}
|
||||
}
|
||||
@@ -86,20 +86,17 @@ type sleepCandidate struct {
|
||||
}
|
||||
|
||||
func sweepSleeping(ctx context.Context, db *database.DB, dc *docker.Client, engine *deployment.DeploymentEngine, apiPort int) {
|
||||
rows, err := db.QueryContext(ctx,
|
||||
`SELECT id, project_id, name, COALESCE(status,''), COALESCE(sleep_idle_minutes,15)
|
||||
FROM services WHERE sleep_enabled AND COALESCE(status,'') IN ('running','deployed','degraded','starting')`)
|
||||
sweepRows, err := sqlcdb.New(db.DB).ListSleepCandidates(ctx)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
var candidates []sleepCandidate
|
||||
for rows.Next() {
|
||||
var s sleepCandidate
|
||||
if err := rows.Scan(&s.ID, &s.ProjectID, &s.Name, &s.Status, &s.IdleMinutes); err == nil {
|
||||
candidates = append(candidates, s)
|
||||
for _, r := range sweepRows {
|
||||
candidates = append(candidates, sleepCandidate{
|
||||
ID: r.ID, ProjectID: r.ProjectID, Name: r.Name,
|
||||
Status: r.Status, IdleMinutes: int(r.SleepIdleMinutes),
|
||||
})
|
||||
}
|
||||
}
|
||||
rows.Close()
|
||||
|
||||
q := sqlcdb.New(db.DB)
|
||||
for _, svc := range candidates {
|
||||
@@ -187,11 +184,10 @@ func putToSleepRemote(ctx context.Context, db *database.DB, q *sqlcdb.Queries, s
|
||||
tracker.mu.Lock()
|
||||
delete(tracker.activity, svc.ID)
|
||||
tracker.mu.Unlock()
|
||||
_, _ = db.Exec(`UPDATE services SET status = 'sleeping', updated_at = $1 WHERE id = $2`, time.Now(), svc.ID)
|
||||
setServiceStatusNow(db, svc.ID, "sleeping")
|
||||
log.Printf("sleep: %s (%s) remote replicas removed after idle timeout", svc.Name, svc.ID)
|
||||
|
||||
var domain string
|
||||
_ = db.QueryRow(`SELECT COALESCE(domain,'') FROM services WHERE id = $1`, svc.ID).Scan(&domain)
|
||||
domain, _ := q.GetServiceDomainText(ctx, svc.ID)
|
||||
domains := serviceDomainNames(db, svc.ID, domain)
|
||||
if len(domains) > 0 {
|
||||
writeWakeIngress(svc.ID.String(), domains, apiPort)
|
||||
@@ -250,11 +246,10 @@ func putToSleep(ctx context.Context, db *database.DB, dc *docker.Client, engine
|
||||
tracker.mu.Lock()
|
||||
delete(tracker.activity, svc.ID)
|
||||
tracker.mu.Unlock()
|
||||
_, _ = db.Exec(`UPDATE services SET status = 'sleeping', updated_at = $1 WHERE id = $2`, time.Now(), svc.ID)
|
||||
setServiceStatusNow(db, svc.ID, "sleeping")
|
||||
log.Printf("sleep: %s (%s) scaled to zero after idle timeout", svc.Name, svc.ID)
|
||||
|
||||
var domain string
|
||||
_ = db.QueryRow(`SELECT COALESCE(domain,'') FROM services WHERE id = $1`, svc.ID).Scan(&domain)
|
||||
domain, _ := sqlcdb.New(db.DB).GetServiceDomainText(ctx, svc.ID)
|
||||
domains := serviceDomainNames(db, svc.ID, domain)
|
||||
if len(domains) == 0 {
|
||||
return
|
||||
@@ -444,7 +439,9 @@ func pruneWakeContainers(ctx context.Context, db *database.DB, dc *docker.Client
|
||||
}
|
||||
}
|
||||
var status string
|
||||
_ = db.QueryRow(`SELECT COALESCE(status,'') FROM services WHERE id = $1`, svcID).Scan(&status)
|
||||
if sid, err := uuid.Parse(svcID); err == nil {
|
||||
status, _ = sqlcdb.New(db.DB).GetServiceStatusText(ctx, sid)
|
||||
}
|
||||
if live > 0 || status == "stopped" || status == "" {
|
||||
_ = dc.RemoveContainer(ctx, c.ID, true)
|
||||
}
|
||||
@@ -491,34 +488,11 @@ func triggerServiceWake(c *gin.Context) (int, gin.H) {
|
||||
if err != nil {
|
||||
return http.StatusBadRequest, gin.H{"error": "invalid service id"}
|
||||
}
|
||||
var service Service
|
||||
err = db.QueryRow(
|
||||
`SELECT s.id, s.project_id, s.name,
|
||||
COALESCE(s.type, s.service_type, ''), COALESCE(s.status, ''),
|
||||
COALESCE(s.image, s.image_name, ''), COALESCE(s.command, s.start_command, ''),
|
||||
COALESCE(s.environment, ''), COALESCE(s.git_repo, s.source_url, ''),
|
||||
COALESCE(s.git_branch, ''), COALESCE(s.build_path, ''),
|
||||
COALESCE(s.cpu, ''), COALESCE(s.memory, ''),
|
||||
COALESCE(s.replicas, 1), COALESCE(s.port, 0),
|
||||
COALESCE(s.domain, ''), COALESCE(s.healthcheck_path, ''),
|
||||
COALESCE(s.restart_policy, 'unless-stopped'),
|
||||
COALESCE(s.builder, 'auto'), COALESCE(s.cpu_reserve, ''),
|
||||
COALESCE(s.memory_reserve, ''), COALESCE(s.static_build_cmd, ''),
|
||||
COALESCE(s.static_dir, ''),
|
||||
s.created_at, s.updated_at
|
||||
FROM services s WHERE s.id = $1`, id,
|
||||
).Scan(
|
||||
&service.ID, &service.ProjectID, &service.Name, &service.Type, &service.Status,
|
||||
&service.Image, &service.Command, &service.Environment, &service.GitRepo,
|
||||
&service.GitBranch, &service.BuildPath, &service.CPU, &service.Memory,
|
||||
&service.Replicas, &service.Port, &service.Domain, &service.HealthCheckPath,
|
||||
&service.RestartPolicy, &service.Builder, &service.CPUReserve,
|
||||
&service.MemoryReserve, &service.StaticBuildCmd, &service.StaticDir,
|
||||
&service.CreatedAt, &service.UpdatedAt,
|
||||
)
|
||||
row, err := sqlcdb.New(db.DB).GetServiceRuntimeWithOwner(context.Background(), id)
|
||||
if err != nil {
|
||||
return http.StatusNotFound, gin.H{"error": "service not found"}
|
||||
}
|
||||
service := serviceFromRuntimeRow(row)
|
||||
if service.Status == "running" || service.Status == "deployed" {
|
||||
return http.StatusOK, gin.H{"status": service.Status}
|
||||
}
|
||||
@@ -528,13 +502,13 @@ func triggerServiceWake(c *gin.Context) (int, gin.H) {
|
||||
spec, err := serviceRuntimeSpec(db, service)
|
||||
if err != nil {
|
||||
log.Printf("wake: runtime spec for %s failed: %v", service.ID, err)
|
||||
_, _ = db.Exec(`UPDATE services SET status = 'failed', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
|
||||
setServiceStatusNow(db, service.ID, "failed")
|
||||
return
|
||||
}
|
||||
state, err := engine.ReconcileService(ctx, spec)
|
||||
if err != nil {
|
||||
log.Printf("wake: reconcile for %s failed: %v", service.ID, err)
|
||||
_, _ = db.Exec(`UPDATE services SET status = 'failed', updated_at = $1 WHERE id = $2`, time.Now(), service.ID)
|
||||
setServiceStatusNow(db, service.ID, "failed")
|
||||
return
|
||||
}
|
||||
status := "running"
|
||||
@@ -542,7 +516,7 @@ func triggerServiceWake(c *gin.Context) (int, gin.H) {
|
||||
status = state.Status
|
||||
persistPublishedPort(db, service.ID, state.Ports)
|
||||
}
|
||||
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, status, time.Now(), service.ID)
|
||||
setServiceStatusNow(db, service.ID, status)
|
||||
}()
|
||||
return http.StatusAccepted, gin.H{"status": "waking"}
|
||||
}
|
||||
@@ -563,8 +537,6 @@ func handleServiceSleep(c *gin.Context) {
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
var port int
|
||||
_ = db.QueryRow(`SELECT COALESCE(port,0) FROM services WHERE id = $1`, service.ID).Scan(&port)
|
||||
svc := sleepCandidate{
|
||||
ID: service.ID,
|
||||
ProjectID: service.ProjectID,
|
||||
|
||||
@@ -401,6 +401,8 @@ type Service struct {
|
||||
StaticDir string `json:"static_dir"`
|
||||
NodeID sql.NullString `json:"node_id"`
|
||||
Spread bool `json:"spread"`
|
||||
SleepEnabled bool `json:"sleep_enabled"`
|
||||
SleepIdleMinutes int32 `json:"sleep_idle_minutes"`
|
||||
PlacementTags json.RawMessage `json:"placement_tags"`
|
||||
TraefikLabels json.RawMessage `json:"traefik_labels"`
|
||||
}
|
||||
|
||||
@@ -114,6 +114,7 @@ type Querier interface {
|
||||
GetServiceAccess(ctx context.Context, id uuid.UUID) (GetServiceAccessRow, error)
|
||||
GetServiceDomainDefault(ctx context.Context, serviceID uuid.UUID) (string, error)
|
||||
GetServiceDomainFirst(ctx context.Context, serviceID uuid.UUID) (string, error)
|
||||
GetServiceDomainText(ctx context.Context, id uuid.UUID) (string, error)
|
||||
GetServiceEnvironment(ctx context.Context, id uuid.UUID) (string, error)
|
||||
GetServiceForDeploy(ctx context.Context, id uuid.UUID) (GetServiceForDeployRow, error)
|
||||
GetServiceForDeployWithOwner(ctx context.Context, id uuid.UUID) (GetServiceForDeployWithOwnerRow, error)
|
||||
@@ -121,6 +122,7 @@ type Querier interface {
|
||||
GetServicePort(ctx context.Context, id uuid.UUID) (int32, error)
|
||||
GetServicePublishedPort(ctx context.Context, id uuid.UUID) (int32, error)
|
||||
GetServiceRuntimeWithOwner(ctx context.Context, id uuid.UUID) (GetServiceRuntimeWithOwnerRow, error)
|
||||
GetServiceStatusText(ctx context.Context, id uuid.UUID) (string, error)
|
||||
GetServiceTemplateByID(ctx context.Context, id string) (ServiceTemplate, error)
|
||||
GetServiceTypeBrief(ctx context.Context, arg GetServiceTypeBriefParams) (GetServiceTypeBriefRow, error)
|
||||
GetServiceVariableValue(ctx context.Context, arg GetServiceVariableValueParams) (string, error)
|
||||
@@ -183,6 +185,7 @@ type Querier interface {
|
||||
ListServiceTemplatesForUser(ctx context.Context, ownerID uuid.NullUUID) ([]ServiceTemplate, error)
|
||||
ListServiceVariableValues(ctx context.Context, serviceID uuid.UUID) ([]ListServiceVariableValuesRow, error)
|
||||
ListServiceVariablesWithSecret(ctx context.Context, serviceID uuid.UUID) ([]ListServiceVariablesWithSecretRow, error)
|
||||
ListSleepCandidates(ctx context.Context) ([]ListSleepCandidatesRow, error)
|
||||
ListSweepablePreviews(ctx context.Context) ([]ListSweepablePreviewsRow, error)
|
||||
ListUserInvites(ctx context.Context) ([]UserInvite, error)
|
||||
ListUserTokens(ctx context.Context, userID uuid.UUID) ([]UserToken, error)
|
||||
|
||||
@@ -25,6 +25,17 @@ func (q *Queries) GetLastDeployedImage(ctx context.Context, serviceID uuid.UUID)
|
||||
return image, err
|
||||
}
|
||||
|
||||
const getServiceDomainText = `-- name: GetServiceDomainText :one
|
||||
SELECT COALESCE(domain,'') AS domain FROM services WHERE id = $1
|
||||
`
|
||||
|
||||
func (q *Queries) GetServiceDomainText(ctx context.Context, id uuid.UUID) (string, error) {
|
||||
row := q.db.QueryRowContext(ctx, getServiceDomainText, id)
|
||||
var domain string
|
||||
err := row.Scan(&domain)
|
||||
return domain, err
|
||||
}
|
||||
|
||||
const getServicePort = `-- name: GetServicePort :one
|
||||
SELECT COALESCE(port, 0) AS port FROM services WHERE id = $1
|
||||
`
|
||||
@@ -118,6 +129,17 @@ func (q *Queries) GetServiceRuntimeWithOwner(ctx context.Context, id uuid.UUID)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getServiceStatusText = `-- name: GetServiceStatusText :one
|
||||
SELECT COALESCE(status,'') AS status FROM services WHERE id = $1
|
||||
`
|
||||
|
||||
func (q *Queries) GetServiceStatusText(ctx context.Context, id uuid.UUID) (string, error) {
|
||||
row := q.db.QueryRowContext(ctx, getServiceStatusText, id)
|
||||
var status string
|
||||
err := row.Scan(&status)
|
||||
return status, err
|
||||
}
|
||||
|
||||
const getServiceVariableValue = `-- name: GetServiceVariableValue :one
|
||||
SELECT value FROM environment_variables WHERE service_id = $1 AND key = $2
|
||||
`
|
||||
@@ -259,6 +281,50 @@ func (q *Queries) ListServiceVariablesWithSecret(ctx context.Context, serviceID
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const listSleepCandidates = `-- name: ListSleepCandidates :many
|
||||
SELECT id, project_id, name, COALESCE(status,'') AS status,
|
||||
COALESCE(sleep_idle_minutes, 15) AS sleep_idle_minutes
|
||||
FROM services
|
||||
WHERE sleep_enabled AND COALESCE(status,'') IN ('running','deployed','degraded','starting')
|
||||
`
|
||||
|
||||
type ListSleepCandidatesRow struct {
|
||||
ID uuid.UUID `json:"id"`
|
||||
ProjectID uuid.UUID `json:"project_id"`
|
||||
Name string `json:"name"`
|
||||
Status string `json:"status"`
|
||||
SleepIdleMinutes int32 `json:"sleep_idle_minutes"`
|
||||
}
|
||||
|
||||
func (q *Queries) ListSleepCandidates(ctx context.Context) ([]ListSleepCandidatesRow, error) {
|
||||
rows, err := q.db.QueryContext(ctx, listSleepCandidates)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []ListSleepCandidatesRow{}
|
||||
for rows.Next() {
|
||||
var i ListSleepCandidatesRow
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.ProjectID,
|
||||
&i.Name,
|
||||
&i.Status,
|
||||
&i.SleepIdleMinutes,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Close(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const setServicePublishedPort = `-- name: SetServicePublishedPort :exec
|
||||
UPDATE services SET published_port = $1 WHERE id = $2 AND published_port <> $1
|
||||
`
|
||||
|
||||
@@ -45,3 +45,15 @@ UPDATE services SET published_port = $1 WHERE id = $2 AND published_port <> $1;
|
||||
|
||||
-- name: SetServiceReplicas :exec
|
||||
UPDATE services SET replicas = $1, updated_at = $2 WHERE id = $3;
|
||||
|
||||
-- name: ListSleepCandidates :many
|
||||
SELECT id, project_id, name, COALESCE(status,'') AS status,
|
||||
COALESCE(sleep_idle_minutes, 15) AS sleep_idle_minutes
|
||||
FROM services
|
||||
WHERE sleep_enabled AND COALESCE(status,'') IN ('running','deployed','degraded','starting');
|
||||
|
||||
-- name: GetServiceDomainText :one
|
||||
SELECT COALESCE(domain,'') AS domain FROM services WHERE id = $1;
|
||||
|
||||
-- name: GetServiceStatusText :one
|
||||
SELECT COALESCE(status,'') AS status FROM services WHERE id = $1;
|
||||
@@ -69,6 +69,8 @@ CREATE TABLE services (
|
||||
static_dir VARCHAR(255) NOT NULL DEFAULT '',
|
||||
node_id VARCHAR(255),
|
||||
spread BOOLEAN NOT NULL DEFAULT false,
|
||||
sleep_enabled BOOLEAN NOT NULL DEFAULT false,
|
||||
sleep_idle_minutes INTEGER NOT NULL DEFAULT 15,
|
||||
placement_tags JSONB NOT NULL DEFAULT '[]',
|
||||
traefik_labels JSONB NOT NULL DEFAULT '{}'
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user