Merge pull request #170 from jkawamoto/delete_ctx

DeleteSectors supports context-based cancellation
lukechampine · Apr 20, 2021 · ad20a05 · ad20a05
2 parents 9c9f022 + a8855da
commit ad20a05
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/renter/renterutil/strategies.go b/renter/renterutil/strategies.go
@@ -99,6 +99,24 @@ func downloadCtx(ctx context.Context, sess *proto.Session, key renter.KeySeed, s
 	return
 }
 
+func deleteCtx(ctx context.Context, sess *proto.Session, roots []crypto.Hash) error {
+	if ctx.Err() != nil {
+		return ctx.Err()
+	}
+	done := make(chan error)
+	go func() {
+		done <- sess.DeleteSectors(roots)
+	}()
+	select {
+	case <-ctx.Done():
+		sess.Interrupt()
+		<-done // wait for goroutine to exit
+		return ctx.Err()
+	case err := <-done:
+		return err
+	}
+}
+
 // A ChunkUploader uploads shards, associating them with a given chunk.
 type ChunkUploader interface {
 	UploadChunk(ctx context.Context, db MetaDB, c DBChunk, key renter.KeySeed, shards [][]byte) error
@@ -1299,13 +1317,11 @@ type SerialSectorDeleter struct {
 // DeleteSectors implements SectorDeleter.
 func (ssd SerialSectorDeleter) DeleteSectors(ctx context.Context, db MetaDB, sectors map[hostdb.HostPublicKey][]crypto.Hash) error {
 	for hostKey, roots := range sectors {
-		h, err := ssd.Hosts.acquire(hostKey)
+		h, err := acquireCtx(ctx, ssd.Hosts, hostKey, true)
 		if err != nil {
 			return err
 		}
-		// TODO: no-op if roots already deleted
-		// TODO: respect ctx
-		err = h.DeleteSectors(roots)
+		err = deleteCtx(ctx, h, roots)
 		ssd.Hosts.release(hostKey)
 		if err != nil && !errors.Is(err, contractmanager.ErrSectorNotFound) {
 			return err
@@ -1326,13 +1342,11 @@ func (psd ParallelSectorDeleter) DeleteSectors(ctx context.Context, db MetaDB, s
 	for hostKey, roots := range sectors {
 		go func(hostKey hostdb.HostPublicKey, roots []crypto.Hash) {
 			errCh <- func() *HostError {
-				h, err := psd.Hosts.acquire(hostKey)
+				h, err := acquireCtx(ctx, psd.Hosts, hostKey, true)
 				if err != nil {
 					return &HostError{hostKey, err}
 				}
-				// TODO: no-op if roots already deleted
-				// TODO: respect ctx
-				err = h.DeleteSectors(roots)
+				err = deleteCtx(ctx, h, roots)
 				psd.Hosts.release(hostKey)
 				if err != nil && !errors.Is(err, contractmanager.ErrSectorNotFound) {
 					return &HostError{hostKey, err}