Merge pull request #4811 from filecoin-project/raulk/badger-ctx-tests

badger blockstore: minor improvements
filecoin-project · Nov 12, 2020 · a389622 · a389622
2 parents f4df58e + 72547f9
commit a389622
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/blockstore/badger/blockstore.go b/lib/blockstore/badger/blockstore.go
@@ -359,7 +359,11 @@ func (b *Blockstore) AllKeysChan(ctx context.Context) (<-chan cid.Cid, error) {
 				buf = make([]byte, reqlen)
 			}
 			if n, err := base32.RawStdEncoding.Decode(buf, k); err == nil {
-				ch <- cid.NewCidV1(cid.Raw, buf[:n])
+				select {
+				case ch <- cid.NewCidV1(cid.Raw, buf[:n]):
+				case <-ctx.Done():
+					return
+				}
 			} else {
 				log.Warnf("failed to decode key %s in badger AllKeysChan; err: %s", k, err)
 			}

diff --git a/lib/blockstore/badger/blockstore_test_suite.go b/lib/blockstore/badger/blockstore_test_suite.go
@@ -219,6 +219,9 @@ func (s *Suite) TestReopenPutGet(t *testing.T) {
 	fetched, err := bs.Get(orig.Cid())
 	require.NoError(t, err)
 	require.Equal(t, orig.RawData(), fetched.RawData())
+
+	err = bs.(io.Closer).Close()
+	require.NoError(t, err)
 }
 
 func (s *Suite) TestPutMany(t *testing.T) {