update some timers and log status

assignment2/paxos.py

@@ -156,7 +156,7 @@ class PaxosHandler(socketserver.BaseRequestHandler):
         #requestInProcess.add(p2a.value()); No need, this is for AMO
 
         # TODO: TIMERS: set(new P2ATimer(p2a), P2ATimer.P2A_RETRY_MILLIS);
-         #setTimer(P2ATimer(p2a), P2ATimer.P2A_RETRY_MILLIS, self.onP2ATimer)
+        setTimer(P2ATimer(p2a), P2ATimer.P2A_RETRY_MILLIS, self.onP2ATimer)
 
         print("1\n")       
         if len(self.server.slot_to_acceptors[p2a.slot_num]) > (len(self.server.servers)/2):
@@ -292,15 +292,15 @@ class PaxosHandler(socketserver.BaseRequestHandler):
         # }
 
         # If not leader then stop timer
-        if self.server.is_leader:  # TODO: log status
+        if self.server.is_leader and not self.status(p2a_timer.p2a.slot_num) == PaxosLogSlotStatus.CHOSEN:  # TODO: log status
             for acceptor_addr in self.server.servers:
                 if acceptor_addr != self.server.address:
                     send_msg(p2a_timer.p2a, acceptor_addr)
             setTimer(p2a_timer, P2ATimer.P2A_RETRY_MILLIS, self.onP2ATimer)
 
 
-    def onHeartBeatTimer(self, hearbeat_timer: HeartBeatTimer):
-        print(f"{hearbeat_timer}: Callback", file=sys.stderr)
+    def onHeartBeatTimer(self, heartbeat_timer: HeartBeatTimer):
+        print(f"{heartbeat_timer}: Callback", file=sys.stderr)
         # TODO:
         # executeLog();
         # if (isLeader) {
@@ -315,12 +315,13 @@ class PaxosHandler(socketserver.BaseRequestHandler):
         #     garbageCollect(garbageCollectUntil());
         # }
         # set(t, HeartBeatTimer.HEARTBEAT_RETRY_MILLIS);
+        self.executeLog("HB timer")
         if self.server.is_leader:
             for acceptor_addr in self.server.servers:
                 if acceptor_addr != self.server.address:
                     lh = LeaderHeartbeat(self.server.log, self.server.ballot)
                     send_msg(lh, acceptor_addr)
-        setTimer(hearbeat_timer, HeartBeatTimer.HEARTBEAT_RETRY_MILLIS, self.onHeartBeatTimer)
+        setTimer(heartbeat_timer, HeartBeatTimer.HEARTBEAT_RETRY_MILLIS, self.onHeartBeatTimer)
 
     def onHeartBeatCheckTimer(self, hearbeat_check_timer: HeartBeatCheckTimer):
         print(f"{hearbeat_check_timer}: Callback", file=sys.stderr)
@@ -366,6 +367,8 @@ class PaxosHandler(socketserver.BaseRequestHandler):
             for acceptor_addr in self.server.servers:
                 if acceptor_addr != self.server.address:
                     send_msg(leader_election_timer.p1a, acceptor_addr)
+            
+            setTimer(leader_election_timer, LeaderElectionTimer.LEADER_ELECTION_TIMER, self.onLeaderElectionTimer)
 
     def __electLeader(self):
         #     private void electLeader() {