Skip to content

Propagate saveClassID error and clear stale classid files #180

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
sjmiller609 merged 1 commit into from
Mar 31, 2026
Merged

Propagate saveClassID error and clear stale classid files #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions lib/network/allocate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,13 @@ func (m *manager) CreateAllocation(ctx context.Context, req AllocateRequest) (*N
m.recordTAPOperation(ctx, "create")

// Persist assigned tc class ID so removal uses the correct ID after collisions.
// Clear any stale file when no rate limiting was applied.
if classID != "" {
m.saveClassID(req.InstanceID, classID)
if err := m.saveClassID(req.InstanceID, classID); err != nil {
return nil, fmt.Errorf("save class ID: %w", err)
}
} else {
m.clearClassID(req.InstanceID)
}

log.InfoContext(ctx, "allocated network",
Expand Down Expand Up @@ -128,8 +133,13 @@ func (m *manager) RecreateAllocation(ctx context.Context, instanceID string, dow
m.recordTAPOperation(ctx, "create")

// Persist assigned tc class ID so removal uses the correct ID after collisions.
// Clear any stale file when no rate limiting was applied.
if classID != "" {
m.saveClassID(instanceID, classID)
if err := m.saveClassID(instanceID, classID); err != nil {
return fmt.Errorf("save class ID: %w", err)
}
} else {
m.clearClassID(instanceID)
}

log.InfoContext(ctx, "recreated network for restore",
Expand Down Expand Up @@ -309,9 +319,13 @@ func generateMAC() (string, error) {
}

// saveClassID persists the tc class ID for an instance so it survives restarts.
func (m *manager) saveClassID(instanceID, classID string) {
path := m.paths.InstanceDir(instanceID)
_ = os.WriteFile(path+"/classid", []byte(classID), 0644)
func (m *manager) saveClassID(instanceID, classID string) error {
return os.WriteFile(m.paths.InstanceDir(instanceID)+"/classid", []byte(classID), 0644)
}

// clearClassID removes any persisted tc class ID for an instance.
func (m *manager) clearClassID(instanceID string) {
_ = os.Remove(m.paths.InstanceDir(instanceID) + "/classid")
}

// loadClassID loads the persisted tc class ID for an instance.
Expand Down
Loading