Drop support for Zookeeper Authority

The Zookeeper backend has largely fallen by the wayside, with Consul
being the choice for clustering. Removing this backend for the
Authority will remove the maintenance burden of maintaining
vestigial functionality.

Change-Id: Ia361bb8da8c9794e3ad7d06a8c976e01ba1e069b
Reviewed-on: https://gerrit.readyset.name/c/readyset/+/5064
Tested-by: Buildkite CI
Reviewed-by: Jason Brown <[email protected]>

Author: Sif

Cargo.lock

@@ -7,13 +7,13 @@ use readyset_data::Dialect;
 #[derive(Parser)]
 #[clap(name = "extend_recipe")]
 struct ExtendRecipe {
-    #[clap(short, long, env("AUTHORITY_ADDRESS"), default_value("127.0.0.1:2181"))]
+    #[clap(short, long, env("AUTHORITY_ADDRESS"), default_value("127.0.0.1:8500"))]
     authority_address: String,
     #[clap(
         long,
         env("AUTHORITY"),
-        default_value("zookeeper"),
-        value_parser = ["consul", "zookeeper"]
+        default_value("consul"),
+        value_parser = ["consul"]
     )]
     authority: AuthorityType,
     #[clap(short, long, env("DEPLOYMENT"))]

benchmarks/src/bin/extend_recipe.rs

@@ -8,13 +8,13 @@ use readyset_data::Dialect;
 #[derive(Parser)]
 #[clap(name = "extend_recipe_write_propagation")]
 struct ExtendRecipeWritePropagation {
-    #[clap(short, long, env("AUTHORITY_ADDRESS"), default_value("127.0.0.1:2181"))]
+    #[clap(short, long, env("AUTHORITY_ADDRESS"), default_value("127.0.0.1:8500"))]
     authority_address: String,
     #[clap(
         long,
         env("AUTHORITY"),
-        default_value("zookeeper"),
-        value_parser = ["consul", "zookeeper"]
+        default_value("consul"),
+        value_parser = ["consul"]
     )]
     authority: AuthorityType,
     #[clap(short, long, env("DEPLOYMENT"), value_parser = NonEmptyStringValueParser::new())]

benchmarks/src/bin/extend_recipe_write_prop.rs

@@ -29,16 +29,16 @@ struct NoriaClientOpts {
         long,
         required_if_eq("database-type", "noria"),
         env("AUTHORITY_ADDRESS"),
-        default_value("127.0.0.1:2181")
+        default_value("127.0.0.1:8500")
     )]
     authority_address: String,
 
     #[clap(
         long,
         env("AUTHORITY"),
         required_if_eq("database-type", "noria"),
-        default_value("zookeeper"),
-        value_parser = ["consul", "zookeeper"]
+        default_value("consul"),
+        value_parser = ["consul"]
     )]
     authority: AuthorityType,
 

benchmarks/src/bin/reader.rs

@@ -53,10 +53,10 @@ struct Writer {
     #[clap(long)]
     database_url: String,
 
-    #[clap(short, long, env("AUTHORITY_ADDRESS"), default_value("127.0.0.1:2181"))]
+    #[clap(short, long, env("AUTHORITY_ADDRESS"), default_value("127.0.0.1:8500"))]
     authority_address: String,
 
-    #[clap(long, env("AUTHORITY"), default_value("zookeeper"), value_parser = ["consul", "zookeeper"])]
+    #[clap(long, env("AUTHORITY"), default_value("consul"), value_parser = ["consul"])]
     authority: AuthorityType,
 
     #[clap(short, long, env("DEPLOYMENT"), value_parser = NonEmptyStringValueParser::new())]

benchmarks/src/bin/write_propagation.rs

@@ -192,7 +192,6 @@ skip = [
 # by default infinite
 skip-tree = [
     { name = "rusty-fork", version = "0.3.0" },
-    { name = "zookeeper", version = "0.6.1" },
     { name = "fail", version = "0.5.0" },
     { name = "rust_decimal", version = "1.17.0" },
     { name = "prometheus-http-query", version = "0.3.0" },

deny.toml

@@ -67,7 +67,6 @@ triomphe = "0.1"
 streaming-iterator = "0.1"
 
 # consensus/
-zookeeper-async = "4.0.1"
 enum_dispatch = "0.3.7"
 async-trait = "0.1"
 consulrs = { workspace = true }

readyset-client/Cargo.toml

@@ -1076,7 +1076,7 @@ mod tests {
 
         authority
             .become_leader(LeaderPayload {
-                controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+                controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
                 nonce: 1,
             })
             .await
@@ -1118,7 +1118,7 @@ mod tests {
         authority.delete_all_keys().await;
 
         let payload = LeaderPayload {
-            controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+            controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
             nonce: 1,
         };
         let expected_leader_payload = payload.clone();
@@ -1230,7 +1230,7 @@ mod tests {
         authority.delete_all_keys().await;
 
         let payload = LeaderPayload {
-            controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+            controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
             nonce: 1,
         };
 
@@ -1298,7 +1298,7 @@ mod tests {
         authority.delete_all_keys().await;
 
         let payload = LeaderPayload {
-            controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+            controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
             nonce: 1,
         };
 
@@ -1349,7 +1349,7 @@ mod tests {
         authority.destroy_session().await.unwrap();
 
         let payload = LeaderPayload {
-            controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+            controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
             nonce: 2,
         };
 
@@ -1581,7 +1581,7 @@ mod tests {
         authority.delete_all_keys().await;
 
         let payload = LeaderPayload {
-            controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+            controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
             nonce: 1,
         };
 

readyset-client/src/consensus/consul.rs

@@ -1,5 +1,5 @@
 //! LocalAuthority is replicating the abstraction over the different authority
-//! systems (Zookeeper, Consul, etcd) but for a single process and in memory
+//! systems (Consul, etcd) but for a single process and in memory
 //! instead of requiring a server.
 //!
 //! As such, it is maintaining a separation between the Store and Authority. In
@@ -10,7 +10,7 @@
 //! from LocalAuthorityStore when it last checked in.
 //!
 //! The LocalAuthority supports ephemeral keys, instead of tying these keys to
-//! an active session similar to Zookeeper, the authority will drop ephemeral
+//! an active session similar to Consul, the authority will drop ephemeral
 //! keys it created when it is dropped.
 use std::any::Any;
 use std::collections::btree_map::Entry;

readyset-client/src/consensus/local.rs

@@ -1,4 +1,4 @@
-//! Trait for interacting with an conensus system (Zookeeper, Consul, etcd) to determine
+//! Trait for interacting with an conensus system (Consul, etcd) to determine
 //! which ReadySet worker acts as the controller, which ReadySet workers exist, detecting failed
 //! workers which necessitate changes, and storing cluster wide global state.
 
@@ -19,12 +19,10 @@ use url::Url;
 mod consul;
 mod local;
 mod standalone;
-pub mod zk;
 
 pub use self::consul::ConsulAuthority;
 pub use self::local::{LocalAuthority, LocalAuthorityStore};
 pub use self::standalone::StandaloneAuthority;
-pub use self::zk::ZookeeperAuthority;
 use crate::ControllerDescriptor;
 
 // This should be an associated type on Authority but since Authority will only have one possible
@@ -236,7 +234,6 @@ pub trait AuthorityControl: Send + Sync {
 #[allow(clippy::large_enum_variant)]
 #[enum_dispatch(AuthorityControl)]
 pub enum Authority {
-    ZookeeperAuthority,
     ConsulAuthority,
     LocalAuthority,
     StandaloneAuthority,
@@ -245,7 +242,6 @@ pub enum Authority {
 /// Enum that mirrors Authority that parses command line arguments.
 #[derive(Clone, Debug, Eq, PartialEq, ValueEnum)]
 pub enum AuthorityType {
-    Zookeeper,
     Consul,
     Local,
     Standalone,
@@ -255,7 +251,6 @@ impl FromStr for AuthorityType {
     type Err = anyhow::Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "zookeeper" => Ok(AuthorityType::Zookeeper),
             "consul" => Ok(AuthorityType::Consul),
             "local" => Ok(AuthorityType::Local),
             "standalone" => Ok(AuthorityType::Standalone),
@@ -267,7 +262,6 @@ impl FromStr for AuthorityType {
 impl Display for AuthorityType {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match &self {
-            AuthorityType::Zookeeper => write!(f, "zookeeper"),
             AuthorityType::Consul => write!(f, "consul"),
             AuthorityType::Local => write!(f, "local"),
             AuthorityType::Standalone => write!(f, "standalone"),
@@ -278,11 +272,6 @@ impl Display for AuthorityType {
 impl AuthorityType {
     pub async fn to_authority(&self, addr: &str, deployment: &str) -> Authority {
         match self {
-            AuthorityType::Zookeeper => Authority::from(
-                ZookeeperAuthority::new(&format!("{}/{}", addr, deployment))
-                    .await
-                    .unwrap(),
-            ),
             AuthorityType::Consul => Authority::from(
                 ConsulAuthority::new(&format!("http://{}/{}", addr, deployment)).unwrap(),
             ),

readyset-client/src/consensus/mod.rs

@@ -313,7 +313,7 @@ mod tests {
         assert_eq!(authority.try_read("/a").await.unwrap(), Some(12));
 
         let payload = LeaderPayload {
-            controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+            controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
             nonce: 1,
         };
         let expected_leader_payload = payload.clone();
@@ -413,7 +413,7 @@ mod tests {
 
         authority
             .become_leader(LeaderPayload {
-                controller_uri: url::Url::parse("http://127.0.0.1:2181").unwrap(),
+                controller_uri: url::Url::parse("http://127.0.0.1:8500").unwrap(),
                 nonce: 1,
             })
             .await