Skip to content

[GCP] Remove lock hint in assignEntries #685

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

Closed
wants to merge 1 commit into from
Closed

[GCP] Remove lock hint in assignEntries #685

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
5 changes: 3 additions & 2 deletions storage/gcp/gcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ func (s *spannerCoordinator) assignEntries(ctx context.Context, entries []*tesse

_, err := s.dbPool.ReadWriteTransaction(ctx, func(ctx context.Context, txn *spanner.ReadWriteTransaction) error {
// First we need to grab the next available sequence number from the SeqCoord table.
row, err := txn.ReadRowWithOptions(ctx, "SeqCoord", spanner.Key{0}, []string{"id", "next"}, &spanner.ReadOptions{LockHint: spannerpb.ReadRequest_LOCK_HINT_EXCLUSIVE})
row, err := txn.ReadRow(ctx, "SeqCoord", spanner.Key{0}, []string{"id", "next"})
if err != nil {
return fmt.Errorf("failed to read SeqCoord: %w", err)
}
Expand Down Expand Up @@ -821,7 +821,8 @@ func (s *spannerCoordinator) assignEntries(ctx context.Context, entries []*tesse

// TODO(al): think about whether aligning bundles to tile boundaries would be a good idea or not.
m := []*spanner.Mutation{
// Insert our newly sequenced batch of entries into Seq,
// Insert our newly sequenced batch of entries into Seq, this will cause the TX to abort if
// someone else has put a batch there.
spanner.Insert("Seq", []string{"id", "seq", "v"}, []any{0, int64(next), data}),
// and update the next-available sequence number row in SeqCoord.
spanner.Update("SeqCoord", []string{"id", "next"}, []any{0, int64(next) + int64(num)}),
Expand Down
Loading