fix namespace reset on imcompatible log

tursodatabase · Nov 13, 2023 · b9b47ee · b9b47ee
1 parent 912ac4e
commit b9b47ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/libsql-replication/src/replicator.rs b/libsql-replication/src/replicator.rs
@@ -157,7 +157,7 @@ impl<C: ReplicatorClient> Replicator<C> {
                     self.has_handshake = true;
                     return Ok(());
                 }
-                Err(e @ Error::Fatal(_)) => return Err(e),
+                Err(e @ (Error::Fatal(_) | Error::Meta(_))) => return Err(e),
                 Err(e) if !error_printed => {
                     tracing::error!("error connecting to primary. retrying. error: {e}");
                     error_printed = true;

diff --git a/libsql-server/src/namespace/mod.rs b/libsql-server/src/namespace/mod.rs
@@ -575,7 +575,14 @@ impl Namespace<ReplicaDatabase> {
         .await?;
 
         // force a handshake now, to retrieve the primary's current replication index
-        replicator.try_perform_handshake().await?;
+        match replicator.try_perform_handshake().await {
+            Err(libsql_replication::replicator::Error::Meta(libsql_replication::meta::Error::LogIncompatible)) => {
+                tracing::error!("trying to replicate incompatible logs, reseting replica");
+                (reset)(ResetOp::Reset(name.clone()));
+            }
+            Err(e) => Err(e)?,
+            Ok(_) => (),
+        }
         let primary_current_replicatio_index = replicator.client_mut().primary_replication_index;
 
         let mut join_set = JoinSet::new();