tweaks

bench/exp_fig10-11.py

@@ -6,7 +6,6 @@
 bloomFilterSzList = [1120, 1280, 1440, 1600, 1800, 2000, 2240, 2520, 2800, 3120, 3480]
 
 tickMs = 10000 
-#clientS = 10 
 clientS = 60 
 
 threads = 10
@@ -36,6 +35,7 @@ def runExperimentRound(numClusters):
         print("-------------------------")
         f91.write(str(throughput) + "\n")
 
+
         numUpdates =5 
         numSearches = 5
         print(("5/5 for %d clusters, %d docs") % (numClusters, numDocs))
@@ -51,6 +51,7 @@ def runExperimentRound(numClusters):
         f19.write(str(throughput) + "\n")
 
         cleanupForDoryMixedThroughput(servers)
+
 
     f91.close()
     f55.close()

runClient.sh

@@ -10,7 +10,7 @@ throughput_sec="60"
 throughput_threads="64"
 num_updates="5"
 num_searches="5"
-num_clusters="0"
+num_clusters="1"
 only_setup="false"
 latency_prints="false"
 latency_bench="false"

src/config/client.config

@@ -1 +1 @@
-{"MasterAddr": "127.0.0.1", "MasterPort": ":4442", "Addr": ["127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1"], "Port": [":4440", ":4441", ":4443", ":4444", ":4445", ":4446", ":4447", ":4448"], "MaskKey": "45e29dab73c78aa70ab636e10be94a01", "MacKey": "a444afd5de3e81b036fd3d0c87f1d865"}
+{"MasterAddr": "54.237.197.233", "MasterPort": ":4442", "Addr": ["54.172.156.158", "3.135.227.247", "18.207.92.49", "3.129.5.162", "54.145.8.106", "18.222.104.217", "3.91.9.23", "18.221.55.1"], "Port": [":4440", ":4441", ":4440", ":4441", ":4440", ":4441", ":4440", ":4441"], "MaskKey": "45e29dab73c78aa70ab636e10be94a01", "MacKey": "a444afd5de3e81b036fd3d0c87f1d865"}

src/config/master.config

@@ -1 +1 @@
-{"MasterAddr": "127.0.0.1", "MasterPort": ":4442", "Addr": ["127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1", "127.0.0.1"], "Port": [":4440", ":4441", ":4443", ":4444", ":4445", ":4446", ":4447", ":4448"], "CertFile": "src/config/master.crt", "KeyFile": "src/config/master.key", "OutDir": "out/"}
+{"MasterAddr": "54.237.197.233", "MasterPort": ":4442", "Addr": ["54.172.156.158", "3.135.227.247", "18.207.92.49", "3.129.5.162", "54.145.8.106", "18.222.104.217", "3.91.9.23", "18.221.55.1"], "Port": [":4440", ":4441", ":4440", ":4441", ":4440", ":4441", ":4440", ":4441"], "CertFile": "src/config/master.crt", "KeyFile": "src/config/master.key", "OutDir": "out/"}

src/config/server1.config

@@ -1 +1 @@
-{"Addr": "127.0.0.1", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}
+{"Addr": "54.172.156.158", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}

src/config/server2.config

@@ -1 +1 @@
-{"Addr": "127.0.0.1", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}
+{"Addr": "3.135.227.247", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}

src/config/server3.config

@@ -1 +1 @@
-{"Addr": "127.0.0.1", "Port": ":4443", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}
+{"Addr": "18.207.92.49", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}

src/config/server4.config

@@ -1 +1 @@
-{"Addr": "127.0.0.1", "Port": ":4444", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}
+{"Addr": "3.129.5.162", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865"}

src/master/master.go

@@ -104,6 +104,8 @@ func start2PC(version int, updateMapCopy map[int]common.Update) {
         }(i)
     }
 
+    wg1.Wait()
+
     finishReq := &common.BatchFinishRequest{
         Commit:     finalCommit,
     }

system.config

@@ -1 +1 @@
-{"MasterAddr": "54.87.12.27", "MasterPort": ":4442", "MasterCertFile": "src/config/master.crt", "MasterKeyFile": "src/config/master.key", "ClientAddrs": ["3.94.102.16"], "Servers": [{"Addr": "34.224.57.112", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-0081a5af15c482467"}, {"Addr": "13.59.145.145", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-0b3540bb43dd5d84d"}, {"Addr": "3.80.70.29", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-0717685c7ac32230b"}, {"Addr": "18.220.187.228", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-07cefa30ceaa54ee0"}, {"Addr": "54.145.35.180", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-080b59dad026bd871"}, {"Addr": "18.221.233.220", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-08a03b08086c1c3b7"}, {"Addr": "3.94.196.148", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-06e57821ea3d15e03"}, {"Addr": "3.15.165.90", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-00f3f4c9416d9eb94"}], "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865", "SSHKeyPath": "~/.ssh/dory.pem", "MasterID": "i-0ea642276c520ac4f", "ClientIDs": ["i-0721c76ff11ef6663"], "BaselineServerAddr": "54.214.130.191", "BaselineServerID": "i-04609469a703b0c9b", "BaselineClientAddr": "13.56.20.247", "BaselineClientID": "i-0a493f8b5d153d7f2"}
+{"MasterAddr": "54.237.197.233", "MasterPort": ":4442", "MasterCertFile": "src/config/master.crt", "MasterKeyFile": "src/config/master.key", "ClientAddrs": ["54.90.147.83"], "Servers": [{"Addr": "54.172.156.158", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-09b09e60198564f22"}, {"Addr": "3.135.227.247", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-0995203641ca2603f"}, {"Addr": "18.207.92.49", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-07d58b221e959bb5c"}, {"Addr": "3.129.5.162", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-058da5549311a3625"}, {"Addr": "54.145.8.106", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-051fef15f5c152b23"}, {"Addr": "18.222.104.217", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-09072ef34a05cce40"}, {"Addr": "3.91.9.23", "Port": ":4440", "CertFile": "src/config/server1.crt", "KeyFile": "src/config/server1.key", "ID": "i-020341a8e41110702"}, {"Addr": "18.221.55.1", "Port": ":4441", "CertFile": "src/config/server2.crt", "KeyFile": "src/config/server2.key", "ID": "i-0fa6be40c5e3c63b5"}], "OutDir": "out/", "ClientMaskKey": "45e29dab73c78aa70ab636e10be94a01", "ClientMacKey": "a444afd5de3e81b036fd3d0c87f1d865", "SSHKeyPath": "~/.ssh/dory.pem", "MasterID": "i-0a1eec3bf390053da", "ClientIDs": ["i-09abd71ace74cce42"], "BaselineServerAddr": "54.188.32.71", "BaselineServerID": "i-0093cba6cbb5cb21a", "BaselineClientAddr": "13.57.188.191", "BaselineClientID": "i-00240a9255f178858"}