summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-02drain runner queue and undo cancel_join_threadRoss Brattain9-49/+137
Sometimes the runners can hang. Initially debugging lead to the queue join thread, so I thought we could cancel all the join threads and everything would be okay. But it turns out canceling the queue join threads can lead to corruption of the queues, so when we go to drain the queues the task hangs. But it also turns out that we were not properly draining the queues in the task process. We were waiting for all the runners to exit, then draining the queues. This is bad and will cause the queues to fill up and hang and/or drop data or corrupt the queues. The proper fix seems to be to draining the queues in a loop before calling join with a timeout. Also modified the queue drain loops to no block on queue.get() Revert "cancel all queue join threads" This reverts commit 75c0e3a54b8f6e8fd77c7d9d95decab830159929. Revert "duration runner: add teardown and cancel all queue join threads" This reverts commit 7eb6abb6931b24e085b139cc3500f4497cdde57d. Change-Id: Ic4f8e814cf23615621c1250535967716b425ac18 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-10-01Merge "Fix src/dst ip update in ixia configuration"Ross Brattain1-2/+2
2017-10-01Merge "Adding example testcase to enable multiport support for http"Ross Brattain5-118/+2582
2017-10-01Merge "NSB: cancel all queue join threads"Ross Brattain5-2/+9
2017-10-01Merge "code inspection fixes: test_pktgen"Ross Brattain1-7/+7
2017-10-01Merge "duration runner: add teardown and cancel all queue join threads"Ross Brattain1-5/+20
2017-10-01NSB: cancel all queue join threadsRoss Brattain5-2/+9
In some cases we are blocking in base.Runner join() because the queues are not empty call cancel_join_thread to prevent the Queue from blocking the Process exit https://docs.python.org/3.3/library/multiprocessing.html#all-platforms Joining processes that use queues Bear in mind that a process that has put items in a queue will wait before terminating until all the buffered items are fed by the "feeder" thread to the underlying pipe. (The child process can call the cancel_join_thread() method of the queue to avoid this behaviour.) This means that whenever you use a queue you need to make sure that all items which have been put on the queue will eventually be removed before the process is joined. Otherwise you cannot be sure that processes which have put items on the queue will terminate. Remember also that non-daemonic processes will be joined automatically. Warning As mentioned above, if a child process has put items on a queue (and it has not used JoinableQueue.cancel_join_thread), then that process will not terminate until all buffered items have been flushed to the pipe. This means that if you try joining that process you may get a deadlock unless you are sure that all items which have been put on the queue have been consumed. Similarly, if the child process is non-daemonic then the parent process may hang on exit when it tries to join all its non-daemonic children. cancel_join_thread() Prevent join_thread() from blocking. In particular, this prevents the background thread from being joined automatically when the process exits – see join_thread(). A better name for this method might be allow_exit_without_flush(). It is likely to cause enqueued data to lost, and you almost certainly will not need to use it. It is really only there if you need the current process to exit immediately without waiting to flush enqueued data to the underlying pipe, and you don’t care about lost data. Change-Id: I61f11a3b01109d96b7a5445c60f1e171401157fc Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-10-01duration runner: add teardown and cancel all queue join threadsRoss Brattain1-5/+20
calculate timeout once catch exceptions in benchmark.teardown() In some cases we are blocking in base.Runner join() because the queues are not empty call cancel_join_thread to prevent the Queue from blocking the Process exit https://docs.python.org/3.3/library/multiprocessing.html#all-platforms Joining processes that use queues Bear in mind that a process that has put items in a queue will wait before terminating until all the buffered items are fed by the "feeder" thread to the underlying pipe. (The child process can call the cancel_join_thread() method of the queue to avoid this behaviour.) This means that whenever you use a queue you need to make sure that all items which have been put on the queue will eventually be removed before the process is joined. Otherwise you cannot be sure that processes which have put items on the queue will terminate. Remember also that non-daemonic processes will be joined automatically. Warning As mentioned above, if a child process has put items on a queue (and it has not used JoinableQueue.cancel_join_thread), then that process will not terminate until all buffered items have been flushed to the pipe. This means that if you try joining that process you may get a deadlock unless you are sure that all items which have been put on the queue have been consumed. Similarly, if the child process is non-daemonic then the parent process may hang on exit when it tries to join all its non-daemonic children. cancel_join_thread() Prevent join_thread() from blocking. In particular, this prevents the background thread from being joined automatically when the process exits – see join_thread(). A better name for this method might be allow_exit_without_flush(). It is likely to cause enqueued data to lost, and you almost certainly will not need to use it. It is really only there if you need the current process to exit immediately without waiting to flush enqueued data to the underlying pipe, and you don’t care about lost data. Change-Id: If7b904a060b9ed68b7def78c851deefca4e0de5d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-10-01cancel all queue join threadsRoss Brattain5-0/+16
In some cases we are blocking in base.Runner join() because the queues are not empty call cancel_join_thread to prevent the Queue from blocking the Process exit https://docs.python.org/3.3/library/multiprocessing.html#all-platforms Joining processes that use queues Bear in mind that a process that has put items in a queue will wait before terminating until all the buffered items are fed by the "feeder" thread to the underlying pipe. (The child process can call the cancel_join_thread() method of the queue to avoid this behaviour.) This means that whenever you use a queue you need to make sure that all items which have been put on the queue will eventually be removed before the process is joined. Otherwise you cannot be sure that processes which have put items on the queue will terminate. Remember also that non-daemonic processes will be joined automatically. Warning As mentioned above, if a child process has put items on a queue (and it has not used JoinableQueue.cancel_join_thread), then that process will not terminate until all buffered items have been flushed to the pipe. This means that if you try joining that process you may get a deadlock unless you are sure that all items which have been put on the queue have been consumed. Similarly, if the child process is non-daemonic then the parent process may hang on exit when it tries to join all its non-daemonic children. cancel_join_thread() Prevent join_thread() from blocking. In particular, this prevents the background thread from being joined automatically when the process exits – see join_thread(). A better name for this method might be allow_exit_without_flush(). It is likely to cause enqueued data to lost, and you almost certainly will not need to use it. It is really only there if you need the current process to exit immediately without waiting to flush enqueued data to the underlying pipe, and you don’t care about lost data. Change-Id: I345c722a752bddf9f0824a11cdf52ae9f04669af Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-10-01code inspection fixes: test_pktgenRoss Brattain1-7/+7
Change-Id: I05cb069984b7674924cfcb1ed023048c0aa0c444 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-30Adding example testcase to enable multiport support for httpDeepak S5-118/+2582
Change-Id: I780aa3ea6b04df08baffb5ee5beff66bdc37f37e Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-09-30Merge "dpdk: pciutils and lspci is required for dpdk-devbind.py"Ross Brattain1-0/+1
2017-09-30Merge "replace ansible modules"Ross Brattain19-1680/+124
2017-09-30Merge "Adapt getting the image architecture to mcp"Ross Brattain1-4/+7
2017-09-30Merge "bugfix: tc054 default value is wrong"Jing Lu2-60/+27
2017-09-30Merge "Remove checkno.png and checkyes.png due to license issue"Jing Lu7-18/+18
2017-09-30Remove checkno.png and checkyes.png due to license issuechenjiankun7-18/+18
JIRA: YARDSTICK-817 Since checkno.png and checkyes.png is not Apache-2 license based. so we need to remove them. Change-Id: I40dd303fb54a3736ca969ac1c186d2cd23408436 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-09-29Fix src/dst ip update in ixia configurationDeepak S1-2/+2
Change-Id: I03976c182e164a512a5ef48ad20928f27451c3f6 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-09-29Auto create ixia config based on the traffic profileDeepak S11-310/+96
Change-Id: I031cc7f24f0c0816eb577a4d1606a714f68a5f83 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-29Merge "NSB: ignore VNF node if there is no VNF model"Ross Brattain1-1/+5
2017-09-29replace ansible modulesRoss Brattain19-1680/+124
Change-Id: Ia7c1ce781075142910a6c618a9a23f34a710dfe9 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-29Adapt getting the image architecture to mcpCristina Pauna1-4/+7
The part which gets the image architecture still uses the old fuel command. Adapted the script to use the mcp command. JIRA: ARMBAND-285 Change-Id: Iddce77c3a856ea11f9994861151db89a402e735e Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2017-09-29dpdk: pciutils and lspci is required for dpdk-devbind.pyRoss Brattain1-0/+1
Change-Id: I8529f33d849fc659b557e1d19761c0765ebda57e Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-29bugfix: tc054 default value is wrongrexlee87762-60/+27
management route ip is not common in most SUTs, so it should be removed. also huawei pod1 ipmi info should updated so this test case can be added into ci later Change-Id: I3a29c59c473ee7087d4d61753ffc955b061571fb Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-09-28Adjusted IPs in some prox tests.Maciej Skrocki2-4/+4
Change-Id: Iff39fa5b90d1ae5534ce1fff31dfb84c1e47340c Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-09-28Merge "add collectd ansible"Ross Brattain34-6/+721
2017-09-28Switched to stable/euphrates for samplevnfs projextMaciej Skrocki1-1/+1
Change-Id: I0305c263740c25bdfa3bb2667838ca2b75d33ba0 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-09-28add collectd ansibleRoss Brattain34-6/+721
required DPDK fixes to enable building collectd with dpdkstats need /usr/lib/dpdk-pmd symlinks Compiling all this code requies more space than the default ubuntu cloud-image, so we need to resize the cloud image somehow Change-Id: Ib39fc94ba8101ca1aebc7d2a710be88b0338f7c3 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-09-28Merge "vnf_generic: Fix str object has no attribute items"Ross Brattain2-4/+14
2017-09-28Added hw_vif_multiqueue_enabled metadata to the added samplevnfs image in ↵Maciej Skrocki1-1/+2
OpenStack. Change-Id: Iad1dce6b0d0a1c010aa62f2fdf54c5d0560ed0c7 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-09-28vnf_generic: Fix str object has no attribute itemsDino Madarang2-4/+14
When an IP range is specified in src_ip/dst_ip like: src_ip: - '152.16.100.180-152.16.100.181' yardstick would return str object has no attribute items error. This change will return the IP range as is if type is str. Change-Id: I3b097777f0d85b0600207157bebba18987ea2275 Signed-off-by: Dino Simeon Madarang <dinox.madarang@intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-28Merge "Addition of Prox NSB BNG and BNG-QoS test"Ross Brattain49-664/+72200
2017-09-28NSB: ignore VNF node if there is no VNF modelRoss Brattain1-1/+5
Change-Id: I571289c744441a6114c6d45ac6cbd7cfc0dafef2 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-28Merge "collectd: add config file templates as package_data"Ross Brattain1-0/+2
2017-09-28collectd: add config file templates as package_dataRoss Brattain1-0/+2
needed for pkg_resources.resource_string Change-Id: Ief7a8fcd88fd6d371851a26e1559351963979e68 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-28Merge "Get node IPs and IDs according to env"Ross Brattain1-15/+11
2017-09-28Addition of Prox NSB BNG and BNG-QoS testAbhijit Sinha49-664/+72200
JIRA: YARDSTICK-802 Added Prox BNG and BNG-QoS Test - The tests supports BM, Openstack Heat - Supports 4 ports - Test added for BNG traffic profile - Fixed the Prox heat test cases with proper upstream and downstream links - Grafana Dashboard for BNG & BNG-QoS added - Increased the test Duration to 300 TODO: - Test does not Terminate correctly Update: Added new helper class for run_test: Genric, MPLS and BNG tests. Change-Id: Ib40811bedb45a3c3030643943f32679a4044e076 Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com> Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com>
2017-09-28Create test suite for Euphrates releasechenjiankun3-0/+138
JIRA: YARDSTICK-814 Test suite: "opnfv_os-odl-fdio-ha_daily.yaml", "opnfv_os-odl-dvr-noha_daily.yaml", "opnfv_os-odl-sfc-noha_daily.yaml" are missing in yardstick-apex-baremetal-daily-euphrates job. We need to create them. Change-Id: I6d8bbeb17cd887776f1f3b401ec80523ea90d3c1 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-09-27Merge "[PATCH] Patch for Yardstick arm64 netperf_install.bash"Ross Brattain1-0/+42
2017-09-27Merge "collectd: write config file from Jinja2 template"Ross Brattain7-223/+175
2017-09-27Get node IPs and IDs according to envCatalina Focsa1-15/+11
Extract node IPs and IDs for each node having a controller or compute role (name starting with the "cmp" or "ctl" prefix) and add them into the $pod_yaml file, analogous to the previous implementation. Since node IDs are expected to be unique and integers (condition that does not match the salt node ID format), they are substituted with an incremented index for each controller/compute node in the environment. Change-Id: Id90626edc3f098bd96343336b2be179721dee5a1 Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
2017-09-26Terminate the run traffic if initiated after traffic is closedDeepak S1-14/+15
Change-Id: I89fc4bccb5b5a0d49d804fca72b59e53ff77a805 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-09-27collectd: write config file from Jinja2 templateRoss Brattain7-223/+175
We have the collectd.conf inside the python package so instead of copying it from various places, write the template directly to the remote system. collectd: read collect.conf template with pkgresources read the collectd.conf file as a string directly and upload without creating temp file use Jinja2 template, disable failing plugins use proper Jinja2 template, disable the plugins that were failing to load and blocking startup add support for per-testcase collectd.conf config using YAML add support for custom interval, default is 25 seconds Change-Id: Id904f7b7c9f41a9dd7adf5dfa06c064d65c25d2d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-26Merge "Adding multi-port support for ixia taffic generator"Ross Brattain9-113/+201
2017-09-26Merge "Fix vPE VNF characterization issues."Ross Brattain7-45/+174
2017-09-26Adding multi-port support for ixia taffic generatorDeepak S9-113/+201
Change-Id: Ic8aa130f3cdc7bd8dec39d06a6b824340bf658b2 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-26Merge "Enable IP_ROUTING for netperf UDP_STREAM test"Ross Brattain1-0/+4
2017-09-26Merge "Read user & password from yardstick.conf in Grafana configuration"Rex Lee2-20/+8
2017-09-26Merge "bugfix: tc055 fail due to options with no value"Jing Lu1-1/+0
2017-09-26Merge "Add nodeSelector to enable selecting the desired Kubernetes running ↵Rex Lee2-3/+15
node when creating containers for Kubernetes context"