added jiang servers to correctness experiments

apavlo · Jul 25, 2014 · 840b607 · 840b607
1 parent 42023cc
commit 840b607
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/...arks/edu/brown/benchmark/voterexperiments/demohstorecorrect/VoterDemoHStoreConstants.java b/...arks/edu/brown/benchmark/voterexperiments/demohstorecorrect/VoterDemoHStoreConstants.java
@@ -39,7 +39,8 @@ public abstract class VoterDemoHStoreConstants {
 	public static final int MAX_VOTES = 1; 
 	public static final int NUM_CONTESTANTS = 25; 
 
-	public static final String HOST_PREFIX = "istc";
+	public static final String HOST_PREFIX = "istc8";
+	public static final String HOST_PREFIX_2 = "istc10";
 	public static final String SERVER_HOST_NAME = "istc10.csail.mit.edu";
 	public static final String JIANG_SERVER_HOST_NAME = "istc-nt";
 	public static final String JIANG_SERVER_HOST_NAME_2 = "istc3";

diff --git a/...s/edu/brown/benchmark/voterexperiments/demohstorecorrect/procedures/DeleteContestant.java b/...s/edu/brown/benchmark/voterexperiments/demohstorecorrect/procedures/DeleteContestant.java
@@ -87,12 +87,13 @@ public long run() {
 			//System.out.println("Host: " + host);
 			//System.out.println("Host Name: " + host.getHostName());
 			String hostname;
-			/**
-			if(host.getHostName().startsWith(VoterDemoHStoreConstants.HOST_PREFIX))
+
+			if(host.getHostName().startsWith(VoterDemoHStoreConstants.HOST_PREFIX) || 
+					host.getHostName().startsWith(VoterDemoHStoreConstants.HOST_PREFIX_2))
 			{
 				hostname = VoterDemoHStoreConstants.SERVER_HOST_NAME;
-			}*/
-			if(host.getHostName().startsWith(VoterDemoHStoreConstants.JIANG_SERVER_HOST_NAME) || 
+			}
+			else if(host.getHostName().startsWith(VoterDemoHStoreConstants.JIANG_SERVER_HOST_NAME) || 
 					host.getHostName().startsWith(VoterDemoHStoreConstants.JIANG_SERVER_HOST_NAME_2))
 			{
 				hostname = VoterDemoHStoreConstants.JIANG_HOST;

diff --git a/...arks/edu/brown/benchmark/voterexperiments/demosstorecorrect/VoterDemoSStoreConstants.java b/...arks/edu/brown/benchmark/voterexperiments/demosstorecorrect/VoterDemoSStoreConstants.java
@@ -39,7 +39,8 @@ public abstract class VoterDemoSStoreConstants {
 	public static final int MAX_VOTES = 1; 
 	public static final int NUM_CONTESTANTS = 25; 
 
-	public static final String HOST_PREFIX = "istc";
+	public static final String HOST_PREFIX = "istc8";
+	public static final String HOST_PREFIX_2 = "istc10";
 	public static final String SERVER_HOST_NAME = "istc10.csail.mit.edu";
 	public static final String JIANG_SERVER_HOST_NAME = "istc-nt";
 	public static final String JIANG_SERVER_HOST_NAME_2 = "istc3";

diff --git a/...s/edu/brown/benchmark/voterexperiments/demosstorecorrect/procedures/DeleteContestant.java b/...s/edu/brown/benchmark/voterexperiments/demosstorecorrect/procedures/DeleteContestant.java
@@ -99,12 +99,13 @@ public long run() {
 			InetAddress host = InetAddress.getLocalHost();
 
 			String hostname;
-			/**
-			if(host.getHostName().startsWith(VoterDemoHStoreConstants.HOST_PREFIX))
+
+			if(host.getHostName().startsWith(VoterDemoHStoreConstants.HOST_PREFIX) || 
+					host.getHostName().startsWith(VoterDemoHStoreConstants.HOST_PREFIX_2))
 			{
 				hostname = VoterDemoHStoreConstants.SERVER_HOST_NAME;
-			}*/
-			if(host.getHostName().startsWith(VoterDemoHStoreConstants.JIANG_SERVER_HOST_NAME) || 
+			}
+			else if(host.getHostName().startsWith(VoterDemoHStoreConstants.JIANG_SERVER_HOST_NAME) || 
 					host.getHostName().startsWith(VoterDemoHStoreConstants.JIANG_SERVER_HOST_NAME_2))
 			{
 				hostname = VoterDemoHStoreConstants.JIANG_HOST;