Resend Accept on message resubmission

dgomezferro · Oct 18, 2012 · 7dcefe5 · 7dcefe5
1 parent 45fab48
commit 7dcefe5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/yahoo/pasc/paxos/handlers/proposer/ProposerRequest.java b/src/main/java/com/yahoo/pasc/paxos/handlers/proposer/ProposerRequest.java
@@ -75,11 +75,13 @@ public List<PaxosDescriptor> processMessage(Request message, PaxosState state) {
                 descriptors = new ArrayList<PaxosDescriptor>(4);
                 AcceptorAccept.checkAccept(request.getIid(), state, descriptors);
             } else {
-                LOG.error("Got a resubmitted request or too new request. "
+                LOG.warn("Got a resubmitted request or too new request. "
                                 + "FirstDigestID: {} CurrentId: {} RequestId: {} FirstIid: {} MsgClient: {} MsgTS: {} CacheTS: {} ",
                         new Object[] { state.getFirstDigestId(), state.getCurrIid(), request.getIid(),
                                 state.getFirstInstanceId(), clientId, timestamp, repTs });
-                return null;
+
+                return state.getIsLeader() ? Arrays.<PaxosDescriptor> asList(new Accept.Descriptor(requestIid),
+                        new Accepted.Descriptor(requestIid)) : null;
             }
         }
 
@@ -92,6 +94,7 @@ public List<PaxosDescriptor> processMessage(Request message, PaxosState state) {
                 return null;
             }
 
+            request.setIid(iid);
             int bufSize = state.getInstanceBufferSize(iid);
             state.setClientTimestampBufferElem(new IndexIid(bufSize, iid), ct);
             bufSize++;