Skip to content
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

Write to IPAM checkpoint file immediately after reading from CRI #1140

Merged
merged 1 commit into from
Aug 14, 2020
Merged

Write to IPAM checkpoint file immediately after reading from CRI #1140

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
10 changes: 10 additions & 0 deletions pkg/ipamd/datastore/data_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,16 @@ func (ds *DataStore) ReadBackingStore() error {
ds.log.Debugf("Recovered %s => %s/%s", allocation.IPAMKey, eni.ID, addr.Address)
}

if ds.CheckpointMigrationPhase == 1 {
// For phase1: write whatever we just read above from
// CRI to backingstore immediately - just in case we
// _never_ see an add/del request before we upgrade to
// phase2.
if err := ds.writeBackingStoreUnsafe(); err != nil {
return err
}
}

ds.log.Debugf("Completed ipam state recovery")
return nil
}
Expand Down