fix fallback cluster bug

higress-group · Sep 5, 2024 · 43ffe26 · 43ffe26
1 parent 8c3cc1a
commit 43ffe26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc
@@ -1399,7 +1399,9 @@ RouteConstSharedPtr RouteEntryImplBase::pickWeightedCluster(const Http::HeaderMa
                                                    static_cast<RouteEntryAndRoute*>(cluster.get()));
           return cluster_specifier_plugin_->route(route, *request_header);
         }
-        return cluster_specifier_plugin_->route(cluster, *request_header);
+        auto route = std::make_shared<DynamicRouteEntry>(cluster.get(), shared_from_this(),
+                                                         cluster->clusterName());
+        return cluster_specifier_plugin_->route(route, *request_header);
       }
 #endif
       if (!cluster->clusterHeaderName().get().empty() &&

diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h
@@ -1034,8 +1034,8 @@ class RouteEntryImplBase : public RouteEntryAndRoute,
     }
 
     RouteConstSharedPtr clone(const std::string& name) const {
-      return std::make_shared<Envoy::Router::RouteEntryImplBase::DynamicRouteEntry>(
-          parent_, shared_from_this(), name);
+      return std::make_shared<Envoy::Router::RouteEntryImplBase::DynamicRouteEntry>(parent_, owner_,
+                                                                                    name);
     }
 
     virtual RouteConstSharedPtr getRouteConstSharedPtr() const { return shared_from_this(); }