5f6607935b
* captplanet I kind of went overboard this weekend. The major goal of this changeset is to provide an environment for local development where all of the various services can be easily run together. Developing on Storj v3 should be as easy as running a setup command and a run command! To do this, this changeset introduces a new tool called captplanet, which combines the powers of the Overlay Cache, the PointerDB, the PieceStore, Kademlia, the Minio Gateway, etc. Running 40 farmers and a heavy client inside the same process forced a rethinking of the "services" that we had. To avoid confusion by reusing prior terms, this changeset introduces two new types: Providers and Responsibilities. I wanted to avoid as many merge conflicts as possible, so I left the existing Services and code for now, but if people like this route we can clean up the duplication. A Responsibility is a collection of gRPC methods and corresponding state. The following systems are examples of Responsibilities: * Kademlia * OverlayCache * PointerDB * StatDB * PieceStore * etc. A Provider is a collection of Responsibilities that share an Identity, such as: * The heavy client * The farmer * The gateway An Identity is a public/private key pair, a node id, etc. Farmers all need different Identities, so captplanet needs to support running multiple concurrent Providers with different Identities. Each Responsibility and Provider should allow for configuration of multiple copies on its own so creating Responsibilities and Providers use a new workflow. To make a Responsibility, one should create a "config" struct, such as: ``` type Config struct { RepairThreshold int `help:"If redundancy falls below this number of pieces, repair is triggered" default:"30"` SuccessThreshold int `help:"If redundancy is above this number then no additional uploads are needed" default:"40"` } ``` To use "config" structs, this changeset introduces another new library called 'cfgstruct', which allows for the configuration of arbitrary structs through flagsets, and thus through cobra and viper. cfgstruct relies on Go's "struct tags" feature to document help information and default values. Config structs can be configured via cfgstruct.Bind for binding the struct to a flagset. Because this configuration system makes setup and configuration easier *in general*, additional commands are provided that allow for easy standup of separate Providers. Please make sure to check out: * cmd/captplanet/farmer/main.go (a new farmer binary) * cmd/captplanet/hc/main.go (a new heavy client binary) * cmd/captplanet/gw/main.go (a new minio gateway binary) Usage: ``` $ go install -v storj.io/storj/cmd/captplanet $ captplanet setup $ captplanet run ``` Configuration is placed by default in `~/.storj/capt/` Other changes: * introduces new config structs for currently existing Responsibilities that conform to the new Responsibility interface. Please see the `pkg/*/config.go` files for examples. * integrates the PointerDB API key with other global configuration via flags, instead of through environment variables through viper like it's been doing. (ultimately this should also change to use the PointerDB config struct but this is an okay shortterm solution). * changes the Overlay cache to use a URL for database configuration instead of separate redis and bolt config settings. * stubs out some peer identity skeleton code (but not the meat). * Fixes the SegmentStore to use the overlay client and pointerdb clients instead of gRPC client code directly * Leaves a very clear spot where we need to tie the object to stream to segment store together. There's sort of a "golden spike" opportunity to connect all the train tracks together at the bottom of pkg/miniogw/config.go, labeled with a bunch of TODOs. Future stuff: * I now prefer this design over the original pkg/process.Service thing I had been pushing before (sorry!) * The experience of trying to have multiple farmers configurable concurrently led me to prefer config structs over global flags (I finally came around) or using viper directly. I think global flags are okay sometimes but in general going forward we should try and get all relevant config into config structs. * If you all like this direction, I think we can go delete my old Service interfaces and a bunch of flags and clean up a bunch of stuff. * If you don't like this direction, it's no sweat at all, and despite how much code there is here I'm not very tied to any of this! Considering a lot of this was written between midnight and 6 am, it might not be any good! * bind tests
104 lines
2.9 KiB
Go
104 lines
2.9 KiB
Go
// Copyright (C) 2018 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package pointerdb
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/golang/protobuf/proto"
|
|
"google.golang.org/grpc"
|
|
monkit "gopkg.in/spacemonkeygo/monkit.v2"
|
|
|
|
p "storj.io/storj/pkg/paths"
|
|
pb "storj.io/storj/protos/pointerdb"
|
|
)
|
|
|
|
var (
|
|
mon = monkit.Package()
|
|
)
|
|
|
|
// PointerDB creates a grpcClient
|
|
type PointerDB struct {
|
|
grpcClient pb.PointerDBClient
|
|
}
|
|
|
|
// Client services offerred for the interface
|
|
type Client interface {
|
|
Put(ctx context.Context, path p.Path, pointer *pb.Pointer, APIKey []byte) error
|
|
Get(ctx context.Context, path p.Path, APIKey []byte) (*pb.Pointer, error)
|
|
List(ctx context.Context, startingPathKey p.Path, limit int64, APIKey []byte) (
|
|
paths [][]byte, truncated bool, err error)
|
|
Delete(ctx context.Context, path p.Path, APIKey []byte) error
|
|
}
|
|
|
|
// NewClient initializes a new pointerdb client
|
|
func NewClient(address string) (*PointerDB, error) {
|
|
c, err := clientConnection(address, grpc.WithInsecure())
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &PointerDB{
|
|
grpcClient: c,
|
|
}, nil
|
|
}
|
|
|
|
// a compiler trick to make sure *PointerDB implements Client
|
|
var _ Client = (*PointerDB)(nil)
|
|
|
|
// ClientConnection makes a server connection
|
|
func clientConnection(serverAddr string, opts ...grpc.DialOption) (pb.PointerDBClient, error) {
|
|
conn, err := grpc.Dial(serverAddr, opts...)
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return pb.NewPointerDBClient(conn), nil
|
|
}
|
|
|
|
// Put is the interface to make a PUT request, needs Pointer and APIKey
|
|
func (pdb *PointerDB) Put(ctx context.Context, path p.Path, pointer *pb.Pointer, APIKey []byte) (err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
_, err = pdb.grpcClient.Put(ctx, &pb.PutRequest{Path: path.Bytes(), Pointer: pointer, APIKey: APIKey})
|
|
|
|
return err
|
|
}
|
|
|
|
// Get is the interface to make a GET request, needs PATH and APIKey
|
|
func (pdb *PointerDB) Get(ctx context.Context, path p.Path, APIKey []byte) (pointer *pb.Pointer, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
res, err := pdb.grpcClient.Get(ctx, &pb.GetRequest{Path: path.Bytes(), APIKey: APIKey})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
pointer = &pb.Pointer{}
|
|
err = proto.Unmarshal(res.GetPointer(), pointer)
|
|
|
|
return pointer, nil
|
|
}
|
|
|
|
// List is the interface to make a LIST request, needs StartingPathKey, Limit, and APIKey
|
|
func (pdb *PointerDB) List(ctx context.Context, startingPathKey p.Path, limit int64, APIKey []byte) (paths [][]byte, truncated bool, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
res, err := pdb.grpcClient.List(ctx, &pb.ListRequest{StartingPathKey: startingPathKey.Bytes(), Limit: limit, APIKey: APIKey})
|
|
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
return res.Paths, res.Truncated, nil
|
|
}
|
|
|
|
// Delete is the interface to make a Delete request, needs Path and APIKey
|
|
func (pdb *PointerDB) Delete(ctx context.Context, path p.Path, APIKey []byte) (err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
|
|
_, err = pdb.grpcClient.Delete(ctx, &pb.DeleteRequest{Path: path.Bytes(), APIKey: APIKey})
|
|
|
|
return err
|
|
}
|