Back out "log distributed cross-region requests to scuba"

Summary: Original commit changeset: d3ce640d4d26 Original Phabricator Diff: D50904038 Reviewed By: stuclar Differential Revision: D51816388 fbshipit-source-id: 132abe34e516b1e5e187ba65a26fd92ba82943e2
facebook · Dec 5, 2023 · de94b86 · de94b86
1 parent 9483e79
commit de94b86
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 73 deletions.
diff --git a/mcrouter/lib/network/AccessPoint.cpp b/mcrouter/lib/network/AccessPoint.cpp
@@ -222,11 +222,5 @@ std::string AccessPoint::toString() const {
       compressed_ ? "compressed" : "notcompressed");
 }
 
-const AccessPoint& AccessPoint::defaultAp() {
-  static const AccessPoint ap =
-      AccessPoint(folly::IPAddress(), 0, 0, mc_thrift_protocol);
-  return ap;
-}
-
 } // namespace memcache
 } // namespace facebook
diff --git a/mcrouter/lib/network/AccessPoint.h b/mcrouter/lib/network/AccessPoint.h
@@ -46,8 +46,6 @@ static_assert(
     "McProtocolT must have uint8_t alignemnt");
 
 struct AccessPoint {
-  static const AccessPoint& defaultAp();
-
   explicit AccessPoint(
       folly::StringPiece host = "",
       uint16_t port = 0,

diff --git a/mcrouter/routes/DistributionRoute.h b/mcrouter/routes/DistributionRoute.h
@@ -27,8 +27,7 @@ struct DistributionRouteSettings {
 };
 
 constexpr std::string_view kAsynclogDistributionEndpoint = "0.0.0.0";
-constexpr std::string_view kBroadcastRolloutMessage = "DistributionRoute";
-constexpr std::string_view kDistributionTargetMarkerForLog = "dl_distribution";
+constexpr folly::StringPiece kBroadcastRolloutMessage = "DistributionRoute";
 
 /**
  * The route handle is used to route cross-region requests via DL
@@ -81,8 +80,7 @@ class DistributionRoute {
    *  If write to Axon fails, we spool to Async log with the routing prefix.
    */
   McDeleteReply route(const McDeleteRequest& req) const {
-    auto& ctx = *fiber_local<RouterInfo>::getSharedCtx();
-    auto& proxy = ctx.proxy();
+    auto& proxy = fiber_local<RouterInfo>::getSharedCtx()->proxy();
     // In mcreplay case we try to infer target region from request
     auto distributionRegion = FOLLY_LIKELY(!replay_)
         ? fiber_local<RouterInfo>::getDistributionTargetRegion()
@@ -102,24 +100,13 @@ class DistributionRoute {
         : memcache::McDeleteRequestSource::CROSS_REGION_DIRECTED_INVALIDATION;
     auto finalReq = addDeleteRequestSource(req, source);
     finalReq.bucketId_ref() = fmt::to_string(*bucketId);
-    DestinationRequestCtx dctx(nowUs());
-    onBeforeDistribution(finalReq, ctx, *finalReq.bucketId_ref(), dctx);
-
     auto axonLogRes = spoolAxonProxy(
         finalReq,
         axonCtx,
         *bucketId,
         std::move(
-            distributionRegion.value().empty()
-                ? std::string(kBroadcastRolloutMessage)
-                : *distributionRegion));
-
-    auto reply = axonLogRes ? createReply(DefaultReply, finalReq)
-                            : McDeleteReply(carbon::Result::LOCAL_ERROR);
-
-    dctx.endTime = nowUs();
-    onAfterDistribution(finalReq, reply, ctx, *finalReq.bucketId_ref(), dctx);
-
+            distributionRegion.value().empty() ? kBroadcastRolloutMessage.str()
+                                               : *distributionRegion));
     if (axonLogRes) {
       proxy.stats().increment(distribution_axon_write_success_stat);
     }
@@ -134,17 +121,15 @@ class DistributionRoute {
           host,
           true,
           fiber_local<RouterInfo>::getAsynclogName());
-      if (spoolSucceeded) {
-        // update reply if axon failed but spool succeeded
-        reply = createReply(DefaultReply, finalReq);
-      } else {
-        proxy.stats().increment(distribution_async_spool_failed_stat);
-      }
+    }
+    if (!spoolSucceeded) {
+      proxy.stats().increment(distribution_async_spool_failed_stat);
     }
     // if spool to Axon or Asynclog succeeded and rpc is disabled, we return
     // default reply to the client:
     if (!distributedDeleteRpcEnabled_) {
-      return reply;
+      return spoolSucceeded ? createReply(DefaultReply, finalReq)
+                            : McDeleteReply(carbon::Result::LOCAL_ERROR);
     }
     return rh_->route(req);
   }
@@ -178,46 +163,6 @@ class DistributionRoute {
         return std::nullopt;
     }
   }
-
-  void onBeforeDistribution(
-      const McDeleteRequest& req,
-      ProxyRequestContextWithInfo<RouterInfo>& ctx,
-      const std::string& bucketId,
-      const DestinationRequestCtx& dctx) const {
-    ctx.onBeforeRequestSent(
-        /*poolName*/ kDistributionTargetMarkerForLog,
-        /*ap*/ AccessPoint::defaultAp(),
-        /*strippedRoutingPrefix*/ folly::StringPiece(),
-        /*request*/ req,
-        /*requestClass*/ fiber_local<RouterInfo>::getRequestClass(),
-        /*startTimeUs*/ dctx.startTime,
-        /*bucketId*/ bucketId);
-  }
-
-  void onAfterDistribution(
-      const McDeleteRequest& req,
-      const McDeleteReply& reply,
-      ProxyRequestContextWithInfo<RouterInfo>& ctx,
-      const std::string& bucketId,
-      const DestinationRequestCtx& dctx) const {
-    RpcStatsContext rpcContext;
-    ctx.onReplyReceived(
-        /*poolName*/ kDistributionTargetMarkerForLog,
-        /*poolIndex*/ std::nullopt,
-        /*ap*/ AccessPoint::defaultAp(),
-        /*strippedRoutingPrefix*/ folly::StringPiece(),
-        /*request*/ req,
-        /*reply*/ reply,
-        /*requestClass*/ fiber_local<RouterInfo>::getRequestClass(),
-        /*startTimeUs*/ dctx.startTime,
-        /*endTimeUs*/ dctx.endTime,
-        /*poolStatIndex*/ -1,
-        /*rpcStatsContext*/ rpcContext,
-        /*networkTransportTimeUs*/
-        fiber_local<RouterInfo>::getNetworkTransportTimeUs(),
-        /*extraDataCallback*/ fiber_local<RouterInfo>::getExtraDataCallbacks(),
-        /*bucketId*/ bucketId);
-  }
 };
 
 template <class RouterInfo>

diff --git a/mcrouter/routes/RootRoute.h b/mcrouter/routes/RootRoute.h
@@ -103,7 +103,7 @@ class RootRoute {
     McDeleteReply reply;
     if (enableDeleteDistribution_ && !req.key_ref()->routingPrefix().empty()) {
       auto routingPrefix = RoutingPrefix(req.key_ref()->routingPrefix());
-      if (routingPrefix.getRegion() != defaultRoute_.getRegion() &&
+      if (routingPrefix.str() != defaultRoute_.str() &&
           req.key_ref()->routingPrefix() != kBroadcastPrefix) {
         reply = fiber_local<RouterInfo>::runWithLocals(
             [this, &req, &routingPrefix]() {
@@ -204,6 +204,9 @@ class RootRoute {
       const std::vector<std::shared_ptr<typename RouterInfo::RouteHandleIf>>&
           rh,
       const Request& req) const {
+    if (FOLLY_LIKELY(rh.size() == 1)) {
+      return rh[0]->route(req);
+    }
     if (!rh.empty()) {
       return routeToAll(rh, req);
     }