Skip to content

Commit 9d8ed47

Browse files
committed
fix: address linting issues in auto-delete feature
- Break long function signatures into multiple lines (base.go, entity_storage.go) - Fix wsl issues by adding blank lines before if statements - Pre-allocate slices in canDeleteSnapshot
1 parent 1f17e21 commit 9d8ed47

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

engine/internal/cloning/base.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,16 @@ func (c *Base) GetSnapshotMeta(id string) *SnapshotMeta {
519519
}
520520

521521
// UpdateBranchMeta updates branch metadata.
522-
func (c *Base) UpdateBranchMeta(name string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode) *BranchMeta {
522+
func (c *Base) UpdateBranchMeta(
523+
name string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode,
524+
) *BranchMeta {
523525
return c.entityStorage.UpdateBranchMeta(name, protected, deleteAt, autoDeleteMode)
524526
}
525527

526528
// UpdateSnapshotMeta updates snapshot metadata.
527-
func (c *Base) UpdateSnapshotMeta(id string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode) *SnapshotMeta {
529+
func (c *Base) UpdateSnapshotMeta(
530+
id string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode,
531+
) *SnapshotMeta {
528532
return c.entityStorage.UpdateSnapshotMeta(id, protected, deleteAt, autoDeleteMode)
529533
}
530534

engine/internal/cloning/entity_storage.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ func (es *EntityStorage) SetBranchMeta(meta *BranchMeta) {
163163
}
164164

165165
// UpdateBranchMeta updates existing branch metadata or creates new one.
166-
func (es *EntityStorage) UpdateBranchMeta(name string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode) *BranchMeta {
166+
func (es *EntityStorage) UpdateBranchMeta(
167+
name string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode,
168+
) *BranchMeta {
167169
es.branchMutex.Lock()
168170
defer es.branchMutex.Unlock()
169171

@@ -229,7 +231,9 @@ func (es *EntityStorage) SetSnapshotMeta(meta *SnapshotMeta) {
229231
}
230232

231233
// UpdateSnapshotMeta updates existing snapshot metadata or creates new one.
232-
func (es *EntityStorage) UpdateSnapshotMeta(id string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode) *SnapshotMeta {
234+
func (es *EntityStorage) UpdateSnapshotMeta(
235+
id string, protected *bool, deleteAt *models.LocalTime, autoDeleteMode *models.AutoDeleteMode,
236+
) *SnapshotMeta {
233237
es.snapshotMutex.Lock()
234238
defer es.snapshotMutex.Unlock()
235239

engine/internal/srv/auto_delete.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ func (s *Server) processExpiredBranches(ctx context.Context) {
8181
continue
8282
case models.AutoDeleteForce:
8383
log.Msg(fmt.Sprintf("Force deleting branch %q: %s", meta.Name, reason))
84+
8485
if err := s.forceDeleteBranch(ctx, fsm, meta.Name); err != nil {
8586
log.Errf("failed to force delete branch %q: %v", meta.Name, err)
8687
continue
@@ -158,6 +159,7 @@ func (s *Server) forceDeleteBranch(ctx context.Context, fsm pool.FSManager, bran
158159

159160
func (s *Server) getClonesForSnapshot(snapshotID string) []string {
160161
state := s.Cloning.GetCloningState()
162+
161163
var cloneIDs []string
162164

163165
for _, clone := range state.Clones {
@@ -212,6 +214,7 @@ func (s *Server) processExpiredSnapshots(ctx context.Context) {
212214
continue
213215
case models.AutoDeleteForce:
214216
log.Msg(fmt.Sprintf("Force deleting snapshot %q: %s", meta.ID, reason))
217+
215218
if err := s.forceDeleteSnapshot(ctx, fsm, meta.ID, cloneIDs); err != nil {
216219
log.Errf("failed to force delete snapshot %q: %v", meta.ID, err)
217220
continue
@@ -251,8 +254,8 @@ func (s *Server) canDeleteSnapshot(fsm pool.FSManager, meta *cloning.SnapshotMet
251254
return false, fmt.Sprintf("failed to check dependencies: %v", err), nil
252255
}
253256

254-
var cloneIDs []string
255-
var protectedClones []string
257+
cloneIDs := make([]string, 0, len(dependentCloneDatasets))
258+
protectedClones := make([]string, 0)
256259

257260
for _, cloneDataset := range dependentCloneDatasets {
258261
cloneID, ok := branching.ParseCloneName(cloneDataset, poolName)

0 commit comments

Comments
 (0)