From 986fd42e5ad26c11fa46ba0f795c7e3bdab24c75 Mon Sep 17 00:00:00 2001
From: Guanzhou Hu <huguanzhou123@sina.com>
Date: Sun, 28 Apr 2024 22:46:49 -0500
Subject: [PATCH] merge private main

---
 README.md                        |  1 -
 scripts/local_cluster.py         | 17 -----------------
 scripts/remote_killall.py        |  9 ++-------
 src/protocols/rep_nothing/mod.rs |  6 ------
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index b0c0fdf3..253018f3 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,6 @@ python3 scripts/distr_clients.py -h
 - [x] implementation of Raft
   - [ ] TLA+ spec
 - [x] implementation of CRaft
-- [x] implementation of Crossword
   - [x] TLA+ spec
 - [ ] long-term planned improvements
   - [ ] use a sophisticated storage backend
diff --git a/scripts/local_cluster.py b/scripts/local_cluster.py
index be23dcc8..27e196bf 100644
--- a/scripts/local_cluster.py
+++ b/scripts/local_cluster.py
@@ -42,23 +42,6 @@
 }
 
 
-def config_with_file_paths(protocol, config, replica):
-    result_config = PROTOCOL_BACKER_PATH[protocol](replica)
-    if protocol in PROTOCOL_SNAPSHOT_PATH:
-        result_config += "+"
-        result_config += PROTOCOL_SNAPSHOT_PATH[protocol](replica)
-
-    if config is not None and len(config) > 0:
-        if "backer_path" in config or "snapshot_path" in config:
-            result_config = config  # use user-supplied path
-            # NOTE: ignores the other one
-        else:
-            result_config += "+"
-            result_config += config
-
-    return result_config
-
-
 def run_process_pinned(i, cmd, capture_stderr=False, cores_per_proc=0, in_netns=None):
     cpu_list = None
     if cores_per_proc > 0:
diff --git a/scripts/remote_killall.py b/scripts/remote_killall.py
index d4ca4d5a..ec417043 100644
--- a/scripts/remote_killall.py
+++ b/scripts/remote_killall.py
@@ -9,10 +9,8 @@
 TOML_FILENAME = "scripts/remote_hosts.toml"
 
 
-def killall_on_targets(destinations, cd_dir, chain=False):
+def killall_on_targets(destinations, cd_dir):
     cmd = ["./scripts/kill_all_procs.sh", "incl_distr"]
-    if chain:
-        cmd = ["./scripts/crossword/kill_chain_procs.sh", "incl_distr"]
 
     print("Running kill commands in parallel...")
     procs = []
@@ -45,9 +43,6 @@ def killall_on_targets(destinations, cd_dir, chain=False):
         default="all",
         help="comma-separated remote hosts' nicknames, or 'all'",
     )
-    parser.add_argument(
-        "--chain", action="store_true", help="if set, kill ChainPaxos processes"
-    )
     args = parser.parse_args()
 
     base, repo, _, remotes, _, _ = utils.config.parse_toml_file(
@@ -66,4 +61,4 @@ 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}")
diff --git a/src/protocols/rep_nothing/mod.rs b/src/protocols/rep_nothing/mod.rs
index d2550b82..a4ef6679 100644
--- a/src/protocols/rep_nothing/mod.rs
+++ b/src/protocols/rep_nothing/mod.rs
@@ -44,10 +44,6 @@ pub struct ReplicaConfigRepNothing {
 
     /// Whether to call `fsync()`/`fdatasync()` on logger.
     pub logger_sync: bool,
-
-    // Performance simulation params (all zeros means no perf simulation):
-    pub perf_storage_a: u64,
-    pub perf_storage_b: u64,
 }
 
 #[allow(clippy::derivable_impls)]
@@ -58,8 +54,6 @@ impl Default for ReplicaConfigRepNothing {
             max_batch_size: 5000,
             backer_path: "/tmp/summerset.rep_nothing.wal".into(),
             logger_sync: false,
-            perf_storage_a: 0,
-            perf_storage_b: 0,
         }
     }
 }