Add Experiment 2: Master recovery time.

4 files changed, 231 insertions, 19 deletions

diff --git a/same/src/main/java/com/orbekk/paxos/PaxosServiceImpl.java b/same/src/main/java/com/orbekk/paxos/PaxosServiceImpl.java
index 99991c5..c6a5fec 100644
--- a/same/src/main/java/com/orbekk/paxos/PaxosServiceImpl.java
+++ b/same/src/main/java/com/orbekk/paxos/PaxosServiceImpl.java
@@ -38,8 +38,6 @@ public class PaxosServiceImpl {
         @Override
         public void propose(RpcController controller, PaxosRequest request,
                 RpcCallback<PaxosResponse> done) {
-            logger.info("propose({}). Highest promise: {}, Highest accepted: {}",
-                    new Object[]{request, highestPromise, highestAcceptedValue});
             String clientUrl = request.getClient().getLocation();
             int proposalNumber = request.getProposalNumber();
             int response = 
@@ -53,8 +51,6 @@ public class PaxosServiceImpl {
         @Override
         public void acceptRequest(RpcController controller,
                 PaxosRequest request, RpcCallback<PaxosResponse> done) {
-            logger.info("acceptRequest({}). Highest promise: {}, Highest accepted: {}",
-                    new Object[]{request, highestPromise, highestAcceptedValue});
             String clientUrl = request.getClient().getLocation();
             int proposalNumber = request.getProposalNumber();
             int response = 
@@ -78,15 +74,9 @@ public class PaxosServiceImpl {
     private synchronized int propose(String clientUrl,
             int proposalNumber) {
         if (proposalNumber > highestPromise) {
-            logger.info(tag + "propose({}, {}) = accepted",
-                    new Object[]{clientUrl, proposalNumber});
             highestPromise = proposalNumber;
             return highestPromise;
         } else {
-            logger.info(tag + "propose({}, {}) = rejected " +
-                    "(promised: {})",
-                    new Object[]{clientUrl, proposalNumber,
-                    highestPromise});
             return -highestPromise;
         }
     }
@@ -94,15 +84,9 @@ public class PaxosServiceImpl {
     private synchronized int acceptRequest(String clientUrl,
             int proposalNumber) {
         if (proposalNumber == highestPromise) {
-            logger.info(tag + "acceptRequest({}, {}) = accepted",
-                    new Object[]{clientUrl, proposalNumber});
             highestAcceptedValue = proposalNumber;
             return highestAcceptedValue;
         } else {
-            logger.info(tag + "acceptRequest({}, {}) = rejected " +
-                    "(promise={})",
-                    new Object[]{clientUrl, proposalNumber,
-                    highestPromise});
             return -highestPromise;
         }
     }
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 04185db..8e6e977 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -115,8 +115,9 @@ public class SameController {
 
     private MasterController masterController = new MasterController() {
         @Override
-        public void enableMaster(String networkName,
+        public synchronized void enableMaster(String networkName,
                 State lastKnownState, int masterId) {
+            disableMaster();
             String myLocation = configuration.get("localIp") + ":" +
                     configuration.get("pport");
             String masterUrl = configuration.get("baseUrl") +
@@ -131,7 +132,7 @@ public class SameController {
         }
 
         @Override
-        public void disableMaster() {
+        public synchronized void disableMaster() {
             if (master != null) {
                 pServer.removeService(master.getNewService());
                 master.interrupt();
diff --git a/same/src/main/java/com/orbekk/stats/Experiments.java b/same/src/main/java/com/orbekk/stats/Experiments.java
index 7c009a1..607b286 100644
--- a/same/src/main/java/com/orbekk/stats/Experiments.java
+++ b/same/src/main/java/com/orbekk/stats/Experiments.java
@@ -900,6 +900,227 @@ public final class Experiments {
     }
   }
   
+  public static abstract class Experiment2
+      implements com.google.protobuf.Service {
+    protected Experiment2() {}
+    
+    public interface Interface {
+      public abstract void registerSample(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.stats.Experiments.SimpleTiming request,
+          com.google.protobuf.RpcCallback<com.orbekk.stats.Experiments.Empty> done);
+      
+    }
+    
+    public static com.google.protobuf.Service newReflectiveService(
+        final Interface impl) {
+      return new Experiment2() {
+        @java.lang.Override
+        public  void registerSample(
+            com.google.protobuf.RpcController controller,
+            com.orbekk.stats.Experiments.SimpleTiming request,
+            com.google.protobuf.RpcCallback<com.orbekk.stats.Experiments.Empty> done) {
+          impl.registerSample(controller, request, done);
+        }
+        
+      };
+    }
+    
+    public static com.google.protobuf.BlockingService
+        newReflectiveBlockingService(final BlockingInterface impl) {
+      return new com.google.protobuf.BlockingService() {
+        public final com.google.protobuf.Descriptors.ServiceDescriptor
+            getDescriptorForType() {
+          return getDescriptor();
+        }
+        
+        public final com.google.protobuf.Message callBlockingMethod(
+            com.google.protobuf.Descriptors.MethodDescriptor method,
+            com.google.protobuf.RpcController controller,
+            com.google.protobuf.Message request)
+            throws com.google.protobuf.ServiceException {
+          if (method.getService() != getDescriptor()) {
+            throw new java.lang.IllegalArgumentException(
+              "Service.callBlockingMethod() given method descriptor for " +
+              "wrong service type.");
+          }
+          switch(method.getIndex()) {
+            case 0:
+              return impl.registerSample(controller, (com.orbekk.stats.Experiments.SimpleTiming)request);
+            default:
+              throw new java.lang.AssertionError("Can't get here.");
+          }
+        }
+        
+        public final com.google.protobuf.Message
+            getRequestPrototype(
+            com.google.protobuf.Descriptors.MethodDescriptor method) {
+          if (method.getService() != getDescriptor()) {
+            throw new java.lang.IllegalArgumentException(
+              "Service.getRequestPrototype() given method " +
+              "descriptor for wrong service type.");
+          }
+          switch(method.getIndex()) {
+            case 0:
+              return com.orbekk.stats.Experiments.SimpleTiming.getDefaultInstance();
+            default:
+              throw new java.lang.AssertionError("Can't get here.");
+          }
+        }
+        
+        public final com.google.protobuf.Message
+            getResponsePrototype(
+            com.google.protobuf.Descriptors.MethodDescriptor method) {
+          if (method.getService() != getDescriptor()) {
+            throw new java.lang.IllegalArgumentException(
+              "Service.getResponsePrototype() given method " +
+              "descriptor for wrong service type.");
+          }
+          switch(method.getIndex()) {
+            case 0:
+              return com.orbekk.stats.Experiments.Empty.getDefaultInstance();
+            default:
+              throw new java.lang.AssertionError("Can't get here.");
+          }
+        }
+        
+      };
+    }
+    
+    public abstract void registerSample(
+        com.google.protobuf.RpcController controller,
+        com.orbekk.stats.Experiments.SimpleTiming request,
+        com.google.protobuf.RpcCallback<com.orbekk.stats.Experiments.Empty> done);
+    
+    public static final
+        com.google.protobuf.Descriptors.ServiceDescriptor
+        getDescriptor() {
+      return com.orbekk.stats.Experiments.getDescriptor().getServices().get(1);
+    }
+    public final com.google.protobuf.Descriptors.ServiceDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    
+    public final void callMethod(
+        com.google.protobuf.Descriptors.MethodDescriptor method,
+        com.google.protobuf.RpcController controller,
+        com.google.protobuf.Message request,
+        com.google.protobuf.RpcCallback<
+          com.google.protobuf.Message> done) {
+      if (method.getService() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "Service.callMethod() given method descriptor for wrong " +
+          "service type.");
+      }
+      switch(method.getIndex()) {
+        case 0:
+          this.registerSample(controller, (com.orbekk.stats.Experiments.SimpleTiming)request,
+            com.google.protobuf.RpcUtil.<com.orbekk.stats.Experiments.Empty>specializeCallback(
+              done));
+          return;
+        default:
+          throw new java.lang.AssertionError("Can't get here.");
+      }
+    }
+    
+    public final com.google.protobuf.Message
+        getRequestPrototype(
+        com.google.protobuf.Descriptors.MethodDescriptor method) {
+      if (method.getService() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "Service.getRequestPrototype() given method " +
+          "descriptor for wrong service type.");
+      }
+      switch(method.getIndex()) {
+        case 0:
+          return com.orbekk.stats.Experiments.SimpleTiming.getDefaultInstance();
+        default:
+          throw new java.lang.AssertionError("Can't get here.");
+      }
+    }
+    
+    public final com.google.protobuf.Message
+        getResponsePrototype(
+        com.google.protobuf.Descriptors.MethodDescriptor method) {
+      if (method.getService() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "Service.getResponsePrototype() given method " +
+          "descriptor for wrong service type.");
+      }
+      switch(method.getIndex()) {
+        case 0:
+          return com.orbekk.stats.Experiments.Empty.getDefaultInstance();
+        default:
+          throw new java.lang.AssertionError("Can't get here.");
+      }
+    }
+    
+    public static Stub newStub(
+        com.google.protobuf.RpcChannel channel) {
+      return new Stub(channel);
+    }
+    
+    public static final class Stub extends com.orbekk.stats.Experiments.Experiment2 implements Interface {
+      private Stub(com.google.protobuf.RpcChannel channel) {
+        this.channel = channel;
+      }
+      
+      private final com.google.protobuf.RpcChannel channel;
+      
+      public com.google.protobuf.RpcChannel getChannel() {
+        return channel;
+      }
+      
+      public  void registerSample(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.stats.Experiments.SimpleTiming request,
+          com.google.protobuf.RpcCallback<com.orbekk.stats.Experiments.Empty> done) {
+        channel.callMethod(
+          getDescriptor().getMethods().get(0),
+          controller,
+          request,
+          com.orbekk.stats.Experiments.Empty.getDefaultInstance(),
+          com.google.protobuf.RpcUtil.generalizeCallback(
+            done,
+            com.orbekk.stats.Experiments.Empty.class,
+            com.orbekk.stats.Experiments.Empty.getDefaultInstance()));
+      }
+    }
+    
+    public static BlockingInterface newBlockingStub(
+        com.google.protobuf.BlockingRpcChannel channel) {
+      return new BlockingStub(channel);
+    }
+    
+    public interface BlockingInterface {
+      public com.orbekk.stats.Experiments.Empty registerSample(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.stats.Experiments.SimpleTiming request)
+          throws com.google.protobuf.ServiceException;
+    }
+    
+    private static final class BlockingStub implements BlockingInterface {
+      private BlockingStub(com.google.protobuf.BlockingRpcChannel channel) {
+        this.channel = channel;
+      }
+      
+      private final com.google.protobuf.BlockingRpcChannel channel;
+      
+      public com.orbekk.stats.Experiments.Empty registerSample(
+          com.google.protobuf.RpcController controller,
+          com.orbekk.stats.Experiments.SimpleTiming request)
+          throws com.google.protobuf.ServiceException {
+        return (com.orbekk.stats.Experiments.Empty) channel.callBlockingMethod(
+          getDescriptor().getMethods().get(0),
+          controller,
+          request,
+          com.orbekk.stats.Experiments.Empty.getDefaultInstance());
+      }
+      
+    }
+  }
+  
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_com_orbekk_stats_Empty_descriptor;
   private static
@@ -924,7 +1145,9 @@ public final class Experiments {
       "\014SimpleTiming\022\016\n\006timing\030\001 \001(\001\022\022\n\nnumDevi" +
       "ces\030\002 \001(\0052X\n\013Experiment1\022I\n\016RegisterSamp" +
       "le\022\036.com.orbekk.stats.SimpleTiming\032\027.com" +
-      ".orbekk.stats.EmptyB\003\210\001\001"
+      ".orbekk.stats.Empty2X\n\013Experiment2\022I\n\016Re" +
+      "gisterSample\022\036.com.orbekk.stats.SimpleTi" +
+      "ming\032\027.com.orbekk.stats.EmptyB\003\210\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/same/src/main/java/com/orbekk/stats/experiments.proto b/same/src/main/java/com/orbekk/stats/experiments.proto
index 93f1e18..db773a4 100644
--- a/same/src/main/java/com/orbekk/stats/experiments.proto
+++ b/same/src/main/java/com/orbekk/stats/experiments.proto
@@ -13,3 +13,7 @@ message SimpleTiming {
 service Experiment1 {
     rpc RegisterSample (SimpleTiming) returns (Empty);
 }
+
+service Experiment2 {
+    rpc RegisterSample (SimpleTiming) returns (Empty);
+}