+
+
+ Storj Node Network Explorer
+
+
+
+
+
diff --git a/storage/redis/overlay.go b/storage/redis/overlay.go
index 0833ad806..5d4a5b142 100644
--- a/storage/redis/overlay.go
+++ b/storage/redis/overlay.go
@@ -6,6 +6,7 @@ package redis
import (
"context"
"errors"
+ "fmt"
"time"
"github.com/gogo/protobuf/proto"
@@ -16,6 +17,9 @@ import (
const defaultNodeExpiration = 61 * time.Minute
+// ErrNodeNotFound standardizes errors here
+var ErrNodeNotFound = errors.New("Node not found")
+
// OverlayClient is used to store overlay data in Redis
type OverlayClient struct {
DB Client
@@ -30,20 +34,24 @@ func NewOverlayClient(address, password string, db int, DHT kademlia.DHT) (*Over
}
return &OverlayClient{
- DB: rc,
+ DB: rc,
+ DHT: DHT,
}, nil
}
// Get looks up the provided nodeID from the redis cache
-func (o *OverlayClient) Get(key string) (*overlay.NodeAddress, error) {
- d, err := o.DB.Get(key)
+func (o *OverlayClient) Get(ctx context.Context, key string) (*overlay.NodeAddress, error) {
+ b, err := o.DB.Get(key)
if err != nil {
return nil, err
}
na := &overlay.NodeAddress{}
+ if err := proto.Unmarshal(b, na); err != nil {
+ return nil, err
+ }
- return na, proto.Unmarshal(d, na)
+ return na, nil
}
// Set adds a nodeID to the redis cache with a binary representation of proto defined NodeAddress
@@ -58,10 +66,70 @@ func (o *OverlayClient) Set(nodeID string, value overlay.NodeAddress) error {
// Bootstrap walks the initialized network and populates the cache
func (o *OverlayClient) Bootstrap(ctx context.Context) error {
- return errors.New("TODO")
+ fmt.Println("bootstrapping cache")
+ nodes, err := o.DHT.GetNodes(ctx, "0", 1280)
+
+ for _, v := range nodes {
+ found, err := o.DHT.FindNode(ctx, kademlia.NodeID(v.Id))
+ if err != nil {
+ fmt.Println("could not find node in network", err, v.Id)
+ }
+ addr, err := proto.Marshal(found.Address)
+ o.DB.Set(found.Id, addr, defaultNodeExpiration)
+ }
+ // called after kademlia is bootstrapped
+ // needs to take RoutingTable and start to persist it into the cache
+ // take bootstrap node
+ // get their route table
+ // loop through nodes in RT and get THEIR route table
+ // keep going forever and ever
+
+ // Other Possibilities: Randomly generate node ID's to ask for?
+
+ _, err = o.DHT.GetRoutingTable(ctx)
+
+ if err != nil {
+ return err
+ }
+
+ return nil
}
// Refresh walks the network looking for new nodes and pings existing nodes to eliminate stale addresses
func (o *OverlayClient) Refresh(ctx context.Context) error {
- return errors.New("TODO")
+ // iterate over all nodes
+ // compare responses to find new nodes
+ // listen for responses from existing nodes
+ // if no response from existing, then mark it as offline for time period
+ // if responds, it refreshes in DHT
+ _, rtErr := o.DHT.GetRoutingTable(ctx)
+
+ if rtErr != nil {
+ return rtErr
+ }
+
+ _, err := o.DHT.GetNodes(ctx, "0", 128)
+
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+// Walk iterates over buckets to traverse the network
+func (o *OverlayClient) Walk(ctx context.Context) error {
+ nodes, err := o.DHT.GetNodes(ctx, "0", 128)
+ if err != nil {
+ return err
+ }
+
+ for _, v := range nodes {
+ _, err := o.DHT.FindNode(ctx, kademlia.NodeID(v.Id))
+ if err != nil {
+ fmt.Println("could not find node in network", err, v.Id)
+ }
+ }
+
+ return nil
}
diff --git a/storage/redis/overlay_test.go b/storage/redis/overlay_test.go
index fa3ada8de..1f147142b 100644
--- a/storage/redis/overlay_test.go
+++ b/storage/redis/overlay_test.go
@@ -4,6 +4,7 @@
package redis
import (
+ "context"
"testing"
"github.com/gogo/protobuf/proto"
@@ -69,7 +70,7 @@ func TestGet(t *testing.T) {
assert.Equal(t, 0, c.client.getCalled)
- resp, err := oc.Get(c.key)
+ resp, err := oc.Get(context.Background(), c.key)
assert.Equal(t, c.expectedError, err)
assert.Equal(t, c.expectedResponse, resp)
assert.Equal(t, c.expectedTimesCalled, c.client.getCalled)