cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #294 from ipfs/fix/jenkins

Browse Source 
Fix jenkins tests
This commit is contained in:
Hector Sanjuan 2018-01-26 12:40:09 +01:00 committed by GitHub
commit ebd167edc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 243 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/rest/client/client_test.go
View File

@ -1,6 +1,8 @@
package client
import (
"fmt"
"strings"
"testing"
ma "github.com/multiformats/go-multiaddr"
@ -9,11 +11,9 @@ import (
"github.com/ipfs/ipfs-cluster/test"
)
var apiAddr = "/ip4/127.0.0.1/tcp/10005"
func testAPI(t *testing.T) *rest.API {
//logging.SetDebugLogging()
apiMAddr, _ := ma.NewMultiaddr(apiAddr)
apiMAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
cfg := &rest.Config{}
cfg.Default()
@ -28,12 +28,18 @@ func testAPI(t *testing.T) *rest.API {
return rest
}
func apiMAddr(a *rest.API) ma.Multiaddr {
hostPort := strings.Split(a.HTTPAddress(), ":")
addr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%s", hostPort[1]))
return addr
}
func testClient(t *testing.T) (*Client, *rest.API) {
api := testAPI(t)
addr, _ := ma.NewMultiaddr(apiAddr)
cfg := &Config{
APIAddr: addr,
APIAddr: apiMAddr(api),
DisableKeepAlives: true,
}
c, err := NewClient(cfg)
@ -64,7 +70,7 @@ func TestDefaultAddress(t *testing.T) {
}
func TestMultiaddressPreference(t *testing.T) {
addr, _ := ma.NewMultiaddr(apiAddr)
addr, _ := ma.NewMultiaddr("/ip4/1.2.3.4/tcp/1234")
cfg := &Config{
APIAddr: addr,
Host: "localhost",
@ -75,7 +81,7 @@ func TestMultiaddressPreference(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if c.urlPrefix != "http://127.0.0.1:10005" {
if c.urlPrefix != "http://1.2.3.4:1234" {
t.Error("APIAddr should be used")
}
}

7
api/rest/restapi.go
View File

@ -109,6 +109,13 @@ func newAPI(cfg *Config, l net.Listener) (*API, error) {
return api, nil
}
// HTTPAddress returns the HTTP(s) listening address
// in host:port format. Useful when configured to start
// on a random port (0).
func (api *API) HTTPAddress() string {
return api.listener.Addr().String()
}
func (api *API) addRoutes(router *mux.Router) {
for _, route := range api.routes() {
if api.config.BasicAuthCreds != nil {

76
api/rest/restapi_test.go
View File

@ -14,13 +14,9 @@ import (
ma "github.com/multiformats/go-multiaddr"
)
var (
apiHost = "http://127.0.0.1:10002" // should match testingConfig()
)
func testAPI(t *testing.T) *API {
//logging.SetDebugLogging()
apiMAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/10002")
apiMAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
cfg := &Config{}
cfg.Default()
@ -57,18 +53,22 @@ func processResp(t *testing.T, httpResp *http.Response, err error, resp interfac
}
}
func makeGet(t *testing.T, path string, resp interface{}) {
httpResp, err := http.Get(apiHost + path)
func apiURL(a *API) string {
return fmt.Sprintf("http://%s", a.HTTPAddress())
}
func makeGet(t *testing.T, url string, resp interface{}) {
httpResp, err := http.Get(url)
processResp(t, httpResp, err, resp)
}
func makePost(t *testing.T, path string, body []byte, resp interface{}) {
httpResp, err := http.Post(apiHost+path, "application/json", bytes.NewReader(body))
func makePost(t *testing.T, url string, body []byte, resp interface{}) {
httpResp, err := http.Post(url, "application/json", bytes.NewReader(body))
processResp(t, httpResp, err, resp)
}
func makeDelete(t *testing.T, path string, resp interface{}) {
req, _ := http.NewRequest("DELETE", apiHost+path, bytes.NewReader([]byte{}))
func makeDelete(t *testing.T, url string, resp interface{}) {
req, _ := http.NewRequest("DELETE", url, bytes.NewReader([]byte{}))
c := &http.Client{}
httpResp, err := c.Do(req)
processResp(t, httpResp, err, resp)
@ -88,7 +88,7 @@ func TestRestAPIIDEndpoint(t *testing.T) {
rest := testAPI(t)
defer rest.Shutdown()
id := api.IDSerial{}
makeGet(t, "/id", &id)
makeGet(t, apiURL(rest)+"/id", &id)
if id.ID != test.TestPeerID1.Pretty() {
t.Error("expected correct id")
}
@ -98,7 +98,7 @@ func TestAPIVersionEndpoint(t *testing.T) {
rest := testAPI(t)
defer rest.Shutdown()
ver := api.Version{}
makeGet(t, "/version", &ver)
makeGet(t, apiURL(rest)+"/version", &ver)
if ver.Version != "0.0.mock" {
t.Error("expected correct version")
}
@ -109,7 +109,7 @@ func TestAPIPeerstEndpoint(t *testing.T) {
defer rest.Shutdown()
var list []api.IDSerial
makeGet(t, "/peers", &list)
makeGet(t, apiURL(rest)+"/peers", &list)
if len(list) != 1 {
t.Fatal("expected 1 element")
}
@ -126,7 +126,7 @@ func TestAPIPeerAddEndpoint(t *testing.T) {
// post with valid body
body := fmt.Sprintf("{\"peer_multiaddress\":\"/ip4/1.2.3.4/tcp/1234/ipfs/%s\"}", test.TestPeerID1.Pretty())
t.Log(body)
makePost(t, "/peers", []byte(body), &id)
makePost(t, apiURL(rest)+"/peers", []byte(body), &id)
if id.ID != test.TestPeerID1.Pretty() {
t.Error("expected correct ID")
@ -137,12 +137,12 @@ func TestAPIPeerAddEndpoint(t *testing.T) {
// Send invalid body
errResp := api.Error{}
makePost(t, "/peers", []byte("oeoeoeoe"), &errResp)
makePost(t, apiURL(rest)+"/peers", []byte("oeoeoeoe"), &errResp)
if errResp.Code != 400 {
t.Error("expected error with bad body")
}
// Send invalid multiaddr
makePost(t, "/peers", []byte("{\"peer_multiaddress\": \"ab\"}"), &errResp)
makePost(t, apiURL(rest)+"/peers", []byte("{\"peer_multiaddress\": \"ab\"}"), &errResp)
if errResp.Code != 400 {
t.Error("expected error with bad multiaddress")
}
@ -152,7 +152,7 @@ func TestAPIPeerRemoveEndpoint(t *testing.T) {
rest := testAPI(t)
defer rest.Shutdown()
makeDelete(t, "/peers/"+test.TestPeerID1.Pretty(), &struct{}{})
makeDelete(t, apiURL(rest)+"/peers/"+test.TestPeerID1.Pretty(), &struct{}{})
}
func TestAPIPinEndpoint(t *testing.T) {
@ -160,15 +160,15 @@ func TestAPIPinEndpoint(t *testing.T) {
defer rest.Shutdown()
// test regular post
makePost(t, "/pins/"+test.TestCid1, []byte{}, &struct{}{})
makePost(t, apiURL(rest)+"/pins/"+test.TestCid1, []byte{}, &struct{}{})
errResp := api.Error{}
makePost(t, "/pins/"+test.ErrorCid, []byte{}, &errResp)
makePost(t, apiURL(rest)+"/pins/"+test.ErrorCid, []byte{}, &errResp)
if errResp.Message != test.ErrBadCid.Error() {
t.Error("expected different error: ", errResp.Message)
}
makePost(t, "/pins/abcd", []byte{}, &errResp)
makePost(t, apiURL(rest)+"/pins/abcd", []byte{}, &errResp)
if errResp.Code != 400 {
t.Error("should fail with bad Cid")
}
@ -179,15 +179,15 @@ func TestAPIUnpinEndpoint(t *testing.T) {
defer rest.Shutdown()
// test regular delete
makeDelete(t, "/pins/"+test.TestCid1, &struct{}{})
makeDelete(t, apiURL(rest)+"/pins/"+test.TestCid1, &struct{}{})
errResp := api.Error{}
makeDelete(t, "/pins/"+test.ErrorCid, &errResp)
makeDelete(t, apiURL(rest)+"/pins/"+test.ErrorCid, &errResp)
if errResp.Message != test.ErrBadCid.Error() {
t.Error("expected different error: ", errResp.Message)
}
makeDelete(t, "/pins/abcd", &errResp)
makeDelete(t, apiURL(rest)+"/pins/abcd", &errResp)
if errResp.Code != 400 {
t.Error("should fail with bad Cid")
}
@ -198,7 +198,7 @@ func TestAPIAllocationsEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp []api.PinSerial
makeGet(t, "/allocations", &resp)
makeGet(t, apiURL(rest)+"/allocations", &resp)
if len(resp) != 3 ||
resp[0].Cid != test.TestCid1 || resp[1].Cid != test.TestCid2 ||
resp[2].Cid != test.TestCid3 {
@ -211,13 +211,13 @@ func TestAPIAllocationEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp api.PinSerial
makeGet(t, "/allocations/"+test.TestCid1, &resp)
makeGet(t, apiURL(rest)+"/allocations/"+test.TestCid1, &resp)
if resp.Cid != test.TestCid1 {
t.Error("cid should be the same")
}
errResp := api.Error{}
makeGet(t, "/allocations/"+test.ErrorCid, &errResp)
makeGet(t, apiURL(rest)+"/allocations/"+test.ErrorCid, &errResp)
if errResp.Code != 404 {
t.Error("a non-pinned cid should 404")
}
@ -228,7 +228,7 @@ func TestAPIStatusAllEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp []api.GlobalPinInfoSerial
makeGet(t, "/pins", &resp)
makeGet(t, apiURL(rest)+"/pins", &resp)
if len(resp) != 3 ||
resp[0].Cid != test.TestCid1 ||
resp[1].PeerMap[test.TestPeerID1.Pretty()].Status != "pinning" {
@ -237,7 +237,7 @@ func TestAPIStatusAllEndpoint(t *testing.T) {
// Test local=true
var resp2 []api.GlobalPinInfoSerial
makeGet(t, "/pins?local=true", &resp2)
makeGet(t, apiURL(rest)+"/pins?local=true", &resp2)
if len(resp2) != 2 {
t.Errorf("unexpected statusAll+local resp:\n %+v", resp)
}
@ -248,7 +248,7 @@ func TestAPIStatusEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp api.GlobalPinInfoSerial
makeGet(t, "/pins/"+test.TestCid1, &resp)
makeGet(t, apiURL(rest)+"/pins/"+test.TestCid1, &resp)
if resp.Cid != test.TestCid1 {
t.Error("expected the same cid")
@ -263,7 +263,7 @@ func TestAPIStatusEndpoint(t *testing.T) {
// Test local=true
var resp2 api.GlobalPinInfoSerial
makeGet(t, "/pins/"+test.TestCid1+"?local=true", &resp2)
makeGet(t, apiURL(rest)+"/pins/"+test.TestCid1+"?local=true", &resp2)
if resp2.Cid != test.TestCid1 {
t.Error("expected the same cid")
@ -282,7 +282,7 @@ func TestAPISyncAllEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp []api.GlobalPinInfoSerial
makePost(t, "/pins/sync", []byte{}, &resp)
makePost(t, apiURL(rest)+"/pins/sync", []byte{}, &resp)
if len(resp) != 3 ||
resp[0].Cid != test.TestCid1 ||
@ -292,7 +292,7 @@ func TestAPISyncAllEndpoint(t *testing.T) {
// Test local=true
var resp2 []api.GlobalPinInfoSerial
makePost(t, "/pins/sync?local=true", []byte{}, &resp2)
makePost(t, apiURL(rest)+"/pins/sync?local=true", []byte{}, &resp2)
if len(resp2) != 2 {
t.Errorf("unexpected syncAll+local resp:\n %+v", resp2)
@ -304,7 +304,7 @@ func TestAPISyncEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp api.GlobalPinInfoSerial
makePost(t, "/pins/"+test.TestCid1+"/sync", []byte{}, &resp)
makePost(t, apiURL(rest)+"/pins/"+test.TestCid1+"/sync", []byte{}, &resp)
if resp.Cid != test.TestCid1 {
t.Error("expected the same cid")
@ -319,7 +319,7 @@ func TestAPISyncEndpoint(t *testing.T) {
// Test local=true
var resp2 api.GlobalPinInfoSerial
makePost(t, "/pins/"+test.TestCid1+"/sync?local=true", []byte{}, &resp2)
makePost(t, apiURL(rest)+"/pins/"+test.TestCid1+"/sync?local=true", []byte{}, &resp2)
if resp2.Cid != test.TestCid1 {
t.Error("expected the same cid")
@ -338,7 +338,7 @@ func TestAPIRecoverEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp api.GlobalPinInfoSerial
makePost(t, "/pins/"+test.TestCid1+"/recover", []byte{}, &resp)
makePost(t, apiURL(rest)+"/pins/"+test.TestCid1+"/recover", []byte{}, &resp)
if resp.Cid != test.TestCid1 {
t.Error("expected the same cid")
@ -357,14 +357,14 @@ func TestAPIRecoverAllEndpoint(t *testing.T) {
defer rest.Shutdown()
var resp []api.GlobalPinInfoSerial
makePost(t, "/pins/recover?local=true", []byte{}, &resp)
makePost(t, apiURL(rest)+"/pins/recover?local=true", []byte{}, &resp)
if len(resp) != 0 {
t.Fatal("bad response length")
}
var errResp api.Error
makePost(t, "/pins/recover", []byte{}, &errResp)
makePost(t, apiURL(rest)+"/pins/recover", []byte{}, &errResp)
if errResp.Code != 400 {
t.Error("expected a different error")
}

3
ci/Jenkinsfile vendored
View File

@ -1 +1,2 @@
golang([test: "go test -loglevel CRITICAL -v ./..."])
golang([test: "go test -v -timeout 20m ./..."])

12
cluster.go
View File

@ -54,7 +54,7 @@ type Cluster struct {
readyB bool
wg sync.WaitGroup
// paMux sync.Mutex
paMux sync.Mutex
}
// NewCluster builds a new IPFS Cluster peer. It initializes a LibP2P host,
@ -92,8 +92,8 @@ func NewCluster(
}
peerManager := newPeerManager(host)
peerManager.importAddresses(cfg.Peers)
peerManager.importAddresses(cfg.Bootstrap)
peerManager.importAddresses(cfg.Peers, false)
peerManager.importAddresses(cfg.Bootstrap, false)
c := &Cluster{
ctx: ctx,
@ -614,8 +614,8 @@ func (c *Cluster) PeerAdd(addr ma.Multiaddr) (api.ID, error) {
// starting 10 nodes on the same box for testing
// causes deadlock and a global lock here
// seems to help.
// c.paMux.Lock()
// defer c.paMux.Unlock()
c.paMux.Lock()
defer c.paMux.Unlock()
logger.Debugf("peerAdd called with %s", addr)
pid, decapAddr, err := multiaddrSplit(addr)
if err != nil {
@ -761,7 +761,7 @@ func (c *Cluster) Join(addr ma.Multiaddr) error {
}
// Add peer to peerstore so we can talk to it
c.peerManager.addPeer(addr)
c.peerManager.addPeer(addr, true)
// Note that PeerAdd() on the remote peer will
// figure out what our real address is (obviously not

75
consensus/raft/consensus_test.go
View File

@ -22,11 +22,17 @@ import (
ma "github.com/multiformats/go-multiaddr"
)
var p2pPort = 10000
var p2pPortAlt = 11000
func cleanRaft(idn int) {
os.RemoveAll(fmt.Sprintf("raftFolderFromTests-%d", idn))
}
func cleanRaft(port int) {
os.RemoveAll(fmt.Sprintf("raftFolderFromTests%d", port))
func consensusListenAddr(c *Consensus) ma.Multiaddr {
return c.host.Addrs()[0]
}
func consensusAddr(c *Consensus) ma.Multiaddr {
cAddr, _ := ma.NewMultiaddr(fmt.Sprintf("%s/ipfs/%s", consensusListenAddr(c), c.host.ID().Pretty()))
return cAddr
}
func init() {
@ -34,10 +40,13 @@ func init() {
//logging.SetLogLevel("consensus", "DEBUG")
}
func makeTestingHost(t *testing.T, port int) host.Host {
func makeTestingHost(t *testing.T) host.Host {
priv, pub, _ := crypto.GenerateKeyPair(crypto.RSA, 2048)
pid, _ := peer.IDFromPublicKey(pub)
maddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", port))
//maddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", idn))
// Bind on random port
maddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
ps := peerstore.NewPeerstore()
ps.AddPubKey(pid, pub)
ps.AddPrivKey(pid, priv)
@ -49,13 +58,13 @@ func makeTestingHost(t *testing.T, port int) host.Host {
return basichost.New(n)
}
func testingConsensus(t *testing.T, port int) *Consensus {
h := makeTestingHost(t, port)
func testingConsensus(t *testing.T, idn int) *Consensus {
h := makeTestingHost(t)
st := mapstate.NewMapState()
cfg := &Config{}
cfg.Default()
cfg.DataFolder = fmt.Sprintf("raftFolderFromTests%d", port)
cfg.DataFolder = fmt.Sprintf("raftFolderFromTests-%d", idn)
cfg.hostShutdown = true
cc, err := NewConsensus([]peer.ID{h.ID()}, h, cfg, st)
@ -71,7 +80,7 @@ func testingConsensus(t *testing.T, port int) *Consensus {
func TestShutdownConsensus(t *testing.T) {
// Bring it up twice to make sure shutdown cleans up properly
// but also to make sure raft comes up ok when re-initialized
cc := testingConsensus(t, p2pPort)
cc := testingConsensus(t, 1)
err := cc.Shutdown()
if err != nil {
t.Fatal("Consensus cannot shutdown:", err)
@ -80,19 +89,19 @@ func TestShutdownConsensus(t *testing.T) {
if err != nil {
t.Fatal("Consensus should be able to shutdown several times")
}
cleanRaft(p2pPort)
cleanRaft(1)
cc = testingConsensus(t, p2pPort)
cc = testingConsensus(t, 1)
err = cc.Shutdown()
if err != nil {
t.Fatal("Consensus cannot shutdown:", err)
}
cleanRaft(p2pPort)
cleanRaft(1)
}
func TestConsensusPin(t *testing.T) {
cc := testingConsensus(t, p2pPort)
defer cleanRaft(p2pPort) // Remember defer runs in LIFO order
cc := testingConsensus(t, 1)
defer cleanRaft(1) // Remember defer runs in LIFO order
defer cc.Shutdown()
c, _ := cid.Decode(test.TestCid1)
@ -114,8 +123,8 @@ func TestConsensusPin(t *testing.T) {
}
func TestConsensusUnpin(t *testing.T) {
cc := testingConsensus(t, p2pPort)
defer cleanRaft(p2pPort)
cc := testingConsensus(t, 1)
defer cleanRaft(1)
defer cc.Shutdown()
c, _ := cid.Decode(test.TestCid2)
@ -126,18 +135,16 @@ func TestConsensusUnpin(t *testing.T) {
}
func TestConsensusAddPeer(t *testing.T) {
cc := testingConsensus(t, p2pPort)
cc2 := testingConsensus(t, p2pPortAlt)
cc := testingConsensus(t, 1)
cc2 := testingConsensus(t, 2)
t.Log(cc.host.ID().Pretty())
t.Log(cc2.host.ID().Pretty())
defer cleanRaft(p2pPort)
defer cleanRaft(p2pPortAlt)
defer cleanRaft(1)
defer cleanRaft(2)
defer cc.Shutdown()
defer cc2.Shutdown()
addr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", p2pPortAlt))
cc.host.Peerstore().AddAddr(cc2.host.ID(), addr, peerstore.PermanentAddrTTL)
cc.host.Peerstore().AddAddr(cc2.host.ID(), consensusListenAddr(cc2), peerstore.PermanentAddrTTL)
err := cc.AddPeer(cc2.host.ID())
if err != nil {
t.Error("the operation did not make it to the log:", err)
@ -161,16 +168,14 @@ func TestConsensusAddPeer(t *testing.T) {
}
func TestConsensusRmPeer(t *testing.T) {
cc := testingConsensus(t, p2pPort)
cc2 := testingConsensus(t, p2pPortAlt)
defer cleanRaft(p2pPort)
defer cleanRaft(p2pPortAlt)
cc := testingConsensus(t, 1)
cc2 := testingConsensus(t, 2)
defer cleanRaft(1)
defer cleanRaft(2)
defer cc.Shutdown()
defer cc2.Shutdown()
//addr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", p2pPort))
addr2, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", p2pPortAlt))
cc.host.Peerstore().AddAddr(cc2.host.ID(), addr2, peerstore.PermanentAddrTTL)
cc.host.Peerstore().AddAddr(cc2.host.ID(), consensusListenAddr(cc2), peerstore.PermanentAddrTTL)
err := cc.AddPeer(cc2.host.ID())
if err != nil {
@ -213,9 +218,9 @@ func TestConsensusRmPeer(t *testing.T) {
}
func TestConsensusLeader(t *testing.T) {
cc := testingConsensus(t, p2pPort)
cc := testingConsensus(t, 1)
pID := cc.host.ID()
defer cleanRaft(p2pPort)
defer cleanRaft(1)
defer cc.Shutdown()
l, err := cc.Leader()
if err != nil {
@ -228,8 +233,8 @@ func TestConsensusLeader(t *testing.T) {
}
func TestRaftLatestSnapshot(t *testing.T) {
cc := testingConsensus(t, p2pPort)
defer cleanRaft(p2pPort)
cc := testingConsensus(t, 1)
defer cleanRaft(1)
defer cc.Shutdown()
// Make pin 1

8
consensus/raft/log_op_test.go
View File

@ -11,13 +11,13 @@ import (
)
func TestApplyToPin(t *testing.T) {
cc := testingConsensus(t, p2pPort)
cc := testingConsensus(t, 1)
op := &LogOp{
Cid: api.PinSerial{Cid: test.TestCid1},
Type: LogOpPin,
consensus: cc,
}
defer cleanRaft(p2pPort)
defer cleanRaft(1)
defer cc.Shutdown()
st := mapstate.NewMapState()
@ -29,13 +29,13 @@ func TestApplyToPin(t *testing.T) {
}
func TestApplyToUnpin(t *testing.T) {
cc := testingConsensus(t, p2pPort)
cc := testingConsensus(t, 1)
op := &LogOp{
Cid: api.PinSerial{Cid: test.TestCid1},
Type: LogOpUnpin,
consensus: cc,
}
defer cleanRaft(p2pPort)
defer cleanRaft(1)
defer cc.Shutdown()
st := mapstate.NewMapState()

88
ipfscluster_test.go
View File

@ -39,10 +39,10 @@ var (
logLevel = "CRITICAL"
// ports
clusterPort = 10000
apiPort = 10100
ipfsProxyPort = 10200
// When testing with fixed ports...
// clusterPort = 10000
// apiPort = 10100
// ipfsProxyPort = 10200
)
func init() {
@ -79,9 +79,16 @@ func randomBytes() []byte {
func createComponents(t *testing.T, i int, clusterSecret []byte) (*Config, *raft.Config, API, IPFSConnector, state.State, PinTracker, PeerMonitor, PinAllocator, Informer, *test.IpfsMock) {
mock := test.NewIpfsMock()
clusterAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", clusterPort+i))
apiAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", apiPort+i))
proxyAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", ipfsProxyPort+i))
//
//clusterAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", clusterPort+i))
// Bind on port 0
clusterAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
//apiAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", apiPort+i))
// Bind on port 0
apiAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
// Bind on Port 0
// proxyAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", ipfsProxyPort+i))
proxyAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
nodeAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%d", mock.Addr, mock.Port))
priv, pub, err := crypto.GenerateKeyPair(crypto.RSA, 2048)
checkErr(t, err)
@ -144,7 +151,9 @@ func createClusters(t *testing.T) ([]*Cluster, []*test.IpfsMock) {
ipfsMocks := make([]*test.IpfsMock, nClusters, nClusters)
clusters := make([]*Cluster, nClusters, nClusters)
clusterPeers := make([]ma.Multiaddr, nClusters, nClusters)
// Uncomment when testing with fixed ports
// clusterPeers := make([]ma.Multiaddr, nClusters, nClusters)
for i := 0; i < nClusters; i++ {
clusterCfg, consensusCfg, api, ipfs, state, tracker, mon, alloc, inf, mock := createComponents(t, i, testingClusterSecret)
cfgs[i] = clusterCfg
@ -157,32 +166,49 @@ func createClusters(t *testing.T) ([]*Cluster, []*test.IpfsMock) {
allocs[i] = alloc
infs[i] = inf
ipfsMocks[i] = mock
addr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d/ipfs/%s",
clusterPort+i,
clusterCfg.ID.Pretty()))
clusterPeers[i] = addr
// Uncomment with testing with fixed ports and ClusterPeers
// addr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d/ipfs/%s",
// clusterPort+i,
// clusterCfg.ID.Pretty()))
// clusterPeers[i] = addr
}
// Set up the cluster using ClusterPeers
for i := 0; i < nClusters; i++ {
cfgs[i].Peers = make([]ma.Multiaddr, nClusters, nClusters)
for j := 0; j < nClusters; j++ {
cfgs[i].Peers[j] = clusterPeers[j]
}
}
// ----------------------------------------------------------
// Alternative way of starting using bootstrap
// for i := 1; i < nClusters; i++ {
// addr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d/ipfs/%s",
// clusterPort,
// cfgs[0].ID.Pretty()))
// // Use previous cluster for bootstrapping
// cfgs[i].Bootstrap = []ma.Multiaddr{addr}
// // Set up the cluster using ClusterPeers
// for i := 0; i < nClusters; i++ {
// cfgs[i].Peers = make([]ma.Multiaddr, nClusters, nClusters)
// for j := 0; j < nClusters; j++ {
// cfgs[i].Peers[j] = clusterPeers[j]
// }
// }
// var wg sync.WaitGroup
// for i := 0; i < nClusters; i++ {
// wg.Add(1)
// go func(i int) {
// clusters[i] = createCluster(t, cfgs[i], concfgs[i], apis[i], ipfss[i], states[i], trackers[i], mons[i], allocs[i], infs[i])
// wg.Done()
// }(i)
// }
// wg.Wait()
// ----------------------------------------------
// Alternative way of starting using bootstrap
// Start first node
clusters[0] = createCluster(t, cfgs[0], concfgs[0], apis[0], ipfss[0], states[0], trackers[0], mons[0], allocs[0], infs[0])
// Find out where it binded
bootstrapAddr, _ := ma.NewMultiaddr(fmt.Sprintf("%s/ipfs/%s", clusters[0].host.Addrs()[0], clusters[0].id.Pretty()))
// Use first node to bootstrap
for i := 1; i < nClusters; i++ {
cfgs[i].Bootstrap = []ma.Multiaddr{bootstrapAddr}
}
// Start the rest
var wg sync.WaitGroup
for i := 0; i < nClusters; i++ {
for i := 1; i < nClusters; i++ {
wg.Add(1)
go func(i int) {
clusters[i] = createCluster(t, cfgs[i], concfgs[i], apis[i], ipfss[i], states[i], trackers[i], mons[i], allocs[i], infs[i])
@ -191,11 +217,14 @@ func createClusters(t *testing.T) ([]*Cluster, []*test.IpfsMock) {
}
wg.Wait()
// ---------------------------------------------
// Yet an alternative way using PeerAdd
// for i := 1; i < nClusters; i++ {
// clusters[0].PeerAdd(clusterAddr(clusters[i]))
// }
delay()
delay()
return clusters, ipfsMocks
}
@ -280,6 +309,7 @@ func TestClustersPeers(t *testing.T) {
j := rand.Intn(nClusters) // choose a random cluster peer
peers := clusters[j].Peers()
if len(peers) != nClusters {
t.Fatal("expected as many peers as clusters")
}
@ -1307,7 +1337,7 @@ func TestClustersRebalanceOnPeerDown(t *testing.T) {
// pin something
h, _ := cid.Decode(test.TestCid1)
clusters[0].Pin(api.PinCid(h))
time.Sleep(time.Second / 2) // let the pin arrive
time.Sleep(time.Second * 2) // let the pin arrive
pinLocal := 0
pinRemote := 0
var localPinner peer.ID

4
ipfsconn/ipfshttp/ipfshttp.go
View File

@ -177,7 +177,9 @@ func (ipfs *Connector) run() {
defer tmr.Stop()
select {
case <-tmr.C:
ipfs.ConnectSwarms()
// do not hang this goroutine if this call hangs
// otherwise we hang during shutdown
go ipfs.ConnectSwarms()
case <-ipfs.ctx.Done():
return
}

7
ipfsconn/ipfshttp/ipfshttp_test.go
View File

@ -17,7 +17,6 @@ import (
cid "github.com/ipfs/go-cid"
logging "github.com/ipfs/go-log"
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr-net"
)
func init() {
@ -28,7 +27,7 @@ func testIPFSConnector(t *testing.T) (*Connector, *test.IpfsMock) {
mock := test.NewIpfsMock()
nodeMAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%d",
mock.Addr, mock.Port))
proxyMAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/10001")
proxyMAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
cfg := &Config{}
cfg.Default()
@ -604,6 +603,6 @@ func TestConfigKey(t *testing.T) {
}
func proxyURL(c *Connector) string {
_, addr, _ := manet.DialArgs(c.config.ProxyAddr)
return fmt.Sprintf("http://%s/api/v0", addr)
addr := c.listener.Addr()
return fmt.Sprintf("http://%s/api/v0", addr.String())
}

17
peer_manager.go
View File

@ -15,13 +15,17 @@ import (
// peerManager provides wrappers peerset control
type peerManager struct {
host host.Host
ctx context.Context
}
func newPeerManager(h host.Host) *peerManager {
return &peerManager{h}
return &peerManager{
ctx: context.Background(),
host: h,
}
}
func (pm *peerManager) addPeer(addr ma.Multiaddr) error {
func (pm *peerManager) addPeer(addr ma.Multiaddr, connect bool) error {
logger.Debugf("adding peer address %s", addr)
pid, decapAddr, err := multiaddrSplit(addr)
if err != nil {
@ -39,7 +43,10 @@ func (pm *peerManager) addPeer(addr ma.Multiaddr) error {
logger.Error(err)
return err
}
pm.importAddresses(resolvedAddrs)
pm.importAddresses(resolvedAddrs, connect)
}
if connect {
pm.host.Network().DialPeer(pm.ctx, pid)
}
return nil
}
@ -69,9 +76,9 @@ func (pm *peerManager) addresses(peers []peer.ID) []ma.Multiaddr {
return addrs
}
func (pm *peerManager) importAddresses(addrs []ma.Multiaddr) error {
func (pm *peerManager) importAddresses(addrs []ma.Multiaddr, connect bool) error {
for _, a := range addrs {
pm.addPeer(a)
pm.addPeer(a, connect)
}
return nil
}

96
peer_manager_test.go
View File

@ -1,7 +1,7 @@
package ipfscluster
import (
"math/rand"
"fmt"
"sync"
"testing"
"time"
@ -34,7 +34,9 @@ func peerManagerClusters(t *testing.T) ([]*Cluster, []*test.IpfsMock) {
}
func clusterAddr(c *Cluster) ma.Multiaddr {
return multiaddrJoin(c.config.ListenAddr, c.ID().ID)
cAddr, _ := ma.NewMultiaddr(fmt.Sprintf("%s/ipfs/%s", c.host.Addrs()[0], c.id.Pretty()))
return cAddr
//return multiaddrJoin(c.config.ListenAddr, c.ID().ID)
}
func TestClustersPeerAdd(t *testing.T) {
@ -114,10 +116,17 @@ func TestClustersPeerAddBadPeer(t *testing.T) {
t.Skip("need at least 2 nodes for this test")
}
badClusterAddr := clusterAddr(clusters[1])
// We add a cluster that has been shutdown
// (closed transports)
clusters[1].Shutdown()
_, err := clusters[0].PeerAdd(clusterAddr(clusters[1]))
// Let the OS actually close the ports.
// Sometimes we hang otherwise.
delay()
_, err := clusters[0].PeerAdd(badClusterAddr)
if err == nil {
t.Error("expected an error")
}
@ -445,51 +454,54 @@ func TestClustersPeerJoinAllAtOnce(t *testing.T) {
runF(t, clusters, f2)
}
func TestClustersPeerJoinAllAtOnceWithRandomBootstrap(t *testing.T) {
clusters, mocks := peerManagerClusters(t)
defer shutdownClusters(t, clusters, mocks)
// This test fails a lot when re-use port is not available (MacOS, Windows)
// func TestClustersPeerJoinAllAtOnceWithRandomBootstrap(t *testing.T) {
// clusters, mocks := peerManagerClusters(t)
// defer shutdownClusters(t, clusters, mocks)
if len(clusters) < 3 {
t.Skip("test needs at least 3 clusters")
}
// if len(clusters) < 3 {
// t.Skip("test needs at least 3 clusters")
// }
// We have a 2 node cluster and the rest of nodes join
// one of the two seeds randomly
// delay()
err := clusters[1].Join(clusterAddr(clusters[0]))
if err != nil {
t.Fatal(err)
}
// // We have a 2 node cluster and the rest of nodes join
// // one of the two seeds randomly
f := func(t *testing.T, c *Cluster) {
j := rand.Intn(2)
err := c.Join(clusterAddr(clusters[j]))
if err != nil {
t.Fatal(err)
}
}
runF(t, clusters[2:], f)
// err := clusters[1].Join(clusterAddr(clusters[0]))
// if err != nil {
// t.Fatal(err)
// }
hash, _ := cid.Decode(test.TestCid1)
clusters[0].Pin(api.PinCid(hash))
delay()
// f := func(t *testing.T, c *Cluster) {
// j := rand.Intn(2)
// err := c.Join(clusterAddr(clusters[j]))
// if err != nil {
// t.Fatal(err)
// }
// }
// runF(t, clusters[2:], f)
f2 := func(t *testing.T, c *Cluster) {
peers := c.Peers()
if len(peers) != nClusters {
peersIds := []peer.ID{}
for _, p := range peers {
peersIds = append(peersIds, p.ID)
}
t.Errorf("%s sees %d peers: %s", c.id, len(peers), peersIds)
}
pins := c.Pins()
if len(pins) != 1 || !pins[0].Cid.Equals(hash) {
t.Error("all peers should have pinned the cid")
}
}
runF(t, clusters, f2)
}
// hash, _ := cid.Decode(test.TestCid1)
// clusters[0].Pin(api.PinCid(hash))
// delay()
// f2 := func(t *testing.T, c *Cluster) {
// peers := c.Peers()
// if len(peers) != nClusters {
// peersIds := []peer.ID{}
// for _, p := range peers {
// peersIds = append(peersIds, p.ID)
// }
// t.Errorf("%s sees %d peers: %s", c.id, len(peers), peersIds)
// }
// pins := c.Pins()
// if len(pins) != 1 || !pins[0].Cid.Equals(hash) {
// t.Error("all peers should have pinned the cid")
// }
// }
// runF(t, clusters, f2)
// }
// Tests that a peer catches up on the state correctly after rejoining
func TestClustersPeerRejoin(t *testing.T) {

4
rpc_api.go
View File

@ -333,14 +333,14 @@ func (rpcapi *RPCAPI) ConsensusPeers(in struct{}, out *[]peer.ID) error {
// PeerManagerAddPeer runs peerManager.addPeer().
func (rpcapi *RPCAPI) PeerManagerAddPeer(in api.MultiaddrSerial, out *struct{}) error {
addr := in.ToMultiaddr()
err := rpcapi.c.peerManager.addPeer(addr)
err := rpcapi.c.peerManager.addPeer(addr, false)
return err
}
// PeerManagerImportAddresses runs peerManager.importAddresses().
func (rpcapi *RPCAPI) PeerManagerImportAddresses(in api.MultiaddrsSerial, out *struct{}) error {
addrs := in.ToMultiaddrs()
err := rpcapi.c.peerManager.importAddresses(addrs)
err := rpcapi.c.peerManager.importAddresses(addrs, false)
return err
}