Merge pull request #1 from theryecatcher/raftimplementation

Merge the Raftimplementation

Author: theryecatcher

.travis.yml

@@ -5,7 +5,7 @@ go:
 - tip # The latest version of Go.
 env:
 - GO111MODULE=on
-install: true
+install: false
 notifications:
   emails: false
 script:

README.md

@@ -4,30 +4,41 @@
 Twitter clone for Ditsributed Systems Course
 
 ### Environment
-You need to have Go Environment setup on you local machine.
+You need to have Go Environment setup on your local machine.
 
 ### Get the code
-Just do a git pul on the repo or better you could do a go get any one of the below commands should suffice.
+Just do a git pull on the repo or better you could do a go get any one of the below commands should suffice.
 ```
 git clone https://github.com/theryecatcher/chirper/
 go get github.com/theryecatcher/chirper
 cd chirper/
 ```
 
 ### Have Fun!!!
-The code is designed as a in Memory application for the 1st Phase. The Content Database and the User Database run as daemons and aren't part of the main application. You would need to run them seperately to have a functional application. Please follow the below sequence of commands to acheive the same.
+The code is designed as an in Memory application with Persistent storage provided by the RAFT Consensus Protocol. The Radt Wrapper, Content Wrapper and the User Wrapper run as daemons and are connected as microservices for the main web server. 
 
-You can append & (Run in background) to each of the processes. Or else For Debugging Purposes please run in different Terminals:
+The application can be started using the startall.sh bash script as below. The web server doesn't run as a daemon and is a live shell command in the terminal that runs the startall script (Ctrl + C kills it).
+```
+cd chirper
+./startall.sh
+```
+Note that as the web server uses the HTTP sockets module so you will need to give sudo access to your system which is present in the script just need to provide the sudo password after you start the script.
+
+You can also run them separately to have a functional application. Please follow the below sequence of commands to achieve the same.
+
+You can append & (Run in the background) to each of the processes. Or else For Debugging Purposes please run in different Terminals:
 ```
 cd $GOPATH
 src/github.com/theryecatcher/chirper/cmd/backendCntD/backendCntD
 src/github.com/theryecatcher/chirper/cmd/backendUsrD/backendUsrD
 sudo src/github.com/theryecatcher/chirper/cmd/web/web
 ```
 
-As seen above the commands start the daemons and also the main wen application. Until this is hosted it is configured to run on localhost.
+For killing any of the nodes or daemons just run the commands in kill.txt.
+
+As seen above the commands start the daemons and also the main web application. Until this is hosted it is configured to run on localhost.
 
-You can now browse to "localhost/" to start playing with the application.
+You can now browse to "http://localhost/" to start playing with the application.
 
 ### Disclaimer!!!
 The application is still under active development so kindly let us know if you face any bugs contact details are provided in the About Page.

cmd/backendRaftD/backendRaftD

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"net"
+	"os"
+
+	"github.com/theryecatcher/chirper/raftd/api/grpc"
+	"google.golang.org/grpc"
+)
+
+// Application parameters
+var serverAddr string
+var raftAddr string
+var joinAddr string
+var nodeID string
+
+func init() {
+	flag.StringVar(&serverAddr, "grpc", "45000", "Set the GRPC bind address")
+	flag.StringVar(&raftAddr, "node", "46000", "Set Raft bind address")
+	flag.StringVar(&joinAddr, "leader", "", "Set leader address, if any")
+	flag.StringVar(&nodeID, "id", "", "Node ID")
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "Usage: %s [options] <raft-local-storage-path> \n", os.Args[0])
+		flag.PrintDefaults()
+	}
+}
+
+func main() {
+	flag.Parse()
+
+	if flag.NArg() == 0 {
+		fmt.Fprintf(os.Stderr, "Please run <cmd> -h (help) for usage instructions\n")
+		os.Exit(1)
+	}
+
+	if nodeID == "" {
+		fmt.Fprintf(os.Stderr, "Please specify the Node ID/Name\n")
+		os.Exit(1)
+	}
+
+	// Create Raft Directory for Snapshots.
+	raftDir := flag.Arg(0)
+	if raftDir == "" {
+		fmt.Fprintf(os.Stderr, "Need to have a Raft storage directory\n")
+		os.Exit(1)
+	}
+	os.MkdirAll(raftDir, 0700)
+
+	lisraftD, err := net.Listen("tcp", fmt.Sprintf("%v:%v", "localhost", serverAddr))
+	if err != nil {
+		log.Fatalf("Error listening %v", err)
+	}
+	raftNodeServer := grpc.NewServer()
+
+	err = raftdgrpc.RegisterGRPCServer(&raftdgrpc.Config{
+		RaftLocalDir: raftDir,
+		RaftNodeAddr: raftAddr,
+		RaftJoinAddr: joinAddr,
+		RaftNodeID:   nodeID,
+	}, raftNodeServer)
+	if err != nil {
+		log.Fatalf("Failed to start Raft Node: %s", err.Error())
+	}
+	raftNodeServer.Serve(lisraftD)
+}

cmd/backendRaftD/backendRaftd.go

@@ -4,12 +4,14 @@ import (
 	"github.com/theryecatcher/chirper/contentd/storage"
 )
 
+// Contentd Contentd
 type Contentd struct {
 	strg contentstorage.Storage
 }
 
+// New new
 func New(cfg *Config) (*Contentd, error) {
 	return &Contentd{
-		strg: contentstorage.NewDummyStorage(),
+		strg: contentstorage.NewContentStore(),
 	}, nil
 }

contentd/contentd.go

@@ -4,7 +4,7 @@ import "contentd.proto";
 
 service Contentd {
   rpc NewTweet (NewTweetRequest) returns (NewTweetResponse);
-  rpc GetTweet (GetTweetRequest) returns (GetTweetResponse);
+  // rpc GetTweet (GetTweetRequest) returns (GetTweetResponse);
   rpc GetTweetsByUser (GetTweetsByUserRequest) returns (GetTweetsByUserResponse);
 }
 

contentd/contentdpb/service.pb.go

@@ -2,13 +2,12 @@ package contentd
 
 import (
 	"context"
-	"log"
 
 	"github.com/theryecatcher/chirper/contentd/contentdpb"
 )
 
 func (cnt *Contentd) GetTweetsByUser(ctx context.Context, req *contentdpb.GetTweetsByUserRequest) (*contentdpb.GetTweetsByUserResponse, error) {
-	log.Println("Contentd: get tweets by user")
+	cnt.strg.GetLoggerHandle().Println("Contentd: get tweets by user")
 	t, err := cnt.strg.GetTweetsByUser(ctx, req.UID)
 
 	return &contentdpb.GetTweetsByUserResponse{