modified logentry struct and sharedlog interface

assignment2/src/connhandler/connhandler.go

@@ -116,20 +116,11 @@ func Write(conn net.Conn, msg string) {
 	conn.Write(buf)
 }
 
-func ReplyToClient(conn net.Conn, writeCh chan []byte) {
-	for {
-		w := <-writeCh
-		Write(conn, string(w))
-	}
-}
-
 func HandleClient(conn net.Conn, rft *raft.Raft) {
 	defer conn.Close()
 	//channel for every connection for every client
 	ch := make(chan []byte)
-	writeCh := make(chan []byte)
 	go MyRead(ch, conn)
-	go ReplyToClient(conn, writeCh)
 
 	for {
 		command := new(utils.Command)
@@ -167,6 +158,6 @@ func HandleClient(conn net.Conn, rft *raft.Raft) {
 			//log.Fatal("encode error:", err)
 		}
 
-		rft.Append(buffer.Bytes(), writeCh)
+		rft.Append(buffer.Bytes())
 	}
 }

assignment2/src/raft/kvstore.go

@@ -523,9 +523,9 @@ func InitKVStore() {
 	table = &KeyValueStore{dictionary: make(map[string]*Data)}
 }
 
-func MonitorCommitChannel(ch chan LogEntry, conn) {
+func MonitorCommitChannel(ch chan LogEntry) {
 	for {
-		//do some shit
+		temp := <-ch
 	}
 }
 

assignment2/src/raft/raft.go

@@ -57,6 +57,7 @@ type LogEntryData struct {
 	id        Lsn
 	data      []byte
 	committed bool
+	conn      net.Conn
 }
 
 type Args struct {
@@ -128,7 +129,7 @@ func (entry *LogEntryData) Committed() bool {
 }
 
 //make raft implement the append function
-func (rft *Raft) Append(data []byte, writeCh chan []byte) (LogEntry, error) {
+func (rft *Raft) Append(data []byte, conn net.Conn) (LogEntry, error) {
 	if rft.id != 1 {
 		return nil, ErrRedirect(1)
 	}
@@ -136,6 +137,7 @@ func (rft *Raft) Append(data []byte, writeCh chan []byte) (LogEntry, error) {
 	temp.id = 1
 	temp.committed = false
 	temp.data = data
+	temp.conn = conn
 	rft.log_array = append(rft.log_array, temp)
 
 	ackChan := make(chan int)

assignment2/src/server.go

@@ -101,7 +101,9 @@ func main() {
 	commitCh := make(chan raft.LogEntry)
 
 	rft, _ := raft.NewRaft(clusterConfig, sid, commitCh)
+	raft.InitKVStore()
 
+	go raft.MonitorCommitChannel(commitCh)
 	go initClientCommunication(server, rft, ch1)
 	go initInterServerCommunication(server, rft, ch2)