2017-01-30 12:12:25 +00:00
|
|
|
package ipfscluster
|
|
|
|
|
|
|
|
import (
|
|
|
|
"sync"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
peer "github.com/libp2p/go-libp2p-peer"
|
|
|
|
peerstore "github.com/libp2p/go-libp2p-peerstore"
|
|
|
|
ma "github.com/multiformats/go-multiaddr"
|
|
|
|
)
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
// peerManager is our own local peerstore
|
2017-01-30 12:12:25 +00:00
|
|
|
type peerManager struct {
|
|
|
|
cluster *Cluster
|
2017-02-02 22:52:06 +00:00
|
|
|
ps peerstore.Peerstore
|
|
|
|
self peer.ID
|
2017-01-30 12:12:25 +00:00
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
peermap map[peer.ID]ma.Multiaddr
|
|
|
|
m sync.RWMutex
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func newPeerManager(c *Cluster) *peerManager {
|
|
|
|
pm := &peerManager{
|
|
|
|
cluster: c,
|
2017-02-02 22:52:06 +00:00
|
|
|
ps: c.host.Peerstore(),
|
|
|
|
self: c.host.ID(),
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
2017-02-02 22:52:06 +00:00
|
|
|
pm.resetPeers()
|
2017-01-30 12:12:25 +00:00
|
|
|
return pm
|
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
func (pm *peerManager) addPeer(addr ma.Multiaddr) error {
|
2017-01-30 12:12:25 +00:00
|
|
|
logger.Debugf("adding peer %s", addr)
|
2017-02-02 22:52:06 +00:00
|
|
|
pid, decapAddr, err := multiaddrSplit(addr)
|
2017-01-30 12:12:25 +00:00
|
|
|
if err != nil {
|
2017-02-02 22:52:06 +00:00
|
|
|
return err
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
2017-02-02 22:52:06 +00:00
|
|
|
pm.ps.AddAddr(pid, decapAddr, peerstore.PermanentAddrTTL)
|
2017-01-30 12:12:25 +00:00
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
if !pm.isPeer(pid) {
|
|
|
|
logger.Infof("new Cluster peer %s", addr.String())
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
pm.m.Lock()
|
|
|
|
pm.peermap[pid] = addr
|
|
|
|
pm.m.Unlock()
|
|
|
|
|
|
|
|
return nil
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
func (pm *peerManager) rmPeer(pid peer.ID, selfShutdown bool) error {
|
|
|
|
logger.Debugf("removing peer %s", pid.Pretty())
|
|
|
|
|
|
|
|
if pm.isPeer(pid) {
|
|
|
|
logger.Infof("removing Cluster peer %s", pid.Pretty())
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
2017-02-02 22:52:06 +00:00
|
|
|
|
|
|
|
pm.m.Lock()
|
|
|
|
delete(pm.peermap, pid)
|
|
|
|
pm.m.Unlock()
|
2017-01-30 12:12:25 +00:00
|
|
|
|
|
|
|
// It's ourselves. This is not very graceful
|
2017-02-02 22:52:06 +00:00
|
|
|
if pid == pm.self && selfShutdown {
|
|
|
|
logger.Warning("this peer has been removed from the Cluster and will shutdown itself in 5 seconds")
|
2017-01-30 12:12:25 +00:00
|
|
|
defer func() {
|
|
|
|
go func() {
|
2017-02-02 22:52:06 +00:00
|
|
|
time.Sleep(1 * time.Second)
|
2017-01-30 12:12:25 +00:00
|
|
|
pm.cluster.consensus.Shutdown()
|
2017-10-07 17:27:36 +00:00
|
|
|
pm.cluster.config.Bootstrap = pm.peersAddrs()
|
Issue #162: Rework configuration format
The following commit reimplements ipfs-cluster configuration under
the following premises:
* Each component is initialized with a configuration object
defined by its module
* Each component decides how the JSON representation of its
configuration looks like
* Each component parses and validates its own configuration
* Each component exposes its own defaults
* Component configurations are make the sections of a
central JSON configuration file (which replaces the current
JSON format)
* Component configurations implement a common interface
(config.ComponentConfig) with a set of common operations
* The central configuration file is managed by a
config.ConfigManager which:
* Registers ComponentConfigs
* Assigns the correspondent sections from the JSON file to each
component and delegates the parsing
* Delegates the JSON generation for each section
* Can be notified when the configuration is updated and must be
saved to disk
The new service.json would then look as follows:
```json
{
"cluster": {
"id": "QmTVW8NoRxC5wBhV7WtAYtRn7itipEESfozWN5KmXUQnk2",
"private_key": "<...>",
"secret": "00224102ae6aaf94f2606abf69a0e278251ecc1d64815b617ff19d6d2841f786",
"peers": [],
"bootstrap": [],
"leave_on_shutdown": false,
"listen_multiaddress": "/ip4/0.0.0.0/tcp/9096",
"state_sync_interval": "1m0s",
"ipfs_sync_interval": "2m10s",
"replication_factor": -1,
"monitor_ping_interval": "15s"
},
"consensus": {
"raft": {
"heartbeat_timeout": "1s",
"election_timeout": "1s",
"commit_timeout": "50ms",
"max_append_entries": 64,
"trailing_logs": 10240,
"snapshot_interval": "2m0s",
"snapshot_threshold": 8192,
"leader_lease_timeout": "500ms"
}
},
"api": {
"restapi": {
"listen_multiaddress": "/ip4/127.0.0.1/tcp/9094",
"read_timeout": "30s",
"read_header_timeout": "5s",
"write_timeout": "1m0s",
"idle_timeout": "2m0s"
}
},
"ipfs_connector": {
"ipfshttp": {
"proxy_listen_multiaddress": "/ip4/127.0.0.1/tcp/9095",
"node_multiaddress": "/ip4/127.0.0.1/tcp/5001",
"connect_swarms_delay": "7s",
"proxy_read_timeout": "10m0s",
"proxy_read_header_timeout": "5s",
"proxy_write_timeout": "10m0s",
"proxy_idle_timeout": "1m0s"
}
},
"monitor": {
"monbasic": {
"check_interval": "15s"
}
},
"informer": {
"disk": {
"metric_ttl": "30s",
"metric_type": "freespace"
},
"numpin": {
"metric_ttl": "10s"
}
}
}
```
This new format aims to be easily extensible per component. As such,
it already surfaces quite a few new options which were hardcoded
before.
Additionally, since Go API have changed, some redundant methods have been
removed and small refactoring has happened to take advantage of the new
way.
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
2017-10-11 18:23:03 +00:00
|
|
|
pm.cluster.config.NotifySave()
|
2017-02-02 22:52:06 +00:00
|
|
|
pm.resetPeers()
|
|
|
|
time.Sleep(4 * time.Second)
|
|
|
|
pm.cluster.Shutdown()
|
2017-01-30 12:12:25 +00:00
|
|
|
}()
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
func (pm *peerManager) savePeers() {
|
Issue #162: Rework configuration format
The following commit reimplements ipfs-cluster configuration under
the following premises:
* Each component is initialized with a configuration object
defined by its module
* Each component decides how the JSON representation of its
configuration looks like
* Each component parses and validates its own configuration
* Each component exposes its own defaults
* Component configurations are make the sections of a
central JSON configuration file (which replaces the current
JSON format)
* Component configurations implement a common interface
(config.ComponentConfig) with a set of common operations
* The central configuration file is managed by a
config.ConfigManager which:
* Registers ComponentConfigs
* Assigns the correspondent sections from the JSON file to each
component and delegates the parsing
* Delegates the JSON generation for each section
* Can be notified when the configuration is updated and must be
saved to disk
The new service.json would then look as follows:
```json
{
"cluster": {
"id": "QmTVW8NoRxC5wBhV7WtAYtRn7itipEESfozWN5KmXUQnk2",
"private_key": "<...>",
"secret": "00224102ae6aaf94f2606abf69a0e278251ecc1d64815b617ff19d6d2841f786",
"peers": [],
"bootstrap": [],
"leave_on_shutdown": false,
"listen_multiaddress": "/ip4/0.0.0.0/tcp/9096",
"state_sync_interval": "1m0s",
"ipfs_sync_interval": "2m10s",
"replication_factor": -1,
"monitor_ping_interval": "15s"
},
"consensus": {
"raft": {
"heartbeat_timeout": "1s",
"election_timeout": "1s",
"commit_timeout": "50ms",
"max_append_entries": 64,
"trailing_logs": 10240,
"snapshot_interval": "2m0s",
"snapshot_threshold": 8192,
"leader_lease_timeout": "500ms"
}
},
"api": {
"restapi": {
"listen_multiaddress": "/ip4/127.0.0.1/tcp/9094",
"read_timeout": "30s",
"read_header_timeout": "5s",
"write_timeout": "1m0s",
"idle_timeout": "2m0s"
}
},
"ipfs_connector": {
"ipfshttp": {
"proxy_listen_multiaddress": "/ip4/127.0.0.1/tcp/9095",
"node_multiaddress": "/ip4/127.0.0.1/tcp/5001",
"connect_swarms_delay": "7s",
"proxy_read_timeout": "10m0s",
"proxy_read_header_timeout": "5s",
"proxy_write_timeout": "10m0s",
"proxy_idle_timeout": "1m0s"
}
},
"monitor": {
"monbasic": {
"check_interval": "15s"
}
},
"informer": {
"disk": {
"metric_ttl": "30s",
"metric_type": "freespace"
},
"numpin": {
"metric_ttl": "10s"
}
}
}
```
This new format aims to be easily extensible per component. As such,
it already surfaces quite a few new options which were hardcoded
before.
Additionally, since Go API have changed, some redundant methods have been
removed and small refactoring has happened to take advantage of the new
way.
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
2017-10-11 18:23:03 +00:00
|
|
|
pm.cluster.config.Peers = pm.peersAddrs()
|
|
|
|
pm.cluster.config.NotifySave()
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
func (pm *peerManager) resetPeers() {
|
|
|
|
pm.m.Lock()
|
|
|
|
pm.peermap = make(map[peer.ID]ma.Multiaddr)
|
Issue #162: Rework configuration format
The following commit reimplements ipfs-cluster configuration under
the following premises:
* Each component is initialized with a configuration object
defined by its module
* Each component decides how the JSON representation of its
configuration looks like
* Each component parses and validates its own configuration
* Each component exposes its own defaults
* Component configurations are make the sections of a
central JSON configuration file (which replaces the current
JSON format)
* Component configurations implement a common interface
(config.ComponentConfig) with a set of common operations
* The central configuration file is managed by a
config.ConfigManager which:
* Registers ComponentConfigs
* Assigns the correspondent sections from the JSON file to each
component and delegates the parsing
* Delegates the JSON generation for each section
* Can be notified when the configuration is updated and must be
saved to disk
The new service.json would then look as follows:
```json
{
"cluster": {
"id": "QmTVW8NoRxC5wBhV7WtAYtRn7itipEESfozWN5KmXUQnk2",
"private_key": "<...>",
"secret": "00224102ae6aaf94f2606abf69a0e278251ecc1d64815b617ff19d6d2841f786",
"peers": [],
"bootstrap": [],
"leave_on_shutdown": false,
"listen_multiaddress": "/ip4/0.0.0.0/tcp/9096",
"state_sync_interval": "1m0s",
"ipfs_sync_interval": "2m10s",
"replication_factor": -1,
"monitor_ping_interval": "15s"
},
"consensus": {
"raft": {
"heartbeat_timeout": "1s",
"election_timeout": "1s",
"commit_timeout": "50ms",
"max_append_entries": 64,
"trailing_logs": 10240,
"snapshot_interval": "2m0s",
"snapshot_threshold": 8192,
"leader_lease_timeout": "500ms"
}
},
"api": {
"restapi": {
"listen_multiaddress": "/ip4/127.0.0.1/tcp/9094",
"read_timeout": "30s",
"read_header_timeout": "5s",
"write_timeout": "1m0s",
"idle_timeout": "2m0s"
}
},
"ipfs_connector": {
"ipfshttp": {
"proxy_listen_multiaddress": "/ip4/127.0.0.1/tcp/9095",
"node_multiaddress": "/ip4/127.0.0.1/tcp/5001",
"connect_swarms_delay": "7s",
"proxy_read_timeout": "10m0s",
"proxy_read_header_timeout": "5s",
"proxy_write_timeout": "10m0s",
"proxy_idle_timeout": "1m0s"
}
},
"monitor": {
"monbasic": {
"check_interval": "15s"
}
},
"informer": {
"disk": {
"metric_ttl": "30s",
"metric_type": "freespace"
},
"numpin": {
"metric_ttl": "10s"
}
}
}
```
This new format aims to be easily extensible per component. As such,
it already surfaces quite a few new options which were hardcoded
before.
Additionally, since Go API have changed, some redundant methods have been
removed and small refactoring has happened to take advantage of the new
way.
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
2017-10-11 18:23:03 +00:00
|
|
|
pm.peermap[pm.self] = pm.cluster.config.ListenAddr
|
2017-02-02 22:52:06 +00:00
|
|
|
pm.m.Unlock()
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
func (pm *peerManager) isPeer(p peer.ID) bool {
|
|
|
|
if p == pm.self {
|
|
|
|
return true
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
2017-02-02 22:52:06 +00:00
|
|
|
|
|
|
|
pm.m.RLock()
|
|
|
|
_, ok := pm.peermap[p]
|
|
|
|
pm.m.RUnlock()
|
|
|
|
return ok
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
// peers including ourselves
|
|
|
|
func (pm *peerManager) peers() []peer.ID {
|
|
|
|
pm.m.RLock()
|
|
|
|
defer pm.m.RUnlock()
|
|
|
|
var peers []peer.ID
|
|
|
|
for k := range pm.peermap {
|
|
|
|
peers = append(peers, k)
|
|
|
|
}
|
|
|
|
return peers
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
// cluster peer addresses (NOT including ourselves)
|
|
|
|
func (pm *peerManager) peersAddrs() []ma.Multiaddr {
|
|
|
|
pm.m.RLock()
|
|
|
|
defer pm.m.RUnlock()
|
|
|
|
var addrs []ma.Multiaddr
|
|
|
|
for k, addr := range pm.peermap {
|
|
|
|
if k != pm.self {
|
|
|
|
addrs = append(addrs, addr)
|
|
|
|
}
|
2017-01-30 12:12:25 +00:00
|
|
|
}
|
2017-02-02 22:52:06 +00:00
|
|
|
return addrs
|
|
|
|
}
|
2017-01-30 12:12:25 +00:00
|
|
|
|
2017-02-02 22:52:06 +00:00
|
|
|
// func (pm *peerManager) addFromConfig(cfg *Config) error {
|
|
|
|
// return pm.addFromMultiaddrs(cfg.ClusterPeers)
|
|
|
|
// }
|
|
|
|
|
|
|
|
func (pm *peerManager) addFromMultiaddrs(addrs []ma.Multiaddr) error {
|
|
|
|
for _, m := range addrs {
|
|
|
|
err := pm.addPeer(m)
|
2017-01-30 12:12:25 +00:00
|
|
|
if err != nil {
|
2017-02-02 22:52:06 +00:00
|
|
|
logger.Error(err)
|
2017-01-30 12:12:25 +00:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|