dont need blockservice workers anymore
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Aug 28, 2015 at 14:20 UTC
47b85c7bc3c89b6aa52e29bb4ccd87347a748a55
1 file changed
+4
-24
blockservice/blockservice.go
+4
-24
@@ -10,29 +10,12 @@ import (
10
blocks "github.com/ipfs/go-ipfs/blocks"
11
"github.com/ipfs/go-ipfs/blocks/blockstore"
12
key "github.com/ipfs/go-ipfs/blocks/key"
13
- worker "github.com/ipfs/go-ipfs/blockservice/worker"
13
exchange "github.com/ipfs/go-ipfs/exchange"
14
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
15
)
16
18
-var wc = worker.Config{
19
- // When running on a single core, NumWorkers has a harsh negative effect on
20
- // throughput. (-80% when < 25)
21
- // Running a lot more workers appears to have very little effect on both
22
- // single and multicore configurations.
23
- NumWorkers: 25,
24
-
25
- // These have no effect on when running on multiple cores, but harsh
26
- // negative effect on throughput when running on a single core
27
- // On multicore configurations these buffers have little effect on
28
- // throughput.
29
- // On single core configurations, larger buffers have severe adverse
30
- // effects on throughput.
31
- ClientBufferSize: 0,
32
- WorkerBufferSize: 0,
33
-}
34
-
17
var log = logging.Logger("blockservice")
18
+
19
var ErrNotFound = errors.New("blockservice: key not found")
20
21
// BlockService is a hybrid block datastore. It stores data in a local
@@ -42,8 +25,6 @@ type BlockService struct {
25
// TODO don't expose underlying impl details
26
Blockstore blockstore.Blockstore
27
Exchange exchange.Interface
45
-
46
- worker *worker.Worker
28
}
29
30
// NewBlockService creates a BlockService with given datastore instance.
@@ -55,7 +36,6 @@ func New(bs blockstore.Blockstore, rem exchange.Interface) *BlockService {
36
return &BlockService{
37
Blockstore: bs,
38
Exchange: rem,
58
- worker: worker.NewWorker(rem, wc),
39
}
40
}
41
@@ -67,7 +47,7 @@ func (s *BlockService) AddBlock(b *blocks.Block) (key.Key, error) {
47
if err != nil {
48
return k, err
49
}
70
- if err := s.worker.HasBlock(b); err != nil {
50
+ if err := s.Exchange.HasBlock(context.TODO(), b); err != nil {
51
return "", errors.New("blockservice is closed")
52
}
53
return k, nil
@@ -81,7 +61,7 @@ func (s *BlockService) AddBlocks(bs []*blocks.Block) ([]key.Key, error) {
61
62
var ks []key.Key
63
for _, b := range bs {
84
- if err := s.worker.HasBlock(b); err != nil {
64
+ if err := s.Exchange.HasBlock(context.TODO(), b); err != nil {
65
return nil, errors.New("blockservice is closed")
66
}
67
ks = append(ks, b.Key())
@@ -166,5 +146,5 @@ func (s *BlockService) DeleteBlock(k key.Key) error {
146
147
func (s *BlockService) Close() error {
148
log.Debug("blockservice is shutting down...")
169
- return s.worker.Close()
149
+ return s.Exchange.Close()
150
}