Make SRRoute initialization not crashed even SR is not linked

Summary: Mcrouter crashed in S430813 due to SR is not linked and config is not gated by service_router_capable. The diff make it throw error instead of crash Reviewed By: stuclar, vrishal Differential Revision: D51049080 fbshipit-source-id: 1e6388f84d5013fe023d270e53fc2c62b1e13e2f
facebook · Jul 9, 2024 · 3befde1 · 3befde1
1 parent 1a2a4a7
commit 3befde1
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 5 deletions.
diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.cpp b/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.cpp
@@ -206,4 +206,9 @@ HelloGoodbyeRouterInfo::buildRouteMapWithProxy() {
 HelloGoodbyeRouterInfo::buildRouteMapForWrapper() {
   return RouteHandleFactoryMapForWrapper();
 }
+
+/* static */ bool HelloGoodbyeRouterInfo::isSRLinked() {
+    return false;
+}
+
 } // namespace hellogoodbye
diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.h b/mcrouter/lib/carbon/example/gen/HelloGoodbyeRouterInfo.h
@@ -111,6 +111,7 @@ struct HelloGoodbyeRouterInfo {
   static RouteHandleFactoryMap buildRouteMap();
   static RouteHandleFactoryMapWithProxy buildRouteMapWithProxy();
   static RouteHandleFactoryMapForWrapper buildRouteMapForWrapper();
+  static bool isSRLinked();
 
   static std::unique_ptr<facebook::memcache::mcrouter::
                              ExtraRouteHandleProviderIf<HelloGoodbyeRouterInfo>>

diff --git a/mcrouter/lib/carbon/example/gen/HelloGoodbyeThriftTransport.h b/mcrouter/lib/carbon/example/gen/HelloGoodbyeThriftTransport.h
@@ -303,4 +303,4 @@ class ThriftTransport<hellogoodbye::HelloGoodbyeRouterInfo> : public ThriftTrans
 };
 
 } // namespace memcache
-} // namespace facebook
+} // namespace facebook
diff --git a/mcrouter/lib/carbon/test/gen/ARouterInfo.cpp b/mcrouter/lib/carbon/test/gen/ARouterInfo.cpp
@@ -203,6 +203,11 @@ ARouterInfo::buildRouteMapWithProxy() {
 ARouterInfo::buildRouteMapForWrapper() {
   return RouteHandleFactoryMapForWrapper();
 }
+
+/* static */ bool ARouterInfo::isSRLinked() {
+    return false;
+}
+
 } // namespace A
 } // namespace test
 } // namespace carbon
diff --git a/mcrouter/lib/carbon/test/gen/ARouterInfo.h b/mcrouter/lib/carbon/test/gen/ARouterInfo.h
@@ -114,6 +114,7 @@ struct ARouterInfo {
   static RouteHandleFactoryMap buildRouteMap();
   static RouteHandleFactoryMapWithProxy buildRouteMapWithProxy();
   static RouteHandleFactoryMapForWrapper buildRouteMapForWrapper();
+  static bool isSRLinked();
 
   static std::unique_ptr<facebook::memcache::mcrouter::
                              ExtraRouteHandleProviderIf<ARouterInfo>>

diff --git a/mcrouter/lib/carbon/test/gen/AThriftTransport.h b/mcrouter/lib/carbon/test/gen/AThriftTransport.h
@@ -222,4 +222,4 @@ class ThriftTransport<carbon::test::A::ARouterInfo> : public ThriftTransportMeth
 };
 
 } // namespace memcache
-} // namespace facebook
+} // namespace facebook
diff --git a/mcrouter/lib/carbon/test/gen/BRouterInfo.cpp b/mcrouter/lib/carbon/test/gen/BRouterInfo.cpp
@@ -203,6 +203,11 @@ BRouterInfo::buildRouteMapWithProxy() {
 BRouterInfo::buildRouteMapForWrapper() {
   return RouteHandleFactoryMapForWrapper();
 }
+
+/* static */ bool BRouterInfo::isSRLinked() {
+    return false;
+}
+
 } // namespace B
 } // namespace test
 } // namespace carbon
diff --git a/mcrouter/lib/carbon/test/gen/BRouterInfo.h b/mcrouter/lib/carbon/test/gen/BRouterInfo.h
@@ -114,6 +114,7 @@ struct BRouterInfo {
   static RouteHandleFactoryMap buildRouteMap();
   static RouteHandleFactoryMapWithProxy buildRouteMapWithProxy();
   static RouteHandleFactoryMapForWrapper buildRouteMapForWrapper();
+  static bool isSRLinked();
 
   static std::unique_ptr<facebook::memcache::mcrouter::
                              ExtraRouteHandleProviderIf<BRouterInfo>>

diff --git a/mcrouter/lib/carbon/test/gen/BThriftTransport.h b/mcrouter/lib/carbon/test/gen/BThriftTransport.h
@@ -222,4 +222,4 @@ class ThriftTransport<carbon::test::B::BRouterInfo> : public ThriftTransportMeth
 };
 
 } // namespace memcache
-} // namespace facebook
+} // namespace facebook
diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.cpp b/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.cpp
@@ -202,5 +202,10 @@ CarbonTestRouterInfo::buildRouteMapWithProxy() {
 CarbonTestRouterInfo::buildRouteMapForWrapper() {
   return RouteHandleFactoryMapForWrapper();
 }
+
+/* static */ bool CarbonTestRouterInfo::isSRLinked() {
+    return false;
+}
+
 } // namespace test
 } // namespace carbon
diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.h b/mcrouter/lib/carbon/test/gen/CarbonTestRouterInfo.h
@@ -114,6 +114,7 @@ struct CarbonTestRouterInfo {
   static RouteHandleFactoryMap buildRouteMap();
   static RouteHandleFactoryMapWithProxy buildRouteMapWithProxy();
   static RouteHandleFactoryMapForWrapper buildRouteMapForWrapper();
+  static bool isSRLinked();
 
   static std::unique_ptr<facebook::memcache::mcrouter::
                              ExtraRouteHandleProviderIf<CarbonTestRouterInfo>>

diff --git a/mcrouter/lib/carbon/test/gen/CarbonTestThriftTransport.h b/mcrouter/lib/carbon/test/gen/CarbonTestThriftTransport.h
@@ -277,4 +277,4 @@ class ThriftTransport<carbon::test::CarbonTestRouterInfo> : public ThriftTranspo
 };
 
 } // namespace memcache
-} // namespace facebook
+} // namespace facebook
diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.cpp b/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.cpp
@@ -202,5 +202,10 @@ CarbonThriftTestRouterInfo::buildRouteMapWithProxy() {
 CarbonThriftTestRouterInfo::buildRouteMapForWrapper() {
   return RouteHandleFactoryMapForWrapper();
 }
+
+/* static */ bool CarbonThriftTestRouterInfo::isSRLinked() {
+    return false;
+}
+
 } // namespace test
 } // namespace carbon
diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.h b/mcrouter/lib/carbon/test/gen/CarbonThriftTestRouterInfo.h
@@ -117,6 +117,7 @@ struct CarbonThriftTestRouterInfo {
   static RouteHandleFactoryMap buildRouteMap();
   static RouteHandleFactoryMapWithProxy buildRouteMapWithProxy();
   static RouteHandleFactoryMapForWrapper buildRouteMapForWrapper();
+  static bool isSRLinked();
 
   static std::unique_ptr<facebook::memcache::mcrouter::
                              ExtraRouteHandleProviderIf<CarbonThriftTestRouterInfo>>

diff --git a/mcrouter/lib/carbon/test/gen/CarbonThriftTestThriftTransport.h b/mcrouter/lib/carbon/test/gen/CarbonThriftTestThriftTransport.h
@@ -332,4 +332,4 @@ class ThriftTransport<carbon::test::CarbonThriftTestRouterInfo> : public ThriftT
 };
 
 } // namespace memcache
-} // namespace facebook
+} // namespace facebook
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo.cpp b/mcrouter/lib/network/gen/MemcacheRouterInfo.cpp
@@ -202,5 +202,14 @@ MemcacheRouterInfo::buildRouteMapWithProxy() {
 MemcacheRouterInfo::buildRouteMapForWrapper() {
   return RouteHandleFactoryMapForWrapper();
 }
+
+/* static */ bool MemcacheRouterInfo::isSRLinked() {
+  MemcacheRouterInfo::RouteHandlePtr (*fn)(
+      RouteHandleFactory<MemcacheRouterInfo::RouteHandleIf>&,
+      const folly::dynamic& json,
+      ProxyBase& proxy) = makeSRRoute;
+  return fn != nullptr;
+}
+
 } // namespace memcache
 } // namespace facebook
diff --git a/mcrouter/lib/network/gen/MemcacheRouterInfo.h b/mcrouter/lib/network/gen/MemcacheRouterInfo.h
@@ -174,6 +174,7 @@ struct MemcacheRouterInfo {
   static RouteHandleFactoryMap buildRouteMap();
   static RouteHandleFactoryMapWithProxy buildRouteMapWithProxy();
   static RouteHandleFactoryMapForWrapper buildRouteMapForWrapper();
+  static bool isSRLinked();
 
   static std::unique_ptr<facebook::memcache::mcrouter::
                              ExtraRouteHandleProviderIf<MemcacheRouterInfo>>