Working on a solution

Author: Junlong Gao

.dockerignore

@@ -0,0 +1,4 @@
+proto/_tools
+bin/*
+doc/*
+out

.gitignore

@@ -3,4 +3,5 @@
 node/node
 unikv/unikv
 bin/*
-_tools
+_tools
+proto/pkg

Dockerfile

@@ -0,0 +1,22 @@
+FROM golang:1.13.8
+
+RUN apt-get update && apt-get install -y wget zip \
+    && wget https://github.com/protocolbuffers/protobuf/releases/download/v3.12.3/protoc-3.12.3-linux-x86_64.zip \
+    && unzip protoc-3.12.3-linux-x86_64.zip \
+    && cp bin/protoc /usr/local/bin
+
+RUN mkdir -p /src
+COPY kv /src/kv
+COPY log /src/log
+COPY proto /src/proto
+COPY raft /src/raft
+COPY scheduler /src/scheduler
+COPY go.mod /src/go.mod
+COPY go.sum /src/go.sum
+COPY Makefile /src/Makefile
+WORKDIR /src
+RUN ls && make proto && go mod download
+RUN go test -c -v  ./raft && go test -c -v ./kv/test_raftstore
+
+COPY entrypoint.sh /src/entrypoint.sh
+ENTRYPOINT ["/src/entrypoint.sh"]

Makefile

@@ -9,7 +9,7 @@ endif
 
 GO                  := GO111MODULE=on go
 GOBUILD             := $(GO) build $(BUILD_FLAG) -tags codes
-GOTEST              := $(GO) test -v --count=1 --parallel=1 -p=1
+GOTEST              := $(GO) test -v --count=1 --parallel=1 -p=1 -failfast -timeout 600m
 
 TEST_LDFLAGS        := ""
 

README.md

@@ -1,3 +1,14 @@
+# Progress
+|Module|Status|
+|-|-|
+| Project 1 | Done |
+| Project 2a| Done |
+| Project 2b| Done |
+| Project 2c| Done |
+| Project 3a| Done |
+| Project 3b| Done |
+| Project 3c| In Progress |
+
 # The TinyKV Course
 
 This is a series of projects on a key-value storage system built with the Raft consensus algorithm. These projects are inspired by the famous [MIT 6.824](http://nil.csail.mit.edu/6.824/2018/index.html) course, but aim to be closer to industry implementations. The whole course is pruned from [TiKV](https://github.com/tikv/tikv) and re-written in Go. After completing this course, you will have the knowledge to implement a horizontal scalable, high available, key-value storage service with distributed transaction support and a better understanding of TiKV implementation.

doc/project2-RaftKV.md

@@ -122,7 +122,7 @@ The format is as below and some helper functions are provided in `kv/raftstore/m
 
 > You may wonder why TinyKV needs two badger instances. Actually, it can use only one badger to store both raft log and state machine data. Separating into two instances is just to be consistent with TiKV design.
 
-These metadatas should be created and updated in `PeerStorage`. When creating PeerStorage, see `kv/raftstore/peer_storager.go`. It initializes RaftLocalState, RaftApplyState of this Peer or gets the previous value from the underlying engine in the case of restart. Note that the value of both RAFT_INIT_LOG_TERM and RAFT_INIT_LOG_INDEX is 5 (as long as it's larger than 1) but not 0. The reason why not set it to 0 is to distinguish with the case that peer created passively after conf change. You may not quite understand it now, so just keep it in mind and the detail will be described in project3b when you are implementing conf change.
+The metadata should be created and updated in `PeerStorage`. When creating PeerStorage, see `kv/raftstore/peer_storage.go`. It initializes RaftLocalState, RaftApplyState of this Peer or gets the previous value from the underlying engine in the case of restart. Note that the value of both RAFT_INIT_LOG_TERM and RAFT_INIT_LOG_INDEX is 5 (as long as it's larger than 1) but not 0. The reason why not set it to 0 is to distinguish with the case that peer created passively after conf change. You may not quite understand it now, so just keep it in mind and the detail will be described in project3b when you are implementing conf change.
 
 The code you need to implement in this part is only one function:  `PeerStorage.SaveReadyState`, what this function does is to save the data in `raft.Ready` to badger, including append log entries and save the Raft hard state.
 

entrypoint.sh

@@ -0,0 +1,31 @@
+#!/bin/bash -ex
+set -o pipefail
+
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+   ulimit -n 65536
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+   sudo launchctl limit maxfiles 65536 200000
+fi
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}"  )" >/dev/null 2>&1 && pwd  )"
+cd $DIR
+iter=0
+rm -rf *-LOCK
+touch $iter-LOCK
+export GO111MODULE=on
+
+function run_test_raftstore() {
+   go test ./kv/test_raftstore -timeout 600m -count=1 --parallel=1 -p=1 -v -failfast -run "$1"
+}
+
+while true; do
+    rm -rf /tmp/test-raftstore* /tmp/go-build*
+    mv $iter-LOCK $((iter+1))-LOCK
+    iter=$((iter+1))
+    echo "iteration $iter"
+
+    make project3b
+    make project3a
+    make project2
+    make project1
+done

kv/config/config.go

@@ -84,6 +84,7 @@ func NewDefaultConfig() *Config {
 func NewTestConfig() *Config {
 	return &Config{
 		Raft:                     true,
+		LogLevel:                 "info",
 		RaftBaseTickInterval:     50 * time.Millisecond,
 		RaftHeartbeatTicks:       2,
 		RaftElectionTimeoutTicks: 10,

kv/raftstore/peer.go

@@ -83,7 +83,7 @@ type peer struct {
 
 	// Record the callback of the proposals
 	// (Used in 2B)
-	proposals []*proposal
+	proposals map[uint64]proposal
 
 	// Index of last scheduled compacted raft log.
 	// (Used in 2C)
@@ -133,6 +133,10 @@ func NewPeer(storeId uint64, cfg *config.Config, engines *engine_util.Engines, r
 		Storage:       ps,
 	}
 
+	for _, p := range region.GetPeers() {
+		raftCfg.Peers = append(raftCfg.Peers, p.Id)
+	}
+
 	raftGroup, err := raft.NewRawNode(raftCfg)
 	if err != nil {
 		return nil, err
@@ -146,6 +150,7 @@ func NewPeer(storeId uint64, cfg *config.Config, engines *engine_util.Engines, r
 		PeersStartPendingTime: make(map[uint64]time.Time),
 		Tag:                   tag,
 		ticker:                newTicker(region.GetId(), cfg),
+		proposals:             map[uint64]proposal{},
 	}
 
 	// If this region has only one peer and I am the one, campaign directly.
@@ -353,6 +358,7 @@ func (p *peer) HeartbeatScheduler(ch chan<- worker.Task) {
 		Peer:            p.Meta,
 		PendingPeers:    p.CollectPendingPeers(),
 		ApproximateSize: p.ApproximateSize,
+		Term:            p.RaftGroup.Raft.Term,
 	}
 }