Cancel context if finish syncing

coinbase · Apr 20, 2020 · 5a0cc39 · 5a0cc39
1 parent eea13dc
commit 5a0cc39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmd/check_quick.go b/cmd/check_quick.go
@@ -37,7 +37,7 @@ func init() {
 }
 
 func runCheckQuickCmd(cmd *cobra.Command, args []string) {
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
 
 	fetcher := fetcher.New(
 		ctx,
@@ -87,6 +87,7 @@ func runCheckQuickCmd(cmd *cobra.Command, args []string) {
 	g.Go(func() error {
 		return syncer.Sync(
 			ctx,
+			cancel,
 			StartIndex,
 			EndIndex,
 		)

diff --git a/internal/syncer/stateless_syncer.go b/internal/syncer/stateless_syncer.go
@@ -114,9 +114,12 @@ func (s *StatelessSyncer) nextSyncableRange(
 
 func (s *StatelessSyncer) Sync(
 	ctx context.Context,
+	cancel context.CancelFunc,
 	startIndex int64,
 	endIndex int64,
 ) error {
+	defer cancel()
+
 	currIndex := startIndex
 	for ctx.Err() == nil {
 		newCurrIndex, stopIndex, halt, err := s.nextSyncableRange(
@@ -128,7 +131,7 @@ func (s *StatelessSyncer) Sync(
 			return err
 		}
 		if halt {
-			return nil
+			break
 		}
 
 		err = s.SyncRange(ctx, newCurrIndex, stopIndex)
@@ -138,5 +141,6 @@ func (s *StatelessSyncer) Sync(
 
 		currIndex = stopIndex
 	}
+	log.Printf("Finished sycning %d-%d\n", startIndex, endIndex)
 	return nil
 }