PoS_EVM
/
woop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gossip all consensus messages

Browse Source 
clean up some debug logs

Signed-off-by: Leo Chen <leo@harmony.one>
pull/428/head
Leo Chen 6 years ago
parent 25485c655c
commit 7b0769c651
8 changed files with 23 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      api/service/networkinfo/service.go
  2. 2
      consensus/consensus.go
  3. 7
      consensus/consensus_leader.go
  4. 5
      consensus/consensus_validator.go
  5. 14
      node/node_handler.go
  6. 2
      p2p/host/hostv2/hostv2.go
  7. 5
      test/configs/oneshard1.txt
  8. 2
      test/deploy.sh

3
api/service/networkinfo/service.go
Unescape View File

@ -28,7 +28,6 @@ type Service struct {
peerChan chan p2p.Peer peerChan chan p2p.Peer
peerInfo <-chan peerstore.PeerInfo peerInfo <-chan peerstore.PeerInfo
discovery *libp2pdis.RoutingDiscovery discovery *libp2pdis.RoutingDiscovery
lock sync.Mutex
} }
// New returns role conversion service. // New returns role conversion service.
@ -112,13 +111,11 @@ func (s *Service) DoService() {
case peer := <-s.peerInfo: case peer := <-s.peerInfo:
if peer.ID != s.Host.GetP2PHost().ID() && len(peer.ID) > 0 { if peer.ID != s.Host.GetP2PHost().ID() && len(peer.ID) > 0 {
utils.GetLogInstance().Info("Found Peer", "peer", peer.ID, "addr", peer.Addrs, "my ID", s.Host.GetP2PHost().ID()) utils.GetLogInstance().Info("Found Peer", "peer", peer.ID, "addr", peer.Addrs, "my ID", s.Host.GetP2PHost().ID())
s.lock.Lock()
if err := s.Host.GetP2PHost().Connect(s.ctx, peer); err != nil { if err := s.Host.GetP2PHost().Connect(s.ctx, peer); err != nil {
utils.GetLogInstance().Warn("can't connect to peer node", "error", err) utils.GetLogInstance().Warn("can't connect to peer node", "error", err)
} else { } else {
utils.GetLogInstance().Info("connected to peer node", "peer", peer) utils.GetLogInstance().Info("connected to peer node", "peer", peer)
} }
s.lock.Unlock()
// figure out the public ip/port // figure out the public ip/port
ip := "127.0.0.1" ip := "127.0.0.1"
var port string var port string

2
consensus/consensus.go
Unescape View File

@ -379,7 +379,7 @@ func (consensus *Consensus) AddPeers(peers []*p2p.Peer) int {
consensus.pubKeyLock.Lock() consensus.pubKeyLock.Lock()
consensus.PublicKeys = append(consensus.PublicKeys, peer.PubKey) consensus.PublicKeys = append(consensus.PublicKeys, peer.PubKey)
consensus.pubKeyLock.Unlock() consensus.pubKeyLock.Unlock()
utils.GetLogInstance().Debug("[SYNC]", "new peer added", peer) // utils.GetLogInstance().Debug("[SYNC]", "new peer added", peer)
} }
count++ count++
} }

7
consensus/consensus_leader.go
Unescape View File

@ -109,7 +109,8 @@ func (consensus *Consensus) startConsensus(newBlock *types.Block) {
consensus.prepareSigs[consensus.nodeID] = consensus.priKey.SignHash(consensus.blockHash[:]) consensus.prepareSigs[consensus.nodeID] = consensus.priKey.SignHash(consensus.blockHash[:])
if utils.UseLibP2P { if utils.UseLibP2P {
consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, msgToSend) // Construct broadcast p2p message
consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, host.ConstructP2pMessage(byte(17), msgToSend))
} else { } else {
host.BroadcastMessageFromLeader(consensus.host, consensus.GetValidatorPeers(), msgToSend, consensus.OfflinePeers) host.BroadcastMessageFromLeader(consensus.host, consensus.GetValidatorPeers(), msgToSend, consensus.OfflinePeers)
} }
@ -171,7 +172,7 @@ func (consensus *Consensus) processPrepareMessage(message consensus_proto.Messag
consensus.aggregatedPrepareSig = aggSig consensus.aggregatedPrepareSig = aggSig
if utils.UseLibP2P { if utils.UseLibP2P {
consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, msgToSend) consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, host.ConstructP2pMessage(byte(17), msgToSend))
} else { } else {
host.BroadcastMessageFromLeader(consensus.host, consensus.GetValidatorPeers(), msgToSend, consensus.OfflinePeers) host.BroadcastMessageFromLeader(consensus.host, consensus.GetValidatorPeers(), msgToSend, consensus.OfflinePeers)
} }
@ -242,7 +243,7 @@ func (consensus *Consensus) processCommitMessage(message consensus_proto.Message
consensus.aggregatedCommitSig = aggSig consensus.aggregatedCommitSig = aggSig
if utils.UseLibP2P { if utils.UseLibP2P {
consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, msgToSend) consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, host.ConstructP2pMessage(byte(17), msgToSend))
} else { } else {
host.BroadcastMessageFromLeader(consensus.host, consensus.GetValidatorPeers(), msgToSend, consensus.OfflinePeers) host.BroadcastMessageFromLeader(consensus.host, consensus.GetValidatorPeers(), msgToSend, consensus.OfflinePeers)
} }

5
consensus/consensus_validator.go
Unescape View File

@ -4,6 +4,7 @@ import (
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
bls_cosi "github.com/harmony-one/harmony/crypto/bls" bls_cosi "github.com/harmony-one/harmony/crypto/bls"
"github.com/harmony-one/harmony/p2p" "github.com/harmony-one/harmony/p2p"
"github.com/harmony-one/harmony/p2p/host"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
protobuf "github.com/golang/protobuf/proto" protobuf "github.com/golang/protobuf/proto"
@ -105,7 +106,7 @@ func (consensus *Consensus) processAnnounceMessage(message consensus_proto.Messa
// Construct and send prepare message // Construct and send prepare message
msgToSend := consensus.constructPrepareMessage() msgToSend := consensus.constructPrepareMessage()
if utils.UseLibP2P { if utils.UseLibP2P {
consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, msgToSend) consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, host.ConstructP2pMessage(byte(17), msgToSend))
} else { } else {
consensus.SendMessage(consensus.leader, msgToSend) consensus.SendMessage(consensus.leader, msgToSend)
} }
@ -169,7 +170,7 @@ func (consensus *Consensus) processPreparedMessage(message consensus_proto.Messa
multiSigAndBitmap := append(multiSig, bitmap...) multiSigAndBitmap := append(multiSig, bitmap...)
msgToSend := consensus.constructCommitMessage(multiSigAndBitmap) msgToSend := consensus.constructCommitMessage(multiSigAndBitmap)
if utils.UseLibP2P { if utils.UseLibP2P {
consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, msgToSend) consensus.host.SendMessageToGroups([]p2p.GroupID{p2p.GroupIDBeacon}, host.ConstructP2pMessage(byte(17), msgToSend))
} else { } else {
consensus.SendMessage(consensus.leader, msgToSend) consensus.SendMessage(consensus.leader, msgToSend)
} }

14
node/node_handler.go
Unescape View File

@ -71,7 +71,7 @@ func (node *Node) ReceiveGroupMessage() {
// messageHandler parses the message and dispatch the actions // messageHandler parses the message and dispatch the actions
func (node *Node) messageHandler(content []byte, sender string) { func (node *Node) messageHandler(content []byte, sender string) {
node.MaybeBroadcastAsValidator(content) // node.MaybeBroadcastAsValidator(content)
consensusObj := node.Consensus consensusObj := node.Consensus
@ -314,11 +314,13 @@ func (node *Node) pingMessageHandler(msgPayload []byte, sender string) int {
return -1 return -1
} }
utils.GetLogInstance().Debug("[pingMessageHandler]", "incoming peer", peer) // utils.GetLogInstance().Debug("[pingMessageHandler]", "incoming peer", peer)
// add to incoming peer list // add to incoming peer list
node.host.AddIncomingPeer(*peer) node.host.AddIncomingPeer(*peer)
if utils.UseLibP2P {
node.host.ConnectHostPeer(*peer) node.host.ConnectHostPeer(*peer)
}
if ping.Node.Role == proto_node.ClientRole { if ping.Node.Role == proto_node.ClientRole {
utils.GetLogInstance().Info("Add Client Peer to Node", "Node", node.Consensus.GetNodeID(), "Client", peer) utils.GetLogInstance().Info("Add Client Peer to Node", "Node", node.Consensus.GetNodeID(), "Client", peer)
@ -349,7 +351,7 @@ func (node *Node) pingMessageHandler(msgPayload []byte, sender string) int {
// FIXME: HAR-89 use a separate nodefind/neighbor message // FIXME: HAR-89 use a separate nodefind/neighbor message
host.BroadcastMessageFromLeader(node.GetHost(), peers, buffer, node.Consensus.OfflinePeers) host.BroadcastMessageFromLeader(node.GetHost(), peers, buffer, node.Consensus.OfflinePeers)
utils.GetLogInstance().Info("PingMsgHandler send pong message") // utils.GetLogInstance().Info("PingMsgHandler send pong message")
} }
return 1 return 1
@ -391,6 +393,8 @@ func (node *Node) SendPongMessage() {
utils.GetLogInstance().Info("[PONG] sent pong message to", "group", p2p.GroupIDBeacon) utils.GetLogInstance().Info("[PONG] sent pong message to", "group", p2p.GroupIDBeacon)
} }
sentMessage = true sentMessage = true
// stop sending ping message
node.serviceManager.TakeAction(&service.Action{Action: service.Stop, ServiceType: service.PeerDiscovery})
} }
} }
numPeers = numPeersNow numPeers = numPeersNow
@ -424,8 +428,6 @@ func (node *Node) pongMessageHandler(msgPayload []byte) int {
peers = append(peers, peer) peers = append(peers, peer)
} }
utils.GetLogInstance().Debug("[pongMessageHandler]", "received msg #peers", len(peers))
if len(peers) > 0 { if len(peers) > 0 {
node.AddPeers(peers) node.AddPeers(peers)
} }
@ -446,7 +448,7 @@ func (node *Node) pongMessageHandler(msgPayload []byte) int {
publicKeys = append(publicKeys, &key) publicKeys = append(publicKeys, &key)
} }
utils.GetLogInstance().Debug("[pongMessageHandler]", "received msg #keys", len(publicKeys)) utils.GetLogInstance().Debug("[pongMessageHandler]", "#keys", len(publicKeys), "#peers", len(peers))
if node.State == NodeWaitToJoin { if node.State == NodeWaitToJoin {
node.State = NodeReadyForConsensus node.State = NodeReadyForConsensus

2
p2p/host/hostv2/hostv2.go
Unescape View File

@ -246,8 +246,6 @@ func (host *HostV2) ConnectHostPeer(peer p2p.Peer) {
utils.GetLogInstance().Error("ConnectHostPeer", "new peerinfo error", err, "peer", peer) utils.GetLogInstance().Error("ConnectHostPeer", "new peerinfo error", err, "peer", peer)
return return
} }
host.lock.Lock()
defer host.lock.Unlock()
if err := host.h.Connect(ctx, *peerInfo); err != nil { if err := host.h.Connect(ctx, *peerInfo); err != nil {
utils.GetLogInstance().Warn("can't connect to peer", "error", err, "peer", peer) utils.GetLogInstance().Warn("can't connect to peer", "error", err, "peer", peer)
} else { } else {

5
test/configs/oneshard1.txt
Unescape View File

@ -0,0 +1,5 @@
127.0.0.1 9000 leader 0
127.0.0.1 9001 validator 0
127.0.0.1 9002 validator 0
127.0.0.1 9003 validator 0
127.0.0.1 9004 validator 0

2
test/deploy.sh
Unescape View File

@ -73,7 +73,7 @@ EOU
DB= DB=
TXGEN=true TXGEN=true
DURATION=90 DURATION=90
MIN=5 MIN=2
SHARDS=2 SHARDS=2
KILLPORT=9004 KILLPORT=9004
SYNC=false SYNC=false

Write Preview
Loading…
Cancel
Save