Use protobuf in networkdb core messages

Convert all networkdb core message types from go message types to
protobuf message types. This faciliates future modification of the
message structure without breaking backward compatibility.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>

Author: mrjana

Makefile

@@ -47,7 +47,7 @@ check: ${build_image}.created
 
 check-code:
 	@echo "Checking code... "
-	test -z "$$(golint ./... | tee /dev/stderr)"
+	test -z "$$(golint ./... | grep -v .pb.go: | tee /dev/stderr)"
 	go vet ./...
 	@echo "Done checking code"
 

networkdb/broadcast.go

@@ -5,20 +5,6 @@ import (
 	"github.com/hashicorp/serf/serf"
 )
 
-type networkEventType uint8
-
-const (
-	networkJoin networkEventType = 1 + iota
-	networkLeave
-)
-
-type networkEventData struct {
-	Event     networkEventType
-	LTime     serf.LamportTime
-	NodeName  string
-	NetworkID string
-}
-
 type networkEventMessage struct {
 	id   string
 	node string
@@ -37,15 +23,15 @@ func (m *networkEventMessage) Message() []byte {
 func (m *networkEventMessage) Finished() {
 }
 
-func (nDB *NetworkDB) sendNetworkEvent(nid string, event networkEventType, ltime serf.LamportTime) error {
-	nEvent := networkEventData{
-		Event:     event,
+func (nDB *NetworkDB) sendNetworkEvent(nid string, event NetworkEvent_Type, ltime serf.LamportTime) error {
+	nEvent := NetworkEvent{
+		Type:      event,
 		LTime:     ltime,
 		NodeName:  nDB.config.NodeName,
 		NetworkID: nid,
 	}
 
-	raw, err := encodeMessage(networkEventMsg, &nEvent)
+	raw, err := encodeMessage(MessageTypeNetworkEvent, &nEvent)
 	if err != nil {
 		return err
 	}
@@ -58,24 +44,6 @@ func (nDB *NetworkDB) sendNetworkEvent(nid string, event networkEventType, ltime
 	return nil
 }
 
-type tableEventType uint8
-
-const (
-	tableEntryCreate tableEventType = 1 + iota
-	tableEntryUpdate
-	tableEntryDelete
-)
-
-type tableEventData struct {
-	Event     tableEventType
-	LTime     serf.LamportTime
-	NetworkID string
-	TableName string
-	NodeName  string
-	Value     []byte
-	Key       string
-}
-
 type tableEventMessage struct {
 	id    string
 	tname string
@@ -96,9 +64,9 @@ func (m *tableEventMessage) Message() []byte {
 func (m *tableEventMessage) Finished() {
 }
 
-func (nDB *NetworkDB) sendTableEvent(event tableEventType, nid string, tname string, key string, entry *entry) error {
-	tEvent := tableEventData{
-		Event:     event,
+func (nDB *NetworkDB) sendTableEvent(event TableEvent_Type, nid string, tname string, key string, entry *entry) error {
+	tEvent := TableEvent{
+		Type:      event,
 		LTime:     entry.ltime,
 		NodeName:  nDB.config.NodeName,
 		NetworkID: nid,
@@ -107,7 +75,7 @@ func (nDB *NetworkDB) sendTableEvent(event tableEventType, nid string, tname str
 		Value:     entry.value,
 	}
 
-	raw, err := encodeMessage(tableEventMsg, &tEvent)
+	raw, err := encodeMessage(MessageTypeTableEvent, &tEvent)
 	if err != nil {
 		return err
 	}

networkdb/cluster.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/hashicorp/memberlist"
-	"github.com/hashicorp/serf/serf"
 )
 
 const reapInterval = 2 * time.Second
@@ -222,21 +221,13 @@ func (nDB *NetworkDB) gossip() {
 			}
 
 			// Send the compound message
-			if err := nDB.memberlist.SendToUDP(mnode, compound.Bytes()); err != nil {
+			if err := nDB.memberlist.SendToUDP(mnode, compound); err != nil {
 				logrus.Errorf("Failed to send gossip to %s: %s", mnode.Addr, err)
 			}
 		}
 	}
 }
 
-type bulkSyncMessage struct {
-	LTime       serf.LamportTime
-	Unsolicited bool
-	NodeName    string
-	Networks    []string
-	Payload     []byte
-}
-
 func (nDB *NetworkDB) bulkSyncTables() {
 	var networks []string
 	nDB.RLock()
@@ -331,8 +322,8 @@ func (nDB *NetworkDB) bulkSyncNode(networks []string, node string, unsolicited b
 			}
 
 			params := strings.Split(path[1:], "/")
-			tEvent := tableEventData{
-				Event:     tableEntryCreate,
+			tEvent := TableEvent{
+				Type:      TableEventTypeCreate,
 				LTime:     entry.ltime,
 				NodeName:  entry.node,
 				NetworkID: nid,
@@ -341,7 +332,7 @@ func (nDB *NetworkDB) bulkSyncNode(networks []string, node string, unsolicited b
 				Value:     entry.value,
 			}
 
-			msg, err := encodeMessage(tableEventMsg, &tEvent)
+			msg, err := encodeMessage(MessageTypeTableEvent, &tEvent)
 			if err != nil {
 				logrus.Errorf("Encode failure during bulk sync: %#v", tEvent)
 				return false
@@ -356,15 +347,15 @@ func (nDB *NetworkDB) bulkSyncNode(networks []string, node string, unsolicited b
 	// Create a compound message
 	compound := makeCompoundMessage(msgs)
 
-	bsm := bulkSyncMessage{
+	bsm := BulkSyncMessage{
 		LTime:       nDB.tableClock.Time(),
 		Unsolicited: unsolicited,
 		NodeName:    nDB.config.NodeName,
 		Networks:    networks,
-		Payload:     compound.Bytes(),
+		Payload:     compound,
 	}
 
-	buf, err := encodeMessage(bulkSyncMsg, &bsm)
+	buf, err := encodeMessage(MessageTypeBulkSync, &bsm)
 	if err != nil {
 		return fmt.Errorf("failed to encode bulk sync message: %v", err)
 	}