Merge branch 'main' into main

tursodatabase · Oct 5, 2024 · e608ff7 · e608ff7
2 parents 735859f + 21ae561
commit e608ff7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libsql-server/Cargo.toml b/libsql-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libsql-server"
-version = "0.24.25"
+version = "0.24.26"
 edition = "2021"
 default-run = "sqld"
 repository = "https://github.com/tursodatabase/libsql"

diff --git a/libsql-server/src/namespace/configurator/replica.rs b/libsql-server/src/namespace/configurator/replica.rs
@@ -123,10 +123,17 @@ impl ConfigureNamespace for ReplicaConfigurator {
                 loop {
                     match replicator.run().await {
                         err @ Error::Fatal(_) => Err(err)?,
-                        err @ Error::NamespaceDoesntExist => {
-                            tracing::error!("namespace {namespace} doesn't exist, destroying...");
-                            (reset)(ResetOp::Destroy(namespace.clone()));
-                            Err(err)?;
+                        _err @ Error::NamespaceDoesntExist => {
+                            // TODO(lucio): there is a bug where a primary will report that a valid
+                            // namespace doesn't exist when it does and causes the replicate to
+                            // destroy the namespace locally. For now the temp solution is to
+                            // ignore this error (still log it) and don't destroy the local
+                            // namespace data on the replica. This trades off storage space for
+                            // returing 500s.
+                            tracing::error!("namespace {namespace} doesn't exist, trying to replicate again...");
+                            // tracing::error!("namespace {namespace} doesn't exist, destroying...");
+                            // (reset)(ResetOp::Destroy(namespace.clone()));
+                            // Err(err)?;
                         }
                         e @ Error::Injector(_) => {
                             tracing::error!("potential corruption detected while replicating, reseting  replica: {e}");

diff --git a/libsql-server/src/rpc/streaming_exec.rs b/libsql-server/src/rpc/streaming_exec.rs
@@ -148,7 +148,6 @@ where
                     }
                 },
                 Some(res) = recv.recv() => {
-                    tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
                     yield Ok(res);
                 },
                 (ret, request_id) = &mut current_request_fut => {