From patchwork Thu May 31 10:41:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 923304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40xPD13Dp9z9rxs for ; Thu, 31 May 2018 20:42:09 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C03C5CBE; Thu, 31 May 2018 10:41:22 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id BD8ABCB2 for ; Thu, 31 May 2018 10:41:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7711371B for ; Thu, 31 May 2018 10:41:18 +0000 (UTC) Received: by mail-wr0-f174.google.com with SMTP id w10-v6so32515482wrk.9 for ; Thu, 31 May 2018 03:41:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jGyqt3vcCi05yKemWwrbm1ix4NcSzP0P5onh1RB1n2k=; b=JNlifIEmqBkDFZ0mZ6LiDZ1iWSEGXROJ2mbOgdKphKEzN7Uy4P+43chAJcJHAUkOc/ Qe9TnEFQLcmNrHzx3x2YeZ3bJx0XYrecCVIL831IB8DEcLMA2aFe03m8/r3vatzgYoV4 yIKcVbAJ8qA88W2axk3WGDWmC5GmkRcI9UXsWwxJGGMbQu7Qd15qkneNzEk8j7WNN9x5 ZZrnkaoewxpY7m+vLu81Z6natzMJfMAtXJF82OAxU6rBR4o66IwNAkkK9xEfiJxyFL80 BCNnHvAtJTK3wcZErEhNXVo5vOOzBjYMDX74dCZXPt58QY3Jclp5hkiHMqnE2p3HLFmE Kivg== X-Gm-Message-State: ALKqPwct+/FHgaW5t0H4EX6JANKV9qJVMEHXbqXu2dVQu3Qr5pi6OU2w ws35/VG37fzrI4t/k9bAJJwmhtnil5A= X-Google-Smtp-Source: ADUXVKL5l9apiuSy5ghhVkqYrW9L1iqburU5fqKX8q4ahDozI/thY5zUCrD8wmocpdssb+VG1h2uhQ== X-Received: by 2002:adf:e94e:: with SMTP id m14-v6mr4991464wrn.126.1527763276744; Thu, 31 May 2018 03:41:16 -0700 (PDT) Received: from redhat.com (red-hat-inc.vlan404.asr1.mad1.gblx.net. [64.215.113.190]) by smtp.gmail.com with ESMTPSA id m64-v6sm1993924wmb.12.2018.05.31.03.41.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 May 2018 03:41:15 -0700 (PDT) From: Jakub Sitnicki To: dev@openvswitch.org Date: Thu, 31 May 2018 12:41:11 +0200 Message-Id: <20180531104111.15790-3-jkbs@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180531104111.15790-1-jkbs@redhat.com> References: <20180531104111.15790-1-jkbs@redhat.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 2/2] ovn: Test for full logical flow processing in ovn-controller X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Add a test that performs typical operations of creating & destroying logical routers, switches, ports, address sets and ACLs while checking if they trigger full logical flow processing in the ovn-controller. This way confirm that incremental processing is taking effect when we expect it to. Place the new test in a separate module - tests/ovn-performance.at, instead of the usual tests/ovn.at as it doesn't test OVN's functionality but rather a performance aspect of ovn-controller. Signed-off-by: Jakub Sitnicki Acked-by: Han Zhou --- tests/automake.mk | 3 +- tests/ovn-performance.at | 287 +++++++++++++++++++++++++++++++++++++++++++++++ tests/testsuite.at | 1 + 3 files changed, 290 insertions(+), 1 deletion(-) create mode 100644 tests/ovn-performance.at diff --git a/tests/automake.mk b/tests/automake.mk index c420b29f3..1e009389c 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -105,7 +105,8 @@ TESTSUITE_AT = \ tests/ovn-controller-vtep.at \ tests/mcast-snooping.at \ tests/packet-type-aware.at \ - tests/nsh.at + tests/nsh.at \ + tests/ovn-performance.at SYSTEM_KMOD_TESTSUITE_AT = \ tests/system-common-macros.at \ diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at new file mode 100644 index 000000000..d2a795a15 --- /dev/null +++ b/tests/ovn-performance.at @@ -0,0 +1,287 @@ +# +# Tests targeting performance of OVN components. +# + +m4_divert_push([PREPARE_TESTS]) + +# vec_sub VEC_A VEC_B +# +# Subtracts two vectors: +# +# VEC_A = [a1, a2, ...] +# VEC_B = [b1, b2, ...] +# OUT = [(a1 - b1), (a2 - b2), ...] +# +# VEC_A and VEC_B must be lists of values separated by a character from $IFS. +vec_sub() { + local a b i j + + i=0 + for a in $1; do + j=0 + for b in $2; do + if test $i -eq $j; then + expr $a - $b + break + fi + j=`expr $j + 1` + done + i=`expr $i + 1` + done +} + +# vec_sum VEC +# +# Sums elements of a vector: +# +# VEC = [e1, e2, ...] +# OUT = e1 + e2 + ... +# +# VEC must be a list of values separated by a character from $IFS. +vec_sum() { + local s=0 + + for a in $1; do + s=`expr $s + $a` + done + echo $s +} + +# read_counters SANDBOXES APPLICATION COUNTER +# +# Prints out the coverage COUNTER for the APPLICATION in each of the SANDBOXES. +# +# SANDBOXES must be a list of strings separated by a character from $IFS. +read_counters() { + local sims="$1" app="$2" counter="$3" + + for sim in $sims; do + as $sim ovs-appctl -t "$app" coverage/read-count "$counter" || return 1 + done +} + +# counter_delta_per_sim SANDBOXES APPLICATION COUNTER COMMAND +# +# Runs the COMMAND and reports the COUNTER change registered during the command +# run for the given APPLICATION in each of the SANDBOXES. +counter_delta_per_sim() { + local sims="$1" app="$2" counter="$3" cmd="$4" + local before after diff + + before=$(read_counters "$sims" "$app" "$counter") || return 1 + $cmd || return 1 + after=$(read_counters "$sims" "$app" "$counter") || return 1 + + vec_sub "$after" "$before" +} + +# counter_delta_per_sim SANDBOXES APPLICATION COUNTER COMMAND +# +# Same as counter_delta_per_sim but reports the sum of COUNTERs across all +# SANDBOXES. +counter_delta_in_total() { + vec_sum "$(counter_delta_per_sim "$@")" +} + +m4_divert_pop([PREPARE_TESTS]) + +# CHECK_COUNTER_DELTA_IS_ZERO SANDBOXES APPLICATION COUNTER COMMAND +# +# Runs the COMMAND and checks if the COUNTER value for the APPLICATION in all of +# the SANDBOXES did not change. +m4_define([CHECK_COUNTER_DELTA_IS_ZERO],[ + count=`counter_delta_in_total "$1" "$2" "$3" "$4"` + rc=$? + AT_CHECK([test $rc -eq 0 -a $count -eq 0]) +]) + +# CHECK_COUNTER_DELTA_IS_NOT_ZERO SANDBOXES APPLICATION COUNTER COMMAND +# +# Runs the COMMAND and checks if there COUNTER value for the APPLICATION in +# any of the SANDBOXES has changed. +m4_define([CHECK_COUNTER_DELTA_IS_NOT_ZERO],[ + count=`counter_delta_in_total "$1" "$2" "$3" "$4"` + rc=$? + AT_CHECK([test $rc -eq 0 -a $count -ne 0]) +]) + +# OVN_CONTROLLER_EXPECT_HIT SANDBOXES COUNTER COMMAND +# +# Checks if the COUNTER value has changed for any of the ovn-controller +# processes from the SANDBOXES when the COMMAND was run. +m4_define([OVN_CONTROLLER_EXPECT_HIT],[ + CHECK_COUNTER_DELTA_IS_NOT_ZERO([$1], [ovn-controller], [$2], [$3]) +]) + +# OVN_CONTROLLER_EXPECT_NO_HIT SANDBOXES COUNTER COMMAND +# +# Checks if the COUNTER value has not changed for any of the ovn-controller +# processes from the SANDBOXES when the COMMAND was run. +m4_define([OVN_CONTROLLER_EXPECT_NO_HIT],[ + CHECK_COUNTER_DELTA_IS_ZERO([$1], [ovn-controller], [$2], [$3]) +]) + +AT_SETUP([ovn -- ovn-controller incremental processing]) +# Check which operations the trigger full logical flow processing. +# +# Create and destroy logical routers, switches, ports, address sets and ACLs +# while counting calls to lflow_run() in ovn-controller. + +ovn_start +net_add n1 +for i in 1 2; do + sim_add hv$i + as hv$i + ovs-vsctl add-br br-phys + ovn_attach n1 br-phys 192.168.0.$i +done + +# Add router lr1 +OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lr-add lr1] +) + +for i in 1 2; do + ls=ls$i + lsp=$ls-lr1 + lrp=lr1-$ls + + # Add switch $ls + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv ls-add $ls] + ) + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv add Logical_Switch $ls other_config subnet=10.0.$i.0/24] + ) + + # Add router port to $ls + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lrp-add lr1 $lrp 02:00:00:00:0$i:01 10.0.$i.1/24] + ) + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lsp-add $ls $lsp] + ) + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lsp-set-type $lsp router] + ) + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lsp-set-addresses $lsp router] + ) +done + +for i in 1 2; do + as=as$i + hv=hv$i + ls=ls$i + lp=lp$i + vif=vif$i + + # Add port $lp + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lsp-add $ls $lp] + ) + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lsp-set-addresses $lp "dynamic"] + ) + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv wait-until Logical_Switch_Port $lp 'dynamic_addresses!=[]'] + ) + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv get Logical_Switch_Port $lp dynamic_addresses] + ) + + # Add address set $as + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv create Address_Set name="$as"] + ) + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv add Address_Set "$as" addresses "10.0.$i.10"] + ) + + # Add ACLs for port $lp + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv acl-add $ls to-lport 1001 'outport == "'$lp'" && ip4.src == $'$as' allow'] + ) + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv acl-add $ls to-lport 1000 'outport == "'$lp'" drop'] + ) + + # Bind port $lp + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [as $hv ovs-vsctl add-port br-int $vif -- set Interface $vif external-ids:iface-id=$lp] + ) + + # Wait for port $lp + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv wait-until Logical_Switch_Port $lp 'up=true'] + ) +done + +for i in 1 2; do + as=as$i + ls=ls$i + lp=lp$i + + # Delete port $lp + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv lsp-del $lp] + ) + + # Delete ACLs for port $lp + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv acl-del $ls to-lport 1001 'outport == "'$lp'" && ip4.src == $'$as' allow'] + ) + OVN_CONTROLLER_EXPECT_NO_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv acl-del $ls to-lport 1000 'outport == "'$lp'" drop'] + ) + + # Delete address set $as + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv remove Address_Set "$as" addresses "10.0.$i.10"] + ) + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl --wait=hv destroy Address_Set "$as"] + ) +done + +for i in 1 2; do + ls=ls$i + + # Delete switch $ls + OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl ls-del $ls] + ) +done + +# Delete router lr1 +OVN_CONTROLLER_EXPECT_HIT( + [hv1 hv2], [lflow_run], + [ovn-nbctl lr-del lr1] +) + +OVN_CLEANUP([hv1], [hv2]) + +AT_CLEANUP diff --git a/tests/testsuite.at b/tests/testsuite.at index 15c385e2c..c769770b1 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -80,3 +80,4 @@ m4_include([tests/ovn-controller-vtep.at]) m4_include([tests/mcast-snooping.at]) m4_include([tests/packet-type-aware.at]) m4_include([tests/nsh.at]) +m4_include([tests/ovn-performance.at])