Merge pull request #9525 from tschottdorf/ctx-todo

storage: use context in AdminSplit
cockroachdb · Sep 25, 2016 · bebc77a · bebc77a
2 parents 82f55e5 + 9dc0167
commit bebc77a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/storage/replica_command.go b/storage/replica_command.go
@@ -2310,7 +2310,7 @@ func (r *Replica) AdminSplit(
 
 	log.Infof(ctx, "initiating a split of this range at key %s", splitKey)
 
-	if err := r.store.DB().Txn(context.TODO(), func(txn *client.Txn) error {
+	if err := r.store.DB().Txn(ctx, func(txn *client.Txn) error {
 		log.Event(ctx, "split closure begins")
 		defer log.Event(ctx, "split closure ends")
 		// Update existing range descriptor for left hand side of
@@ -2790,7 +2790,7 @@ func (r *Replica) AdminMerge(
 		log.Infof(ctx, "initiating a merge of %s into this range", rightRng)
 	}
 
-	if err := r.store.DB().Txn(context.TODO(), func(txn *client.Txn) error {
+	if err := r.store.DB().Txn(ctx, func(txn *client.Txn) error {
 		log.Event(ctx, "merge closure begins")
 		// Update the range descriptor for the receiving range.
 		{