Skip to content

hotfix/v2.2/inconsistent ledger creation #700

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
32 changes: 16 additions & 16 deletions internal/storage/driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ func (d *Driver) CreateLedger(ctx context.Context, l *ledger.Ledger) (*ledgersto
l.Metadata = metadata.Metadata{}
}

if err := d.systemStore.CreateLedger(ctx, l); err != nil {
if errors.Is(postgres.ResolveError(err), postgres.ErrConstraintsFailed{}) {
return nil, systemcontroller.ErrLedgerAlreadyExists
}
return nil, postgres.ResolveError(err)
}

b := d.bucketFactory.Create(l.Bucket)
isInitialized, err := b.IsInitialized(ctx)
if err != nil {
Expand All @@ -57,24 +64,17 @@ func (d *Driver) CreateLedger(ctx context.Context, l *ledger.Ledger) (*ledgersto
if !upToDate {
return nil, systemcontroller.ErrBucketOutdated
}
}

if err := b.Migrate(
ctx,
migrations.WithLockRetryInterval(d.migratorLockRetryInterval),
); err != nil {
return nil, fmt.Errorf("migrating bucket: %w", err)
}

if err := d.systemStore.CreateLedger(ctx, l); err != nil {
if errors.Is(postgres.ResolveError(err), postgres.ErrConstraintsFailed{}) {
return nil, systemcontroller.ErrLedgerAlreadyExists
if err := b.AddLedger(ctx, *l); err != nil {
return nil, fmt.Errorf("adding ledger to bucket: %w", err)
}
} else {
if err := b.Migrate(
ctx,
migrations.WithLockRetryInterval(d.migratorLockRetryInterval),
); err != nil {
return nil, fmt.Errorf("migrating bucket: %w", err)
}
return nil, postgres.ResolveError(err)
}

if err := b.AddLedger(ctx, *l); err != nil {
return nil, fmt.Errorf("adding ledger to bucket: %w", err)
}

return d.ledgerStoreFactory.Create(b, *l), nil
Expand Down
4 changes: 0 additions & 4 deletions internal/storage/driver/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,6 @@ func TestLedgersCreate(t *testing.T) {
Migrate(gomock.Any(), gomock.Any()).
Return(nil)

bucket.EXPECT().
AddLedger(gomock.Any(), *l).
Return(nil)

ledgerStoreFactory.EXPECT().
Create(gomock.Any(), *l).
Return(&ledgerstore.Store{})
Expand Down