Leasing implementation & source code refactorizations

.github/workflows/build.yml

@@ -16,6 +16,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Get apt dependencies
+      run: sudo apt-get install -y protobuf-compiler
     - name: Build
       run: cargo build --workspace --verbose
     - name: Add clippy component

.github/workflows/tests_proc.yml

@@ -16,7 +16,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Install 'toml' package
+    - name: Get apt dependencies
+      run: sudo apt-get install -y protobuf-compiler
+    - name: Get pip dependencies
       run: pip3 install toml
     - name: Run proc tests (MultiPaxos)
       run: python3 .github/workflow_test.py -p MultiPaxos

.github/workflows/tests_unit.yml

@@ -16,5 +16,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Get apt dependencies
+      run: sudo apt-get install -y protobuf-compiler
     - name: Run all unit tests
-      run: cargo test --workspace --verbose
+      run: cargo test --workspace --verbose --lib --bins

Cargo.toml

@@ -8,26 +8,46 @@ version = "0.1.0"
 edition = "2021"
 authors = ["Guanzhou Hu <[email protected]>"]
 
-[dependencies]
-async-trait = "0.1"
-fixedbitset = { version = "0.5", features = ["serde"] }
-rangemap = "1.5"
-flashmap = "0.1"
-bytes = { version = "1.7", features = ["serde"] }
-futures = "0.3"
-tokio = { version = "1.39", features = ["full"] }
+[workspace.dependencies]
+tokio = { version = "1.40", features = ["full"] }
 rand = "0.8"
+rand_distr = "0.4"
+rangemap = "1.5"
 lazy_static = "1.5"
+bytes = { version = "1.7", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
-bincode = "1.3"
 toml = { version = "0.8", features = ["parse"] }
 log = "0.4"
 env_logger = "0.11"
-reed-solomon-erasure = { version = "6.0" }
+clap = { version = "4.0", features = ["derive"] }
 ctrlc = { version = "3.4", features = ["termination"] }
+color-print = { version = "0.3", features = ["terminfo"] }
+zookeeper-client = "0.8"
+etcd-client = "0.14"
+
+[dependencies]
+tokio = { workspace = true }
+rand = { workspace = true }
+rangemap = { workspace = true }
+lazy_static = { workspace = true }
+bytes = { workspace = true }
+serde = { workspace = true }
+toml = { workspace = true }
+log = { workspace = true }
+env_logger = { workspace = true }
+async-trait = "0.1"
+fixedbitset = { version = "0.5", features = ["serde"] }
+flashmap = "0.1"
+futures = "0.3"
+bincode = "1.3"
+reed-solomon-erasure = { version = "6.0" }
 get-size = { version = "0.1", features = ["derive"] }
 linreg = "0.2"
 statistical = "1.0"
+# these are just for error conversion; could do it in a better way
+ctrlc = { workspace = true }
+zookeeper-client = { workspace = true }
+etcd-client = { workspace = true }
 
 [dev-dependencies]
 criterion = "0.5"

scripts/distr_clients.py

@@ -128,13 +128,11 @@ def run_clients(
     config,
     capture_stdout,
     pin_cores,
-    base_idx,
     timeout_ms,
 ):
     if num_clients < 1:
         raise ValueError(f"invalid num_clients: {num_clients}")
 
-    # assuming I am the machine to run manager
     manager_pub_ip = ipaddrs[man]
 
     # if dist_machs set, put clients round-robinly across this many machines
@@ -200,7 +198,7 @@ def run_clients(
         "-c", "--config", type=str, help="protocol-specific TOML config string"
     )
     parser.add_argument(
-        "-g", "--group", type=str, default="1dc", help="hosts group to run on"
+        "-g", "--group", type=str, default="reg", help="hosts group to run on"
     )
     parser.add_argument(
         "--me", type=str, default="host0", help="main script runner's host nickname"
@@ -211,12 +209,6 @@ def run_clients(
     parser.add_argument(
         "--pin_cores", type=float, default=0, help="if not 0, set CPU cores affinity"
     )
-    parser.add_argument(
-        "--base_idx",
-        type=int,
-        default=0,
-        help="idx of the first client for calculating ports",
-    )
     parser.add_argument(
         "--timeout_ms", type=int, default=5000, help="client-side request timeout"
     )
@@ -328,7 +320,7 @@ def run_clients(
         raise ValueError(f"invalid manager oracle's host {args.man}")
 
     # check that the partition index is valid
-    partition_in_args, partition, file_midfix = False, 0, args.file_midfix
+    partition_in_args, partition, file_midfix = False, 0, ""
     if args.utility == "bench":
         partition_in_args = "partition" in args
         if partition_in_args and (args.partition < 0 or args.partition >= 5):
@@ -380,7 +372,6 @@ def run_clients(
         args.config,
         capture_stdout,
         args.pin_cores,
-        args.base_idx,
         args.timeout_ms,
     )
 
@@ -407,7 +398,7 @@ def run_clients(
                 rcs.append(client_proc.returncode)
     except subprocess.TimeoutExpired:
         if args.expect_halt:  # mainly for failover experiments
-            print("WARN: getting expected halt, exitting...")
+            print("WARN: getting expected halt, exiting...")
             sys.exit(0)
         raise RuntimeError(f"some client(s) timed-out {timeout} secs")
 

scripts/distr_cluster.py

@@ -285,7 +285,7 @@ def launch_servers(
         "-c", "--config", type=str, help="protocol-specific TOML config string"
     )
     parser.add_argument(
-        "-g", "--group", type=str, default="1dc", help="hosts group to run on"
+        "-g", "--group", type=str, default="reg", help="hosts group to run on"
     )
     parser.add_argument(
         "--me", type=str, default="host0", help="main script runner's host nickname"
@@ -397,6 +397,7 @@ def launch_servers(
     # print_manager_t.start()
 
     # then launch server replicas
+    print("Launching server processes...")
     server_procs = launch_servers(
         remotes,
         ipaddrs,

scripts/local_clients.py

@@ -112,7 +112,6 @@ def run_clients(
     capture_stdout,
     pin_cores,
     use_veth,
-    base_idx,
     timeout_ms,
 ):
     if num_clients < 1:
@@ -158,12 +157,6 @@ def run_clients(
     parser.add_argument(
         "--use_veth", action="store_true", help="if set, use netns and veth setting"
     )
-    parser.add_argument(
-        "--base_idx",
-        type=int,
-        default=0,
-        help="idx of the first client for calculating ports",
-    )
     parser.add_argument(
         "--timeout_ms", type=int, default=5000, help="client-side request timeout"
     )
@@ -281,7 +274,6 @@ def run_clients(
         capture_stdout,
         args.pin_cores,
         args.use_veth,
-        args.base_idx,
         args.timeout_ms,
     )
 
@@ -310,7 +302,7 @@ def run_clients(
                 rcs.append(client_proc.returncode)
     except subprocess.TimeoutExpired:
         if args.expect_halt:  # mainly for failover experiments
-            print("WARN: getting expected halt, exitting...")
+            print("WARN: getting expected halt, exiting...")
             sys.exit(0)
         raise RuntimeError(f"some client(s) timed-out {timeout} secs")
 

scripts/remote_hosts.toml

@@ -1,23 +1,18 @@
 # (DON'T CHANGE) remote base path and project repo folder name
-base_path = "/eval"
+base_path = "/home/smr"
 repo_name = "summerset"
 
-# (SET PROPERLY) for each group, its username @ DNS domain names
-[1dc]
+# (SET PROPERLY) for each group, its DNS domain names
+[reg]
+host0 = "domain.cloudlab.us"
+host1 = "domain.cloudlab.us"
+host2 = "domain.cloudlab.us"
+host3 = "domain.cloudlab.us"
+host4 = "domain.cloudlab.us"
 
-host0 = "[email protected]"
-host1 = "[email protected]"
-host2 = "[email protected]"
-# host3 = "[email protected]"
-# host4 = "[email protected]"
-# host5 = "[email protected]"
-# host6 = "[email protected]"
-# host7 = "[email protected]"
-# host8 = "[email protected]"
-
-# [wan]
-# host0 = "[email protected]"
-# host1 = "[email protected]"
-# host2 = "[email protected]"
-# host3 = "[email protected]"
-# host4 = "[email protected]"
+[wan]
+host0 = "domain.cloudlab.us"
+host1 = "domain.cloudlab.us"
+host2 = "domain.cloudlab.us"
+host3 = "domain.cloudlab.us"
+host4 = "domain.cloudlab.us"

scripts/remote_iperf.py

@@ -70,7 +70,7 @@ def ping_test(remotes, domains, na, nb):
 
     parser = argparse.ArgumentParser(allow_abbrev=False)
     parser.add_argument(
-        "-g", "--group", type=str, default="1dc", help="hosts group to run on"
+        "-g", "--group", type=str, default="reg", help="hosts group to run on"
     )
     args = parser.parse_args()
 

scripts/remote_killall.py

@@ -9,34 +9,40 @@
 TOML_FILENAME = "scripts/remote_hosts.toml"
 
 
-def killall_on_targets(destinations, cd_dir, chain=False):
-    cmd = ["./scripts/kill_all_procs.sh", "incl_distr"]
-    if chain:
-        pass  # placeholder line
+def compose_kill_cmds(chain=False, cockroach=False, zookeeper=False, etcd=False):
+    cmds = [["./scripts/kill_all_procs.sh", "incl_distr"]]
+    return cmds
 
-    print("Running kill commands in parallel...")
-    procs = []
-    for remote in destinations:
-        procs.append(
-            utils.proc.run_process_over_ssh(
-                remote,
-                cmd,
-                cd_dir=cd_dir,
-                capture_stdout=True,
-                capture_stderr=True,
-            )
-        )
 
-    print("Waiting for command results...")
-    utils.proc.wait_parallel_procs(procs)
+def killall_on_targets(
+    destinations, cd_dir, chain=False, cockroach=False, zookeeper=False, etcd=False
+):
+    cmds = compose_kill_cmds(
+        chain=chain, cockroach=cockroach, zookeeper=zookeeper, etcd=etcd
+    )
+    for cmd in cmds:
+        print("Running kill commands in parallel...")
+        procs = []
+        for remote in destinations:
+            procs.append(
+                utils.proc.run_process_over_ssh(
+                    remote,
+                    cmd,
+                    cd_dir=cd_dir,
+                    capture_stdout=True,
+                    capture_stderr=True,
+                )
+            )
+        print("Waiting for command results...")
+        utils.proc.wait_parallel_procs(procs)
 
 
 if __name__ == "__main__":
     utils.file.check_proper_cwd()
 
     parser = argparse.ArgumentParser(allow_abbrev=False)
     parser.add_argument(
-        "-g", "--group", type=str, default="1dc", help="hosts group to run on"
+        "-g", "--group", type=str, default="reg", help="hosts group to run on"
     )
     parser.add_argument(
         "-t",
@@ -48,6 +54,15 @@ def killall_on_targets(destinations, cd_dir, chain=False):
     parser.add_argument(
         "--chain", action="store_true", help="if set, kill ChainPaxos processes"
     )
+    parser.add_argument(
+        "--cockroach", action="store_true", help="if set, kill CockroachDB processes"
+    )
+    parser.add_argument(
+        "--zookeeper", action="store_true", help="if set, kill ZooKeeper processes"
+    )
+    parser.add_argument(
+        "--etcd", action="store_true", help="if set, kill etcd processes"
+    )
     args = parser.parse_args()
 
     base, repo, _, remotes, _, _ = utils.config.parse_toml_file(
@@ -66,4 +81,11 @@ def killall_on_targets(destinations, cd_dir, chain=False):
     if len(destinations) == 0:
         raise ValueError(f"targets list is empty")
 
-    killall_on_targets(destinations, f"{base}/{repo}", args.chain)
+    killall_on_targets(
+        destinations,
+        f"{base}/{repo}",
+        args.chain,
+        args.cockroach,
+        args.zookeeper,
+        args.etcd,
+    )