Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for route flow counter #12

Closed
wants to merge 3 commits into from

Conversation

Junchao-Mellanox
Copy link
Owner

What I did

Why I did it

How I verified it

Details if related

orchagent/orchdaemon.cpp Outdated Show resolved Hide resolved
orchagent/routepatternorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.h Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/intfsorch.cpp Outdated Show resolved Hide resolved
orchagent/muxorch.cpp Outdated Show resolved Hide resolved
orchagent/muxorch.cpp Outdated Show resolved Hide resolved
orchagent/routeflowcounterorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.h Outdated Show resolved Hide resolved
orchagent/routeorch.h Show resolved Hide resolved
orchagent/routeorch.cpp Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
}

void RouteOrch::onAddOtherRouteEntry(sai_object_id_t vrf_id, const IpPrefix& ip_prefix)
{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means we always cached "Other" route entry even if the route flow counter is enabled. However, we should maintain a "zero-touch" approach if it is disabled, just like what we do for normal routes. this is inconsistent.

Maybe a better solution is:

  • don't cache them if route flow counter is disabled
  • once route flow counter is enabled, fetch route entries from corresponding orchagent.

I see three kinds of route entries match "other" route entry:

  • host route entries for IP addresses configured on each routing interface. the number should be small so it should be ok.
  • mux route. not sure of the scale of this kind of route entry.
  • vnet route. it can be large. I'm not sure whether caching will introduce performance issues.

orchagent/routeorch.cpp Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Outdated Show resolved Hide resolved
orchagent/routeorch.cpp Show resolved Hide resolved
Junchao-Mellanox pushed a commit that referenced this pull request May 6, 2024
**What I did**

Fix the Mem Leak by moving the raw pointers in type_maps to use smart pointers

**Why I did it**

```
Indirect leak of 83776 byte(s) in 476 object(s) allocated from:
    #0 0x7f0a2a414647 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:99
    #1 0x5555590cc923 in __gnu_cxx::new_allocator, std::allocator > const, referenced_object> > >::allocate(unsigned long, void const*) /usr/include/c++/10/ext/new_allocator.h:115
    #2 0x5555590cc923 in std::allocator_traits, std::allocator > const, referenced_object> > > >::allocate(std::allocator, std::allocator > const, referenced_object> > >&, unsigned long) /usr/include/c++/10/bits/alloc_traits.h:460
    #3 0x5555590cc923 in std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, referenced_object>, std::_Select1st, std::allocator > const, referenced_object> >, std::less, std::allocator > >, std::allocator, std::allocator > const, referenced_object> > >::_M_get_node() /usr/include/c++/10/bits/stl_tree.h:584
    #4 0x5555590cc923 in std::_Rb_tree_node, std::allocator > const, referenced_object> >* std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, referenced_object>, std::_Select1st, std::allocator > const, referenced_object> >, std::less, std::allocator > >, std::allocator, std::allocator > const, referenced_object> > >::_M_create_node, std::allocator > const&>, std::tuple<> >(std::piecewise_construct_t const&, std::tuple, std::allocator > const&>&&, std::tuple<>&&) /usr/include/c++/10/bits/stl_tree.h:634
    #5 0x5555590cc923 in std::_Rb_tree_iterator, std::allocator > const, referenced_object> > std::_Rb_tree, std::allocator >, std::pair, std::allocator > const, referenced_object>, std::_Select1st, std::allocator > const, referenced_object> >, std::less, std::allocator > >, std::allocator, std::allocator > const, referenced_object> > >::_M_emplace_hint_unique, std::allocator > const&>, std::tuple<> >(std::_Rb_tree_const_iterator, std::allocator > const, referenced_object> >, std::piecewise_construct_t const&, std::tuple, std::allocator > const&>&&, std::tuple<>&&) /usr/include/c++/10/bits/stl_tree.h:2461
    #6 0x5555590e8757 in std::map, std::allocator >, referenced_object, std::less, std::allocator > >, std::allocator, std::allocator > const, referenced_object> > >::operator[](std::__cxx11::basic_string, std::allocator > const&) /usr/include/c++/10/bits/stl_map.h:501
    #7 0x5555590d48b0 in Orch::setObjectReference(std::map, std::allocator >, std::map, std::allocator >, referenced_object, std::less, std::allocator > >, std::allocator, std::allocator > const, referenced_object> > >*, std::less, std::allocator > >, std::allocator, std::allocator > const, std::map, std::allocator >, referenced_object, std::less, std::allocator > >, std::allocator, std::allocator > const, referenced_object> > >*> > >&, std::__cxx11::basic_string, std::allocator > const&, std::__cxx11::basic_string, std::allocator > const&, std::__cxx11::basic_string, std::allocator > const&, std::__cxx11::basic_string, std::allocator > const&) orchagent/orch.cpp:450
    #8 0x5555594ff66b in QosOrch::handleQueueTable(Consumer&, std::tuple, std::allocator >, std::__cxx11::basic_string, std::allocator >, std::vector, std::allocator >, std::__cxx11::basic_string, std::allocator > >, std::allocator, std::allocator >, std::__cxx11::basic_string, std::allocator > > > > >&) orchagent/qosorch.cpp:1763
    #9 0x5555594edbd6 in QosOrch::doTask(Consumer&) orchagent/qosorch.cpp:2179
    #10 0x5555590c8743 in Consumer::drain() orchagent/orch.cpp:241
    #11 0x5555590c8743 in Consumer::drain() orchagent/orch.cpp:238
    #12 0x5555590c8743 in Consumer::execute() orchagent/orch.cpp:235
    #13 0x555559090dad in OrchDaemon::start() orchagent/orchdaemon.cpp:755
    #14 0x555558e9be25 in main orchagent/main.cpp:766
    #15 0x7f0a299b6d09 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x23d09)
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants