Merge branch 'rdma_metadata_server' of https://git.cse.iitb.ac.in/synerg/hpdos...

Merge branch 'rdma_metadata_server' of https://git.cse.iitb.ac.in/synerg/hpdos into rdma_metadata_server

code/hpdos_rdma_offloaded/app.config

 app.HOST=192.168.200.20
 app.MASTER=true
 app.NFOLLOWER=1
-app.FOLLOWER1=192.168.200.210
+app.FOLLOWER1=192.168.200.40
 app.FOLLOWER2=
 app.MASTER_IP=NA
 #this is how to pair threads to cpu cores

code/hpdos_rdma_offloaded/src/main/java/hpdos_rdma_offloaded/handler/NetworkHandlerM.java

@@ -41,7 +41,7 @@ public class NetworkHandlerM implements Runnable{
             try
             {
                 DaRPCFutureM<InvalidationRequest,InvalidationResponse> future = stream.processStream();
-                if(future.metadataResponse.invalidationTotal == future.metadataResponse.invalidationDone.incrementAndGet())
+                if(future!=null &&  future.metadataResponse.invalidationTotal == future.metadataResponse.invalidationDone.incrementAndGet())
                 {
                     if(Response.DONE == future.metadataResponse.state.incrementAndGet())
                         future.metadataResponse.event.triggerResponse();
@@ -57,7 +57,7 @@ public class NetworkHandlerM implements Runnable{
             try
             {
                 DaRPCFutureM<Request,Response> future = stream.processStream();
-                if(future.metadataResponse.replicatonTotal == future.metadataResponse.replicationDone.incrementAndGet())
+                if(future!= null && future.metadataResponse.replicatonTotal == future.metadataResponse.replicationDone.incrementAndGet())
                    {
                     if(Response.DONE == future.metadataResponse.state.incrementAndGet())
                         future.metadataResponse.event.triggerResponse();

code/hpdos_rdma_offloaded/src/main/java/hpdos_rdma_offloaded/service/MasterMetadataServerService.java

 package hpdos_rdma_offloaded.service;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;

code/hpdos_rdma_offloaded/src/main/java/hpdos_rdma_offloaded/service/MetadataServiceMaster.java

@@ -55,14 +55,14 @@ public class MetadataServiceMaster extends RpcProtocol implements DaRPCService<R
             logger.info(" value : "+ new String(request.getValue()));
         try{
             if (request.getRequestType() == RequestType.PUT) {
+                response.event = event;
+                this.networkHandler.sendInvalidations(request, response);
+                this.networkHandler.sendReplications(request, response);
                 startTime = System.nanoTime();
                 this.storageHandler.create(request);
                 endTime = System.nanoTime();
                 timeTaken = (endTime-startTime) / 1000;
-
-                response.event = event;
-                this.networkHandler.sendInvalidations(request, response);
-                this.networkHandler.sendReplications(request, response);
+                response.state.getAndIncrement();
  //               ExperimentStatistics.collectStatistics(timeTaken, "localWriteTime");
                 logger.info("Time to write to local cache: " + timeTaken);
 
@@ -88,15 +88,17 @@ public class MetadataServiceMaster extends RpcProtocol implements DaRPCService<R
                 event.triggerResponse();
             }
             else if(request.getRequestType() == RequestType.DELETE){
+                this.networkHandler.sendInvalidations(request, response);
+                this.networkHandler.sendReplications(request, response);
                 stopwatch.start();
                 this.storageHandler.delete(request);
                 stopwatch.stop();
+                response.state.getAndIncrement();
                 logger.info("Time to delete to local cache: " + stopwatch.elapsed(TimeUnit.MICROSECONDS));
                 stopwatch.reset();
 
                 response.event = event;
-                this.networkHandler.sendInvalidations(request, response);
-                this.networkHandler.sendReplications(request, response);
+                
                 response.setAck(AckType.SUCCESS);
             }
             else{