2018-04-23 16:54:22 +01:00
|
|
|
// Copyright (C) 2018 Storj Labs, Inc.
|
|
|
|
|
// See LICENSE for copying information.
|
|
|
|
|
|
|
|
|
|
package overlay
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"context"
|
2018-07-09 18:43:13 +01:00
|
|
|
"fmt"
|
|
|
|
|
"io/ioutil"
|
|
|
|
|
"net"
|
2018-06-20 15:28:46 +01:00
|
|
|
"os"
|
|
|
|
|
"path/filepath"
|
2018-04-23 16:54:22 +01:00
|
|
|
"testing"
|
|
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
2018-07-09 18:43:13 +01:00
|
|
|
"google.golang.org/grpc"
|
2018-04-23 16:54:22 +01:00
|
|
|
|
2018-07-09 18:43:13 +01:00
|
|
|
"storj.io/storj/pkg/peertls"
|
|
|
|
|
proto "storj.io/storj/protos/overlay" // naming proto to avoid confusion with this package
|
2018-04-23 16:54:22 +01:00
|
|
|
)
|
|
|
|
|
|
2018-07-09 18:43:13 +01:00
|
|
|
func TestNewServer(t *testing.T) {
|
|
|
|
|
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", 0))
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
srv := newMockServer()
|
|
|
|
|
assert.NotNil(t, srv)
|
|
|
|
|
|
|
|
|
|
go srv.Serve(lis)
|
|
|
|
|
srv.Stop()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestNewClient_CreateTLS(t *testing.T) {
|
|
|
|
|
var err error
|
|
|
|
|
|
|
|
|
|
tmpPath, err := ioutil.TempDir("", "TestNewClient")
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
defer os.RemoveAll(tmpPath)
|
|
|
|
|
|
|
|
|
|
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", 0))
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
basePath := filepath.Join(tmpPath, "TestNewClient_CreateTLS")
|
|
|
|
|
srv, tlsOpts := newMockTLSServer(t, basePath, true)
|
|
|
|
|
go srv.Serve(lis)
|
|
|
|
|
defer srv.Stop()
|
|
|
|
|
|
|
|
|
|
address := lis.Addr().String()
|
captplanet (#159)
* 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
2018-07-24 17:08:28 +01:00
|
|
|
c, err := NewClient(address, tlsOpts.DialOption())
|
2018-07-09 18:43:13 +01:00
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
r, err := c.Lookup(context.Background(), &proto.LookupRequest{})
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
assert.NotNil(t, r)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestNewClient_LoadTLS(t *testing.T) {
|
|
|
|
|
var err error
|
|
|
|
|
|
|
|
|
|
tmpPath, err := ioutil.TempDir("", "TestNewClient")
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
defer os.RemoveAll(tmpPath)
|
|
|
|
|
|
|
|
|
|
basePath := filepath.Join(tmpPath, "TestNewClient_LoadTLS")
|
|
|
|
|
_, err = peertls.NewTLSFileOptions(
|
|
|
|
|
basePath,
|
|
|
|
|
basePath,
|
|
|
|
|
true,
|
|
|
|
|
false,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", 0))
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
// NB: do NOT create a cert, it should be loaded from disk
|
|
|
|
|
srv, tlsOpts := newMockTLSServer(t, basePath, false)
|
|
|
|
|
|
|
|
|
|
go srv.Serve(lis)
|
|
|
|
|
defer srv.Stop()
|
|
|
|
|
|
|
|
|
|
address := lis.Addr().String()
|
captplanet (#159)
* 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
2018-07-24 17:08:28 +01:00
|
|
|
c, err := NewClient(address, tlsOpts.DialOption())
|
2018-07-09 18:43:13 +01:00
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
r, err := c.Lookup(context.Background(), &proto.LookupRequest{})
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
assert.NotNil(t, r)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestNewClient_IndependentTLS(t *testing.T) {
|
|
|
|
|
var err error
|
|
|
|
|
|
|
|
|
|
tmpPath, err := ioutil.TempDir("", "TestNewClient_IndependentTLS")
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
defer os.RemoveAll(tmpPath)
|
|
|
|
|
|
|
|
|
|
clientBasePath := filepath.Join(tmpPath, "client")
|
|
|
|
|
serverBasePath := filepath.Join(tmpPath, "server")
|
|
|
|
|
|
|
|
|
|
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", 0))
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
srv, _ := newMockTLSServer(t, serverBasePath, true)
|
|
|
|
|
|
|
|
|
|
go srv.Serve(lis)
|
|
|
|
|
defer srv.Stop()
|
|
|
|
|
|
|
|
|
|
clientTLSOps, err := peertls.NewTLSFileOptions(
|
|
|
|
|
clientBasePath,
|
|
|
|
|
clientBasePath,
|
|
|
|
|
true,
|
|
|
|
|
false,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
address := lis.Addr().String()
|
captplanet (#159)
* 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
2018-07-24 17:08:28 +01:00
|
|
|
c, err := NewClient(address, clientTLSOps.DialOption())
|
2018-07-09 18:43:13 +01:00
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
r, err := c.Lookup(context.Background(), &proto.LookupRequest{})
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
assert.NotNil(t, r)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func newMockServer(opts ...grpc.ServerOption) *grpc.Server {
|
|
|
|
|
grpcServer := grpc.NewServer(opts...)
|
|
|
|
|
proto.RegisterOverlayServer(grpcServer, &MockOverlay{})
|
|
|
|
|
|
|
|
|
|
return grpcServer
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func newMockTLSServer(t *testing.T, tlsBasePath string, create bool) (*grpc.Server, *peertls.TLSFileOptions) {
|
|
|
|
|
tlsOpts, err := peertls.NewTLSFileOptions(
|
|
|
|
|
tlsBasePath,
|
|
|
|
|
tlsBasePath,
|
|
|
|
|
create,
|
|
|
|
|
false,
|
|
|
|
|
)
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
assert.NotNil(t, tlsOpts)
|
|
|
|
|
|
|
|
|
|
grpcServer := newMockServer(tlsOpts.ServerOption())
|
|
|
|
|
return grpcServer, tlsOpts
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type MockOverlay struct{}
|
|
|
|
|
|
|
|
|
|
func (o *MockOverlay) FindStorageNodes(ctx context.Context, req *proto.FindStorageNodesRequest) (*proto.FindStorageNodesResponse, error) {
|
|
|
|
|
return &proto.FindStorageNodesResponse{}, nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (o *MockOverlay) Lookup(ctx context.Context, req *proto.LookupRequest) (*proto.LookupResponse, error) {
|
|
|
|
|
return &proto.LookupResponse{}, nil
|
|
|
|
|
}
|
