Merge pull request #1897 from onetechnical/onetechnical/relbeta2.5.0

go-algorand 2.5.0-beta

Author: algojohnlee

Makefile

@@ -68,7 +68,7 @@ GOLDFLAGS := $(GOLDFLAGS_BASE) \
 UNIT_TEST_SOURCES := $(sort $(shell GOPATH=$(GOPATH) && GO111MODULE=off && go list ./... | grep -v /go-algorand/test/ ))
 ALGOD_API_PACKAGES := $(sort $(shell GOPATH=$(GOPATH) && GO111MODULE=off && cd daemon/algod/api; go list ./... ))
 
-MSGP_GENERATE	:= ./protocol ./crypto ./crypto/compactcert ./data/basics ./data/transactions ./data/committee ./data/bookkeeping ./data/hashable ./auction ./agreement ./rpcs ./node ./ledger
+MSGP_GENERATE	:= ./protocol ./crypto ./crypto/compactcert ./data/basics ./data/transactions ./data/committee ./data/bookkeeping ./data/hashable ./auction ./agreement ./rpcs ./node ./ledger ./ledger/ledgercore ./compactcert
 
 default: build
 

agreement/gossip/network.go

@@ -32,13 +32,23 @@ import (
 
 var (
 	voteBufferSize     = 10000
-	proposalBufferSize = 14
+	proposalBufferSize = 25
 	bundleBufferSize   = 7
 )
 
 var messagesHandled = metrics.MakeCounter(metrics.AgreementMessagesHandled)
 var messagesDropped = metrics.MakeCounter(metrics.AgreementMessagesDropped)
 
+var agreementVoteMessage = map[string]string{
+	"message_type": "vote",
+}
+var agreementProposalMessage = map[string]string{
+	"message_type": "proposal",
+}
+var agreementBundleMessage = map[string]string{
+	"message_type": "bundle",
+}
+
 type messageMetadata struct {
 	raw network.IncomingMessage
 }
@@ -92,32 +102,32 @@ func messageMetadataFromHandle(h agreement.MessageHandle) *messageMetadata {
 }
 
 func (i *networkImpl) processVoteMessage(raw network.IncomingMessage) network.OutgoingMessage {
-	return i.processMessage(raw, i.voteCh)
+	return i.processMessage(raw, i.voteCh, agreementVoteMessage)
 }
 
 func (i *networkImpl) processProposalMessage(raw network.IncomingMessage) network.OutgoingMessage {
 	if i.trace != nil {
 		i.trace.HashTrace(messagetracer.Proposal, raw.Data)
 	}
-	return i.processMessage(raw, i.proposalCh)
+	return i.processMessage(raw, i.proposalCh, agreementProposalMessage)
 }
 
 func (i *networkImpl) processBundleMessage(raw network.IncomingMessage) network.OutgoingMessage {
-	return i.processMessage(raw, i.bundleCh)
+	return i.processMessage(raw, i.bundleCh, agreementBundleMessage)
 }
 
 // i.e. process<Type>Message
-func (i *networkImpl) processMessage(raw network.IncomingMessage, submit chan<- agreement.Message) network.OutgoingMessage {
+func (i *networkImpl) processMessage(raw network.IncomingMessage, submit chan<- agreement.Message, msgType map[string]string) network.OutgoingMessage {
 	metadata := &messageMetadata{raw: raw}
 
 	select {
 	case submit <- agreement.Message{MessageHandle: agreement.MessageHandle(metadata), Data: raw.Data}:
 		// It would be slightly better to measure at de-queue
 		// time, but that happens in many places in code and
 		// this is much easier.
-		messagesHandled.Inc(nil)
+		messagesHandled.Inc(msgType)
 	default:
-		messagesDropped.Inc(nil)
+		messagesDropped.Inc(msgType)
 	}
 
 	// Immediately ignore everything here, sometimes Relay/Broadcast/Disconnect later based on API handles saved from IncomingMessage