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

storage: discard a unworthwhile merge TODO #28885

Merged
merged 1 commit into from
Aug 21, 2018
Merged

storage: discard a unworthwhile merge TODO #28885

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
3 changes: 0 additions & 3 deletions pkg/storage/replica.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2784,9 +2784,6 @@ func (r *Replica) limitTxnMaxTimestamp(
// maybeWatchForMerge checks whether a merge of this replica into its left
// neighbor is in its critical phase and, if so, arranges to block all requests
// until the merge completes.
//
// TODO(benesch): now that merges require collocation, it might be cleaner to
// fold this function into store.MergeRange.
func (r *Replica) maybeWatchForMerge(ctx context.Context) error {
desc := r.Desc()
descKey := keys.RangeDescriptorKey(desc.StartKey)
Expand Down