[CINFRA-657] Return a successful result such that we don't crash (arangodb#17935)

apetenchea · web-flow · commit 796836aba8e9 · 2023-01-13T16:48:23.000+01:00
* Return a successful result such that we don't crash

* Logging the problem

* Updated log ids.
diff --git a/arangod/Replication2/StateMachines/Document/DocumentFollowerState.cpp b/arangod/Replication2/StateMachines/Document/DocumentFollowerState.cpp
@@ -89,14 +89,13 @@ auto DocumentFollowerState::applyEntries(
         }
 
         if (self->_transactionHandler == nullptr) {
-          return Result{
-              TRI_ERROR_ARANGO_DATABASE_NOT_FOUND,
-              fmt::format(
-                  "Transaction handler is missing from "
-                  "DocumentFollowerState during applyEntries "
-                  "{}! This happens if the vocbase cannot be found during "
-                  "DocumentState construction.",
-                  to_string(data.core->getGid()))};
+          // TODO this is a temporary fix, see CINFRA-588
+          LOG_CTX("cfd76", ERR, self->loggerContext) << fmt::format(
+              "Transaction handler is missing from "
+              "DocumentFollowerState {}! This happens if the vocbase cannot be "
+              "found during DocumentState construction.",
+              self->shardId);
+          return Result{};
         }
 
         return basics::catchToResultT([&]() -> std::optional<LogIndex> {
@@ -161,6 +160,15 @@ auto DocumentFollowerState::applyEntries(
 auto DocumentFollowerState::forceLocalTransaction(OperationType opType,
                                                   velocypack::SharedSlice slice)
     -> Result {
+  if (_transactionHandler == nullptr) {
+    // TODO this is a temporary fix, see CINFRA-588
+    LOG_CTX("27c2b", ERR, loggerContext) << fmt::format(
+        "Transaction handler is missing from "
+        "DocumentFollowerState {}! This happens if the vocbase cannot be found "
+        "during DocumentState construction.",
+        shardId);
+    return Result{};
+  }
   auto trxId = TransactionId::createFollower();
   auto doc =
       DocumentLogEntry{std::string(shardId), opType, std::move(slice), trxId};
diff --git a/arangod/Replication2/StateMachines/Document/DocumentLeaderState.cpp b/arangod/Replication2/StateMachines/Document/DocumentLeaderState.cpp
@@ -94,13 +94,12 @@ auto DocumentLeaderState::recoverEntries(std::unique_ptr<EntryIterator> ptr)
         self->_handlersFactory->createTransactionHandler(self->gid);
     if (transactionHandler == nullptr) {
       // TODO this is a temporary fix, see CINFRA-588
-      return Result{
-          TRI_ERROR_ARANGO_DATABASE_NOT_FOUND,
-          fmt::format("Transaction handler is missing from DocumentLeaderState "
-                      "during recoverEntries "
-                      "{}! This happens if the vocbase cannot be found during "
-                      "DocumentState construction.",
-                      to_string(self->gid))};
+      LOG_CTX("8cd17", ERR, self->loggerContext) << fmt::format(
+          "Transaction handler is missing from "
+          "DocumentLeaderState {}! This happens if the vocbase cannot be "
+          "found during DocumentState construction.",
+          self->shardId);
+      return Result{};
     }
 
     while (auto entry = ptr->next()) {
