Skip to content

.Register() complains only if the primary record fails #3091

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
winder merged 3 commits into from
Oct 21, 2021
Merged

.Register() complains only if the primary record fails #3091

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c6f056
.Register() complains if the primary record fails
brianolson Oct 18, 2021
2ebba7c
remove .Duplicate(), all uses are pass-by-value
brianolson Oct 18, 2021
f11bc97
Revert "remove .Duplicate(), all uses are pass-by-value"
brianolson Oct 19, 2021
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
29 changes: 22 additions & 7 deletions data/account/participationRegistry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,17 @@ type participationDB struct {
flushesPending int
}

type updatingParticipationRecord struct {
ParticipationRecord

required bool
}

type partDBWriteRecord struct {
insertID ParticipationID
insert Participation

registerUpdated map[ParticipationID]ParticipationRecord
registerUpdated map[ParticipationID]updatingParticipationRecord

delete ParticipationID

Expand Down Expand Up @@ -398,16 +404,19 @@ func (db *participationDB) insertInner(record Participation, id ParticipationID)
return err
}

func (db *participationDB) registerInner(updated map[ParticipationID]ParticipationRecord) error {
func (db *participationDB) registerInner(updated map[ParticipationID]updatingParticipationRecord) error {
var cacheDeletes []ParticipationID
err := db.store.Wdb.Atomic(func(ctx context.Context, tx *sql.Tx) error {
// Disable active key if there is one
for id, record := range updated {
err := updateRollingFields(ctx, tx, record)
err := updateRollingFields(ctx, tx, record.ParticipationRecord)
// Repair the case when no keys were updated
if err == ErrNoKeyForID {
db.log.Warn("participationDB unable to update key in cache. Removing from cache.")
cacheDeletes = append(cacheDeletes, id)
if !record.required {
err = nil
}
}
if err != nil {
return fmt.Errorf("unable to disable old key when registering %s: %w", id, err)
Expand Down Expand Up @@ -704,18 +713,24 @@ func (db *participationDB) Register(id ParticipationID, on basics.Round) error {
}
db.mutex.Unlock()

updated := make(map[ParticipationID]ParticipationRecord)
updated := make(map[ParticipationID]updatingParticipationRecord)

// Disable active key if there is one
for _, record := range toUpdate {
// TODO: this should probably be "on - 1"
record.EffectiveLast = on
updated[record.ParticipationID] = record.Duplicate()
updated[record.ParticipationID] = updatingParticipationRecord{
record.Duplicate(),
false,
}
}
// Mark registered.
recordToRegister.EffectiveFirst = on
recordToRegister.EffectiveLast = recordToRegister.LastValid
updated[recordToRegister.ParticipationID] = recordToRegister
updated[recordToRegister.ParticipationID] = updatingParticipationRecord{
recordToRegister,
true,
}

if len(updated) != 0 {
db.writeQueue <- partDBWriteRecord{
Expand All @@ -724,7 +739,7 @@ func (db *participationDB) Register(id ParticipationID, on basics.Round) error {
db.mutex.Lock()
for id, record := range updated {
delete(db.dirty, id)
db.cache[id] = record
db.cache[id] = record.ParticipationRecord
}
db.mutex.Unlock()
}
Expand Down