fixing one bug in TAPIR (not handling abstain) and one in IR, not correctly...

fixing one bug in TAPIR (not handling abstain) and one in IR, not correctly passing back decide result

replication/ir/client.cc

@@ -232,7 +232,7 @@ IRClient::ConsensusSlowPath()
     string result = pendingConsensusRequest->decide(results);
 
     // Put the result in the request to store for later retries
-    pendingConsensusRequest->request = result;
+    pendingConsensusRequest->decideReq = result;
 
     // Send finalize message
     proto::FinalizeConsensusMessage response;
@@ -258,7 +258,7 @@ IRClient::ResendConfirmation()
         proto::FinalizeConsensusMessage response;
         response.mutable_opid()->set_clientid(clientid);
         response.mutable_opid()->set_clientreqid(pendingConsensusRequest->clientReqId);
-        response.set_result(pendingConsensusRequest->request);
+        response.set_result(pendingConsensusRequest->decideReq);
                  
         if(transport->SendMessageToAll(this, response)) {
             confirmationTimeout->Reset();
@@ -419,7 +419,7 @@ IRClient::HandleConfirm(const TransportAddress &remote,
         pendingConsensusRequest = NULL;
 
         // Return to client
-        req->continuation(req->request, pendingConsensusRequest->request);
+        req->continuation(req->request, req->decideReq);
         delete req;
     }
 }

replication/ir/client.h

@@ -77,6 +77,7 @@ protected:
     struct PendingRequest
     {
         string request;
+        string decideReq;
         uint64_t clientReqId;
         decide_t decide;
         continuation_t continuation;

store/tapirstore/client.cc

@@ -166,24 +166,27 @@ Client::Prepare(Timestamp &timestamp)
         uint64_t proposed = p->GetTimestamp().getTimestamp();
 
         switch(p->GetReply()) {
-            case REPLY_OK:
-                Debug("Prepare ok vote");
-                continue;
-            case REPLY_FAIL:
-                // abort!
-                Debug("ABORT transaction");
-                return REPLY_FAIL;
-            case REPLY_RETRY:
-                status = REPLY_RETRY;
+        case REPLY_OK:
+            Debug("Prepare ok vote");
+            continue;
+        case REPLY_FAIL:
+            // abort!
+            Debug("ABORT transaction");
+            return REPLY_FAIL;
+        case REPLY_RETRY:
+            status = REPLY_RETRY;
                 if (proposed > ts) {
                     ts = proposed;
                 }
                 break;
-            case REPLY_TIMEOUT:
-                status = REPLY_RETRY;
-                break;
-            default:
-                NOT_IMPLEMENTED();
+        case REPLY_TIMEOUT:
+            status = REPLY_RETRY;
+            break;
+        case REPLY_ABSTAIN:
+            // just ignore abstains
+            break;
+        default:
+            break;
         }
         delete p;
     }