Log repair

src/Makefile

@@ -1,5 +1,7 @@
+all: server
+
 clean:
-	rm -f *lib server log log_entry append_entries_request serror
+	rm -f server
 
 server:
 	rustc server.rs

src/schooner/append_entries.rs

@@ -8,18 +8,14 @@ use schooner::log_entry::LogEntry;
 #[deriving(Decodable, Encodable, Clone, Show)]
 pub struct AppendEntriesRequest {
     pub term: u64,          // current term of leader
-    pub prev_log_idx: u64,  // last log idx in leader's log
-    pub prev_log_term: u64, // last log term in leader's log
+    pub prev_log_idx: u64,  // idx of leader's log entry immediately before first entry in this AER
+    pub prev_log_term: u64, // term of leader's log entry immediately before first entry in this AER
     pub commit_idx: u64,    // last idx of log committed to leader's state machine
     pub leader_id: uint,    // id for leader (based on config file)
     pub entries: Vec<LogEntry>, // entries to log; may be empty (hearbeat msg)
 }
 
 
-// how goraft creates it
-// return newAppendEntriesResponse(s.currentTerm, false, s.log.currentIndex(), s.log.CommitIndex()), false
-
-// TODO: this needs to have the server id in it (just AEReq has the leader id)
 #[deriving(Decodable, Encodable, Clone, Show)]
 pub struct AppendEntriesResponse {
     // required by Raft protocol

src/schooner/log.rs

@@ -187,7 +187,7 @@ mod test {
     use schooner::log_entry::LogEntry;
     use schooner::append_entries::AppendEntriesRequest;
 
-    static testlog: &'static str = "datalog/log.test";   //'
+    static testlog: &'static str = "datalog/log.test";
 
     fn cleanup() {
         let p = Path::new(testlog);
@@ -208,7 +208,6 @@ mod test {
     #[test]
     fn test_truncate() {
         cleanup();
-        // TODO: remove command from the logentry !!!!!
         // need to write some logs first
         let logent1 = LogEntry{idx: 1, term: 1, data: ~"a", uuid: ~"u01"};
         let logent2 = LogEntry{idx: 2, term: 1, data: ~"b", uuid: ~"u02"};

src/schooner/peer.rs

@@ -1,16 +1,15 @@
 use std::io::{BufferedReader, File, InvalidInput, IoError, IoResult};
 use std::vec::Vec;
 
-// #[deriving(Clone,ToStr,Rand)]
 #[deriving(Clone, Show)]
 pub struct Peer {
     pub id: uint,
     pub ip: ~str,
     pub tcpport: uint,
 
     // only used by leader
-    pub next_idx: u64,
-    pub match_idx: u64,
+    pub next_idx: u64,  // idx of next log entry to send to peer
+    pub match_idx: u64, // idx of highest log entry replicated on peer
 }
 
 ///
@@ -41,9 +40,7 @@ pub fn parse_config(cfgpath: Path) -> IoResult<Vec<Peer>> {
                     peers.push( try!(create_peer(v)) );
                 }
             },
-            Err(e) => {
-                return Err(e);
-            }
+            Err(e) => return Err(e)
         }
     }