fix abort

Author: Neil DEVAS

src/main/java/group25/Server/Common/AbstractRMHashMapManager.java

@@ -49,14 +49,37 @@ public void crashResourceManager(CrashMode cm) {
     }
 
     public void vote(int xid) throws RemoteException {
-        if (!transactionExists(xid)) middlewareRM.receiveVote(xid, false, this.m_name);
-
-        // get global lock
-        boolean gotLock = globalLock.lock(xid);
-        if (!gotLock) middlewareRM.receiveVote(xid, false, this.m_name);
-
-        updateThenPersistGlobalState(xid);
-        middlewareRM.receiveVote(xid, true, this.m_name);
+        new Thread(() -> {
+            if (!transactionExists(xid)) {
+                try {
+                    middlewareRM.receiveVote(xid, false, this.m_name);
+                    return;
+                } catch (RemoteException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                return;
+            }
+    
+            // get global lock
+            boolean gotLock = globalLock.lock(xid);
+            if (!gotLock) {
+                try {
+                    middlewareRM.receiveVote(xid, false, this.m_name);
+                } catch (RemoteException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+    
+            updateThenPersistGlobalState(xid);
+            try {
+                middlewareRM.receiveVote(xid, true, this.m_name);
+            } catch (RemoteException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }).start();
     }
 
     public boolean doCommit(int xid) throws RemoteException {

src/main/java/group25/Server/Common/FairWaitInterruptibleLock.java

@@ -18,7 +18,7 @@ public boolean lock(int xid) {
         synchronized(this) {
             xids.addLast(xid);
             xidToSemaphore.put(xid, new Semaphore(1));
-
+            System.out.println("getting xids in lock " + xids);
             try {
                 if (xids.peekFirst() != xid) {// not first in line
                     xidToSemaphore.get(xid).acquire();// next acquire() fails
@@ -57,7 +57,7 @@ public boolean unlock(int xid) {
 
     public boolean interruptWaiter(int xid) {
         synchronized(this) {
-            if (xids.peekFirst() == xid) {
+            if (xids.peekFirst() != null && xids.peekFirst() == xid) {
                 return false;
             }
 

src/main/java/group25/Server/Common/TransactionManager.java

@@ -127,19 +127,18 @@ public synchronized boolean commit(int xid) throws InvalidTransactionException,
         }
 
         crashIf(CrashMode.TM_BEFORE_VOTE_REQUEST);
-        System.out.println("acquired it");
         synchronized(resourceManagers) {
-            resourceManagers = (ArrayList<Name_RM_Vote>)resourceManagers.clone();
-        }
-        for (Name_RM_Vote name_rm_vote : resourceManagers) {
-            name_rm_vote.rm.vote(xid);
+            for (Name_RM_Vote name_rm_vote : resourceManagers) {
+                name_rm_vote.rm.vote(xid);
+            }
         }
-        System.out.println("released it");
+
         crashIf(CrashMode.TM_BEFORE_ANY_VOTE_REPLIES);
 
         Semaphore sem = new Semaphore(1);
         synchronized(voteReplyWaitMap) {
             voteReplyWaitMap.put(xid, sem);
+            System.out.println("getting semaphore " + voteReplyWaitMap.get(xid));
         }
         try {
             sem.acquire();
@@ -155,7 +154,10 @@ public synchronized boolean commit(int xid) throws InvalidTransactionException,
     }
 
     public void receiveVote(int xid, boolean voteYes, String rmName) {
-        Semaphore sem = voteReplyWaitMap.get(xid);
+        Semaphore sem = null;
+        synchronized(voteReplyWaitMap) {
+            sem = voteReplyWaitMap.get(xid);
+        }
         if (!voteYes) {
             System.out.println("vote no");
             try {
@@ -177,25 +179,18 @@ public void receiveVote(int xid, boolean voteYes, String rmName) {
         synchronized(resourceManagerRecorder) {
             resourceManagers = resourceManagerRecorder.get(xid);
         }
-        System.out.println("got it!!!! " + resourceManagerRecorder);
 
         if (resourceManagers == null) {
             System.out.println("resource managers is null");
             return;
         }; // already aborted
 
-        boolean allYes = false;
-        System.out.println("about to go into the resourcemanagers");
         synchronized(resourceManagers) {
-            System.out.println("about to do more shit");
             int numRMs = resourceManagers.size();
-            System.out.println(xid + " used " + " numRMs " + numRMs);
             int yesCount = 0;
             for (Name_RM_Vote name_rm_vote : resourceManagers) {
                 if (name_rm_vote.rmName.equals(rmName)) {
-                    System.out.println("got the dudes vote");
                     if (voteYes) {
-                        System.out.println("voted yes");
                         name_rm_vote.votedYes = true;
                     }
                 }
@@ -204,26 +199,21 @@ public void receiveVote(int xid, boolean voteYes, String rmName) {
                 }
             }
             if (yesCount == numRMs) {
-                System.out.println("all yesses");
-                allYes = true;
-            }
-            if (allYes) {
                 for (Name_RM_Vote name_rm_vote : resourceManagers) {
                     try {
-                        System.out.println("calling do commit");
+                        System.out.println("calling do commit on " + name_rm_vote.rmName);
                         name_rm_vote.rm.doCommit(xid);
                     } catch (RemoteException e) {
                         // TODO handle this
                         e.printStackTrace();
                     }
                 }
+                lockManager.UnlockAll(xid);
+                resourceManagerRecorder.remove(xid);
+                sem.release();
             }
         }
         //  ------------- HERE ENDS 2PC -------------
-        System.out.println("unlocking and releasing");
-        lockManager.UnlockAll(xid);
-        resourceManagerRecorder.remove(xid);
-        sem.release();
         return;
     }