CovenantSQL · zeqing-guo · Nov 8, 2018 · Nov 1, 2018 · Nov 5, 2018 · Nov 5, 2018
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,7 @@ FROM golang:1.11-stretch as builder
 WORKDIR /go/src/github.com/CovenantSQL/CovenantSQL
 COPY . .
 RUN CGO_ENABLED=1 GOOS=linux GOLDFLAGS="-linkmode external -extldflags -static" ./build.sh
+RUN rm -f bin/*.test
 
 # Stage: runner
 FROM alpine:3.7

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 default: build
 
-IMAGE := covenantsql.io/covenantsql
+IMAGE := covenantsql/covenantsql
 GIT_COMMIT ?= $(shell git rev-parse --short HEAD)
 GIT_DIRTY ?= $(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
 GIT_DESCRIBE ?= $(shell git describe --tags --always)
@@ -38,4 +38,8 @@ start:
 logs:
 	docker-compose logs -f --tail=10
 
-.PHONY: status build save start logs
+push:
+	docker push $(IMAGE):$(VERSION)
+	docker push $(IMAGE):latest
+
+.PHONY: status build save start logs push
diff --git a/bin/docker-entry.sh b/bin/docker-entry.sh
@@ -7,9 +7,11 @@ miner)
     exec /app/cql-minerd -config "${COVENANT_CONF}"
     ;;
 blockproducer)
+    rm -f /app/node_*/chain.db
     exec /app/cqld -config "${COVENANT_CONF}"
     ;;
 observer)
+    rm -f /app/node_observer/observer.db
     exec /app/cql-observer -config "${COVENANT_CONF}" "${@}"
     ;;
 adapter)

diff --git a/blockproducer/chain.go b/blockproducer/chain.go
@@ -374,7 +374,7 @@ func (c *Chain) produceBlock(now time.Time) error {
 	peers := c.rt.getPeers()
 	wg := &sync.WaitGroup{}
 	for _, s := range peers.Servers {
-		if !s.ID.IsEqual(&c.rt.nodeID) {
+		if !s.IsEqual(&c.rt.nodeID) {
 			wg.Add(1)
 			go func(id proto.NodeID) {
 				defer wg.Done()
@@ -399,7 +399,7 @@ func (c *Chain) produceBlock(now time.Time) error {
 						"node":   id,
 					}).Debug("success advising block")
 				}
-			}(s.ID)
+			}(s)
 		}
 	}
 
@@ -723,12 +723,12 @@ func (c *Chain) syncHead() {
 		succ := false
 
 		for i, s := range peers.Servers {
-			if !s.ID.IsEqual(&c.rt.nodeID) {
-				err = c.cl.CallNode(s.ID, route.MCCFetchBlock.String(), req, resp)
+			if !s.IsEqual(&c.rt.nodeID) {
+				err = c.cl.CallNode(s, route.MCCFetchBlock.String(), req, resp)
 				if err != nil || resp.Block == nil {
 					log.WithFields(log.Fields{
 						"peer":        c.rt.getPeerInfoString(),
-						"remote":      fmt.Sprintf("[%d/%d] %s", i, len(peers.Servers), s.ID),
+						"remote":      fmt.Sprintf("[%d/%d] %s", i, len(peers.Servers), s),
 						"curr_turn":   c.rt.getNextTurn(),
 						"head_height": c.rt.getHead().getHeight(),
 						"head_block":  c.rt.getHead().getHeader().String(),
@@ -738,7 +738,7 @@ func (c *Chain) syncHead() {
 					c.blocksFromRPC <- resp.Block
 					log.WithFields(log.Fields{
 						"peer":        c.rt.getPeerInfoString(),
-						"remote":      fmt.Sprintf("[%d/%d] %s", i, len(peers.Servers), s.ID),
+						"remote":      fmt.Sprintf("[%d/%d] %s", i, len(peers.Servers), s),
 						"curr_turn":   c.rt.getNextTurn(),
 						"head_height": c.rt.getHead().getHeight(),
 						"head_block":  c.rt.getHead().getHeader().String(),

diff --git a/blockproducer/chain_test.go b/blockproducer/chain_test.go
@@ -26,7 +26,6 @@ import (
 	pi "github.com/CovenantSQL/CovenantSQL/blockproducer/interfaces"
 	pt "github.com/CovenantSQL/CovenantSQL/blockproducer/types"
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
-	"github.com/CovenantSQL/CovenantSQL/kayak"
 	"github.com/CovenantSQL/CovenantSQL/pow/cpuminer"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/route"
@@ -69,7 +68,7 @@ func TestChain(t *testing.T) {
 		So(err, ShouldBeNil)
 		_, peers, err := createTestPeersWithPrivKeys(priv, testPeersNumber)
 
-		cfg := NewConfig(genesis, fl.Name(), rpcServer, peers, peers.Servers[0].ID, testPeriod, testTick)
+		cfg := NewConfig(genesis, fl.Name(), rpcServer, peers, peers.Servers[0], testPeriod, testTick)
 		chain, err := NewChain(cfg)
 		So(err, ShouldBeNil)
 		ao, ok := chain.ms.readonly.accounts[testAddress1]
@@ -199,7 +198,7 @@ func TestMultiNode(t *testing.T) {
 		}
 
 		var nis []cpuminer.NonceInfo
-		var peers *kayak.Peers
+		var peers *proto.Peers
 		peerInited := false
 		for i := range chains {
 			// create tmp file
@@ -219,13 +218,13 @@ func TestMultiNode(t *testing.T) {
 				So(err, ShouldBeNil)
 
 				for i, p := range peers.Servers {
-					t.Logf("Peer #%d: %s", i, p.ID)
+					t.Logf("Peer #%d: %s", i, p)
 				}
 
 				peerInited = true
 			}
 
-			cfg := NewConfig(genesis, fl.Name(), server, peers, peers.Servers[i].ID, testPeriod, testTick)
+			cfg := NewConfig(genesis, fl.Name(), server, peers, peers.Servers[i], testPeriod, testTick)
 
 			// init chain
 			chains[i], err = NewChain(cfg)
@@ -235,8 +234,13 @@ func TestMultiNode(t *testing.T) {
 			pub, err := kms.GetLocalPublicKey()
 			So(err, ShouldBeNil)
 			node := proto.Node{
-				ID:        peers.Servers[i].ID,
-				Role:      peers.Servers[i].Role,
+				ID: peers.Servers[i],
+				Role: func(peers *proto.Peers, i int) proto.ServerRole {
+					if peers.Leader.IsEqual(&peers.Servers[i]) {
+						return proto.Leader
+					}
+					return proto.Follower
+				}(peers, i),
 				Addr:      server.Listener.Addr().String(),
 				PublicKey: pub,
 				Nonce:     nis[i].Nonce,

diff --git a/blockproducer/config.go b/blockproducer/config.go
@@ -20,7 +20,6 @@ import (
 	"time"
 
 	"github.com/CovenantSQL/CovenantSQL/blockproducer/types"
-	"github.com/CovenantSQL/CovenantSQL/kayak"
 	"github.com/CovenantSQL/CovenantSQL/proto"
 	"github.com/CovenantSQL/CovenantSQL/rpc"
 )
@@ -37,7 +36,7 @@ type Config struct {
 
 	Server *rpc.Server
 
-	Peers  *kayak.Peers
+	Peers  *proto.Peers
 	NodeID proto.NodeID
 
 	Period time.Duration
@@ -46,7 +45,7 @@ type Config struct {
 
 // NewConfig creates new config.
 func NewConfig(genesis *types.Block, dataFile string,
-	server *rpc.Server, peers *kayak.Peers,
+	server *rpc.Server, peers *proto.Peers,
 	nodeID proto.NodeID, period time.Duration, tick time.Duration) *Config {
 	config := Config{
 		Genesis:  genesis,

diff --git a/blockproducer/db_service.go b/blockproducer/db_service.go
@@ -25,7 +25,6 @@ import (
 	"github.com/CovenantSQL/CovenantSQL/crypto/asymmetric"
 	"github.com/CovenantSQL/CovenantSQL/crypto/hash"
 	"github.com/CovenantSQL/CovenantSQL/crypto/kms"
-	"github.com/CovenantSQL/CovenantSQL/kayak"
 	"github.com/CovenantSQL/CovenantSQL/metric"
 	"github.com/CovenantSQL/CovenantSQL/pow/cpuminer"
 	"github.com/CovenantSQL/CovenantSQL/proto"
@@ -92,7 +91,7 @@ func (s *DBService) CreateDatabase(req *CreateDatabaseRequest, resp *CreateDatab
 	log.WithField("db", dbID).Debug("generated database id")
 
 	// allocate nodes
-	var peers *kayak.Peers
+	var peers *proto.Peers
 	if peers, err = s.allocateNodes(0, dbID, req.Header.ResourceMeta); err != nil {
 		return
 	}
@@ -139,7 +138,7 @@ func (s *DBService) CreateDatabase(req *CreateDatabaseRequest, resp *CreateDatab
 		return
 	}
 
-	if err = s.batchSendSvcReq(initSvcReq, rollbackReq, s.peersToNodes(peers)); err != nil {
+	if err = s.batchSendSvcReq(initSvcReq, rollbackReq, peers.Servers); err != nil {
 		return
 	}
 
@@ -208,7 +207,7 @@ func (s *DBService) DropDatabase(req *DropDatabaseRequest, resp *DropDatabaseRes
 		return
 	}
 
-	if err = s.batchSendSvcReq(dropDBSvcReq, nil, s.peersToNodes(instanceMeta.Peers)); err != nil {
+	if err = s.batchSendSvcReq(dropDBSvcReq, nil, instanceMeta.Peers.Servers); err != nil {
 		return
 	}
 
@@ -324,7 +323,7 @@ func (s *DBService) generateDatabaseID(reqNodeID *proto.RawNodeID) (dbID proto.D
 	}
 }
 
-func (s *DBService) allocateNodes(lastTerm uint64, dbID proto.DatabaseID, resourceMeta wt.ResourceMeta) (peers *kayak.Peers, err error) {
+func (s *DBService) allocateNodes(lastTerm uint64, dbID proto.DatabaseID, resourceMeta wt.ResourceMeta) (peers *proto.Peers, err error) {
 	curRange := int(resourceMeta.Node)
 	excludeNodes := make(map[proto.NodeID]bool)
 	var allocated []allocatedNode
@@ -444,7 +443,7 @@ func (s *DBService) allocateNodes(lastTerm uint64, dbID proto.DatabaseID, resour
 			}
 
 			// build peers
-			return s.buildPeers(lastTerm+1, nodes, nodeAllocated)
+			return s.buildPeers(lastTerm+1, nodeAllocated)
 		}
 
 		curRange += int(resourceMeta.Node)
@@ -479,54 +478,26 @@ func (s *DBService) getMetric(metric metric.MetricMap, keys []string) (value uin
 	return
 }
 
-func (s *DBService) buildPeers(term uint64, nodes []proto.Node, allocated []proto.NodeID) (peers *kayak.Peers, err error) {
+func (s *DBService) buildPeers(term uint64, allocated []proto.NodeID) (peers *proto.Peers, err error) {
 	log.WithFields(log.Fields{
 		"term":  term,
 		"nodes": allocated,
 	}).Debug("build peers for term/nodes")
 
 	// get local private key
-	var pubKey *asymmetric.PublicKey
-	if pubKey, err = kms.GetLocalPublicKey(); err != nil {
-		return
-	}
-
 	var privKey *asymmetric.PrivateKey
 	if privKey, err = kms.GetLocalPrivateKey(); err != nil {
 		return
 	}
 
 	// get allocated node info
-	allocatedMap := make(map[proto.NodeID]bool)
-
-	for _, nodeID := range allocated {
-		allocatedMap[nodeID] = true
-	}
-
-	allocatedNodes := make([]proto.Node, 0, len(allocated))
-
-	for _, node := range nodes {
-		if allocatedMap[node.ID] {
-			allocatedNodes = append(allocatedNodes, node)
-		}
-	}
-
-	peers = &kayak.Peers{
-		Term:    term,
-		PubKey:  pubKey,
-		Servers: make([]*kayak.Server, len(allocated)),
-	}
-
-	for idx, node := range allocatedNodes {
-		peers.Servers[idx] = &kayak.Server{
-			Role:   proto.Follower,
-			ID:     node.ID,
-			PubKey: node.PublicKey,
-		}
+	peers = &proto.Peers{
+		PeersHeader: proto.PeersHeader{
+			Term:    term,
+			Servers: allocated,
+		},
 	}
-
 	// choose the first node as leader, allocateNodes sort the allocated node list by memory size
-	peers.Servers[0].Role = proto.Leader
 	peers.Leader = peers.Servers[0]
 
 	// sign the peers structure
@@ -591,17 +562,3 @@ func (s *DBService) batchSendSingleSvcReq(req *wt.UpdateService, nodes []proto.N
 
 	return
 }
-
-func (s *DBService) peersToNodes(peers *kayak.Peers) (nodes []proto.NodeID) {
-	if peers == nil {
-		return
-	}
-
-	nodes = make([]proto.NodeID, 0, len(peers.Servers))
-
-	for _, s := range peers.Servers {
-		nodes = append(nodes, s.ID)
-	}
-
-	return
-}