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: limit goroutine creation in intent resolution #5219

Merged
merged 9 commits into from
Mar 14, 2016
Merged

storage: limit goroutine creation in intent resolution #5219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
38cafcb
storage: Move intent resolution methods to their own file
bdarnell Mar 13, 2016
a159938
storage: move intent resolution methods to a new type
bdarnell Mar 13, 2016
e119488
storage: Minor API cleanups in intentResolver.
bdarnell Mar 13, 2016
2f16ee1
storage: Separate intent push from WriteIntentError manipulation
bdarnell Mar 14, 2016
76f0dd6
storage: split EndTransaction from other uses of processIntentsAsync
bdarnell Mar 14, 2016
d1655b0
storage: Dedupe PushTxn calls from async intent resolution
bdarnell Mar 14, 2016
441e602
util/stop: Introduce RunLimitedAsyncTask
bdarnell Mar 14, 2016
8e44cdc
storage: Limit the number of tasks started by intentResolver
bdarnell Mar 14, 2016
bae254c
storage: PR feedback
bdarnell Mar 14, 2016
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
7 changes: 4 additions & 3 deletions storage/gc_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,8 @@ func (gcq *gcQueue) process(now roachpb.Timestamp, repl *Replica,
}
}

if pErr := repl.resolveIntents(repl.context(), intents, true /* wait */, false /* !poison */); pErr != nil {
if pErr := repl.store.intentResolver.resolveIntents(repl.context(), repl, intents,
true /* wait */, false /* !poison */); pErr != nil {
return pErr.GoError()
}

Expand Down Expand Up @@ -346,14 +347,14 @@ func processTransactionTable(r *Replica, txnMap map[uuid.UUID]*roachpb.Transacti
// Note: Most aborted transaction weren't aborted by their client,
// but instead by the coordinator - those will not have any intents
// persisted, though they still might exist in the system.
if err := r.resolveIntents(r.context(),
if err := r.store.intentResolver.resolveIntents(r.context(), r,
roachpb.AsIntents(txn.Intents, &txn), true /* wait */, false /* !poison */); err != nil {
log.Warningf("failed to resolve intents of aborted txn on gc: %s", err)
}
case roachpb.COMMITTED:
// It's committed, so it doesn't need a push but we can only
// GC it after its intents are resolved.
if err := r.resolveIntents(r.context(),
if err := r.store.intentResolver.resolveIntents(r.context(), r,
roachpb.AsIntents(txn.Intents, &txn), true /* wait */, false /* !poison */); err != nil {
log.Warningf("unable to resolve intents of committed txn on gc: %s", err)
// Returning the error here would abort the whole GC run, and
Expand Down
Loading