Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Implement auto-deletion and protection for branches#265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
NikolayS wants to merge3 commits intomaster
base:master
Choose a base branch
Loading
fromclaude/auto-delete-branch-protection-01KiaxrtL1Bh3LzPYAJSQ4Bi
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletionengine/cmd/cli/commands/clone/actions.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,9 @@ func update(cliCtx *cli.Context) error {
returnerr
}

protected:=cliCtx.Bool("protected")
updateRequest:= types.CloneUpdateRequest{
Protected:cliCtx.Bool("protected"),
Protected:&protected,
}

cloneID:=cliCtx.Args().First()
Expand Down
2 changes: 2 additions & 0 deletionsengine/cmd/database-lab/main.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,8 @@ func main() {
}
}()

goserver.RunAutoDeleteCheck(ctx)

ifcfg.EmbeddedUI.Enabled {
gofunc() {
iferr:=embeddedUI.Run(ctx);err!=nil {
Expand Down
187 changes: 159 additions & 28 deletionsengine/internal/cloning/base.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,28 +45,30 @@ type Config struct {

// Base provides cloning service.
type Base struct {
config *Config
global *global.Config
cloneMutex sync.RWMutex
clones map[string]*CloneWrapper
snapshotBox SnapshotBox
provision *provision.Provisioner
tm *telemetry.Agent
observingCh chan string
webhookCh chan webhooks.EventTyper
config *Config
global *global.Config
cloneMutex sync.RWMutex
clones map[string]*CloneWrapper
snapshotBox SnapshotBox
entityStorage *EntityStorage
provision *provision.Provisioner
tm *telemetry.Agent
observingCh chan string
webhookCh chan webhooks.EventTyper
}

// NewBase instances a new Base service.
func NewBase(cfg *Config, global *global.Config, provision *provision.Provisioner, tm *telemetry.Agent,
observingCh chan string, whCh chan webhooks.EventTyper) *Base {
return &Base{
config: cfg,
global: global,
clones: make(map[string]*CloneWrapper),
provision: provision,
tm: tm,
observingCh: observingCh,
webhookCh: whCh,
config: cfg,
global: global,
clones: make(map[string]*CloneWrapper),
entityStorage: NewEntityStorage(),
provision: provision,
tm: tm,
observingCh: observingCh,
webhookCh: whCh,
snapshotBox: SnapshotBox{
items: make(map[string]*models.Snapshot),
},
Expand All@@ -93,6 +95,14 @@ func (c *Base) Run(ctx context.Context) error {
log.Err("failed to load stored sessions:", err)
}

if err := c.entityStorage.RestoreBranchesState(); err != nil {
log.Err("failed to load stored branch metadata:", err)
}

if err := c.entityStorage.RestoreSnapshotsState(); err != nil {
log.Err("failed to load stored snapshot metadata:", err)
}

c.restartCloneContainers(ctx)

c.filterRunningClones(ctx)
Expand DownExpand Up@@ -175,12 +185,20 @@ func (c *Base) CreateClone(cloneRequest *types.CloneCreateRequest) (*models.Clon
cloneRequest.Branch = snapshot.Branch
}

var deleteAt *models.LocalTime

if cloneRequest.DeleteAt != "" {
deleteAt, _ = models.ParseLocalTime(cloneRequest.DeleteAt)
}

clone := &models.Clone{
ID: cloneRequest.ID,
Snapshot: snapshot,
Branch: cloneRequest.Branch,
Protected: cloneRequest.Protected,
CreatedAt: models.NewLocalTime(createdAt),
ID: cloneRequest.ID,
Snapshot: snapshot,
Branch: cloneRequest.Branch,
Protected: cloneRequest.Protected,
DeleteAt: deleteAt,
AutoDeleteMode: models.AutoDeleteMode(cloneRequest.AutoDeleteMode),
CreatedAt: models.NewLocalTime(createdAt),
Status: models.Status{
Code: models.StatusCreating,
Message: models.CloneMessageCreating,
Expand DownExpand Up@@ -450,9 +468,23 @@ func (c *Base) UpdateClone(id string, patch types.CloneUpdateRequest) (*models.C

var clone *models.Clone

// Set fields.
c.cloneMutex.Lock()
w.Clone.Protected = patch.Protected

if patch.Protected != nil {
w.Clone.Protected = *patch.Protected
}

if patch.DeleteAt != nil {
deleteAt, err := models.ParseLocalTime(*patch.DeleteAt)
if err == nil {
w.Clone.DeleteAt = deleteAt
}
}

if patch.AutoDeleteMode != nil {
w.Clone.AutoDeleteMode = models.AutoDeleteMode(*patch.AutoDeleteMode)
}

clone = w.Clone
c.cloneMutex.Unlock()

Expand All@@ -461,6 +493,50 @@ func (c *Base) UpdateClone(id string, patch types.CloneUpdateRequest) (*models.C
return clone, nil
}

// GetEntityStorage returns the entity storage instance.
func (c *Base) GetEntityStorage() *EntityStorage {
return c.entityStorage
}

// IsBranchProtected checks if a branch is protected.
func (c *Base) IsBranchProtected(name string) bool {
return c.entityStorage.IsBranchProtected(name)
}

// IsSnapshotProtected checks if a snapshot is protected.
func (c *Base) IsSnapshotProtected(id string) bool {
return c.entityStorage.IsSnapshotProtected(id)
}

// GetBranchMeta returns metadata for a branch.
func (c *Base) GetBranchMeta(name string) *BranchMeta {
return c.entityStorage.GetBranchMeta(name)
}

// GetSnapshotMeta returns metadata for a snapshot.
func (c *Base) GetSnapshotMeta(id string) *SnapshotMeta {
return c.entityStorage.GetSnapshotMeta(id)
}

// UpdateBranchMeta updates branch metadata.
func (c *Base) UpdateBranchMeta(
name string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode,
) *BranchMeta {
return c.entityStorage.UpdateBranchMeta(name, protected, deleteAt, autoDeleteMode)
}

// UpdateSnapshotMeta updates snapshot metadata.
func (c *Base) UpdateSnapshotMeta(
id string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode,
) *SnapshotMeta {
return c.entityStorage.UpdateSnapshotMeta(id, protected, deleteAt, autoDeleteMode)
}

// DeleteBranchMeta removes branch metadata.
func (c *Base) DeleteBranchMeta(name string) {
c.entityStorage.DeleteBranchMeta(name)
}

// UpdateCloneStatus updates the clone status.
func (c *Base) UpdateCloneStatus(cloneID string, status models.Status) error {
c.cloneMutex.Lock()
Expand DownExpand Up@@ -723,16 +799,16 @@ func (c *Base) getExpectedCloningTime() float64 {
}

func (c *Base) runIdleCheck(ctx context.Context) {
if c.config.MaxIdleMinutes == 0 {
return
}

idleTimer := time.NewTimer(idleCheckDuration)

for {
select {
case <-idleTimer.C:
c.destroyIdleClones(ctx)
if c.config.MaxIdleMinutes > 0 {
c.destroyIdleClones(ctx)
}

c.destroyScheduledClones(ctx)
idleTimer.Reset(idleCheckDuration)
c.SaveClonesState()

Expand DownExpand Up@@ -767,6 +843,61 @@ func (c *Base) destroyIdleClones(ctx context.Context) {
}
}

func (c *Base) destroyScheduledClones(ctx context.Context) {
now := time.Now()

for _, cloneWrapper := range c.clones {
select {
case <-ctx.Done():
return
default:
clone := cloneWrapper.Clone
if clone.DeleteAt == nil || clone.AutoDeleteMode == models.AutoDeleteOff {
continue
}

if clone.DeleteAt.Time.After(now) {
continue
}

if clone.Protected {
log.Dbg(fmt.Sprintf("Skipping scheduled deletion of protected clone %q", clone.ID))
continue
}

hasDeps := c.hasDependentSnapshots(cloneWrapper)

switch clone.AutoDeleteMode {
case models.AutoDeleteSoft:
if hasDeps {
log.Dbg(fmt.Sprintf("Skipping scheduled deletion of clone %q: has dependent snapshots (soft mode)", clone.ID))
continue
}
case models.AutoDeleteForce:
if hasDeps {
log.Msg(fmt.Sprintf("Force deleting clone %q with dependent snapshots", clone.ID))
}
}

log.Msg(fmt.Sprintf("Scheduled clone %q is going to be removed (deleteAt: %s)", clone.ID, clone.DeleteAt.Time.Format(time.RFC3339)))

if err := c.DestroyClone(clone.ID); err != nil {
log.Errf("failed to destroy scheduled clone %q: %v", clone.ID, err)
}
}
}
}

// GetExpiredBranches returns branch metadata for expired branches.
func (c *Base) GetExpiredBranches() []*BranchMeta {
return c.entityStorage.GetExpiredBranches()
}

// GetExpiredSnapshots returns snapshot metadata for expired snapshots.
func (c *Base) GetExpiredSnapshots() []*SnapshotMeta {
return c.entityStorage.GetExpiredSnapshots()
}

// isIdleClone checks if clone is idle.
func (c *Base) isIdleClone(wrapper *CloneWrapper) (bool, error) {
currentTime := time.Now()
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp