(depfast) support depfast-copilot

Author: rmlu

main.py

@@ -170,6 +170,9 @@
 # depfast
 parser.add_argument('--depfast_concurrency', type = int, default = 100,
                     help='[Benchmark] The number of concurrent threads in depfast')
+parser.add_argument('--depfast_scheme', type = str, default = "fpga_raft",
+                    choices=['fpga_raft', 'copilot'],
+                    help='[Benchmark] Depfast scheme')
 
 
 def main(args):
@@ -384,7 +387,8 @@ def main(args):
         # sys.test()  
     elif sys_name == 'depfast':
         benchmark = DEFAULT_DEPFAST(exec_time_ = args.bench_exec_time,
-                                    concurrency_ = args.depfast_concurrency)
+                                    concurrency_ = args.depfast_concurrency,
+                                    scheme_ = args.depfast_scheme)
         sys = depfast.Depfast(sys_name_ = sys_name,
                               fault_ = fault,
                               benchmark_ = benchmark,

tools/docker-depfast/docker-compose.yaml

@@ -14,6 +14,8 @@ services:
       - 5556:5556
       - 10000:10000
     command: tail -f /dev/null
+    cap_add:
+      - NET_ADMIN
 
   server2:
     image: rmlu/depfast:latest
@@ -28,6 +30,8 @@ services:
       - 10001:10001
       - 31235:22
     command: tail -f /dev/null
+    cap_add:
+      - NET_ADMIN
 
   server3:
     image: rmlu/depfast:latest
@@ -42,6 +46,8 @@ services:
       - 31236:22
       - 10002:10002
     command: tail -f /dev/null
+    cap_add:
+      - NET_ADMIN
 
   server4:
     image: rmlu/depfast:latest
@@ -56,6 +62,8 @@ services:
       - 31237:22
       - 10003:10003
     command: tail -f /dev/null
+    cap_add:
+      - NET_ADMIN
 
   server5:
     image: rmlu/depfast:latest
@@ -70,6 +78,8 @@ services:
       - 31238:22
       - 10004:10004
     command: tail -f /dev/null
+    cap_add:
+      - NET_ADMIN
 
   client:
     image: rmlu/depfast:latest
@@ -83,6 +93,8 @@ services:
       - 31239:22
       - 5555:5555
     command: tail -f /dev/null
+    cap_add:
+      - NET_ADMIN
 
 networks:
   depfast:

xinda/configs/benchmark.py

@@ -229,8 +229,10 @@ class DEFAULT_DEPFAST(Benchmark):
     def __init__(self, 
                  exec_time_ : str,
                  concurrency_ : int, 
+                 scheme_ : str,
                  workload_  = 'depfast',):
         self.benchmark = 'depfast'
+        self.scheme = scheme_
         self.exec_time = exec_time_
         self.workload = workload_
         self.identifier = workload_

xinda/systems/depfast.py

@@ -48,9 +48,10 @@ def _init_depfast(self):
         cmd = ["./config.sh"]
         p = subprocess.run(cmd, shell=True, cwd=self.tool.compose)
         self.info("depfast initiated.")
+        self.info(f'depfast_scheme: {self.benchmark.scheme}')
 
     def _run_depfast(self):
-        cmd = f"docker exec -it {self.client} bash start-exp.sh testname {self.benchmark.exec_time} 0 3 follower 1 {self.benchmark.concurrency} fpga_raft nonlocal"
+        cmd = f"docker exec -it {self.client} bash start-exp.sh testname {self.benchmark.exec_time} 0 3 follower 1 {self.benchmark.concurrency} {self.benchmark.scheme} nonlocal"
         self.depfast_process = subprocess.Popen(cmd, shell=True, stdout=open(self.log.runtime,"w"))
         self.start_time = int(time.time()*1e9)
         self.info("Benchmark:depfast starts.", rela=self.start_time)