[ovs-dev] [PATCH v5 2/5] Measure timing of ovn-controller loop.

[Jakub Sitnicki]

On Fri, Mar 02, 2018 at 11:08 PM GMT, Mark Michelson wrote:
> This modifies ovn-controller to measure the amount of time it takes to
> detect a change in the southbound database and generate the resulting
> flow table. This may require multiple iterations of the ovn-controller
> loop.
>
> The statistics can be queried using:
>
> ovs-appctl -t ovn-controller stopwatch/show ovn-controller-loop
>
> The statistics can be reset using:
>
> ovs-appctl -t ovn-controller stopwatch/reset ovn-controller-loop
>
> Signed-off-by: Mark Michelson <mmichels at redhat.com>
> ---
>  ovn/controller/ovn-controller.c | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>
> diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
> index 7592bda25..9ecd859df 100644
> --- a/ovn/controller/ovn-controller.c
> +++ b/ovn/controller/ovn-controller.c
> @@ -57,6 +57,9 @@
>  #include "stream.h"
>  #include "unixctl.h"
>  #include "util.h"
> +#include "timeval.h"
> +#include "timer.h"
> +#include "stopwatch.h"
>  
>  VLOG_DEFINE_THIS_MODULE(main);
>  
> @@ -67,6 +70,8 @@ static unixctl_cb_func inject_pkt;
>  #define DEFAULT_BRIDGE_NAME "br-int"
>  #define DEFAULT_PROBE_INTERVAL_MSEC 5000
>  
> +#define CONTROLLER_LOOP_stopwatch_NAME "ovn-controller-loop"

This mixed case name like a fall-out from the rename.

-Jakub

> +
>  static void update_probe_interval(struct controller_ctx *,
>                                    const char *ovnsb_remote);
>  static void parse_options(int argc, char *argv[]);
> @@ -639,8 +644,10 @@ main(int argc, char *argv[])
>      unixctl_command_register("inject-pkt", "MICROFLOW", 1, 1, inject_pkt,
>                               &pending_pkt);
>  
> +    stopwatch_create(CONTROLLER_LOOP_stopwatch_NAME, SW_MS);
>      /* Main loop. */
>      exiting = false;
> +    unsigned int our_seqno = 0;
>      while (!exiting) {
>          /* Check OVN SB database. */
>          char *new_ovnsb_remote = get_ovnsb_remote(ovs_idl_loop.idl);
> @@ -659,6 +666,12 @@ main(int argc, char *argv[])
>              .ovnsb_idl_txn = ovsdb_idl_loop_run(&ovnsb_idl_loop),
>          };
>  
> +        if (our_seqno != ovsdb_idl_get_seqno(ctx.ovnsb_idl)) {
> +            stopwatch_start(CONTROLLER_LOOP_stopwatch_NAME,
> +                            time_msec());
> +            our_seqno = ovsdb_idl_get_seqno(ctx.ovnsb_idl);
> +        }
> +
>          update_probe_interval(&ctx, ovnsb_remote);
>  
>          update_ssl_config(ctx.ovs_idl);
> @@ -728,6 +741,9 @@ main(int argc, char *argv[])
>                      ofctrl_put(&flow_table, &pending_ct_zones,
>                                 get_nb_cfg(ctx.ovnsb_idl));
>  
> +                    stopwatch_stop(CONTROLLER_LOOP_stopwatch_NAME,
> +                                   time_msec());
> +
>                      hmap_destroy(&flow_table);
>                  }
>                  if (ctx.ovnsb_idl_txn) {
> @@ -792,6 +808,7 @@ main(int argc, char *argv[])
>              ofctrl_wait();
>              pinctrl_wait(&ctx);
>          }
> +
>          ovsdb_idl_loop_commit_and_wait(&ovnsb_idl_loop);
>  
>          if (ovsdb_idl_loop_commit_and_wait(&ovs_idl_loop) == 1) {