From e0b9e9a87cd00625eec5a6ee0eb5d31705c2db25 Mon Sep 17 00:00:00 2001 From: Dina Belova Date: Wed, 30 Mar 2016 17:52:43 +0300 Subject: [PATCH] Add Keystone Performance testing cache stats Change-Id: Ib341efc4cca223afd63deb6c7c0b8719d615bfef --- .../all-in-one/liberty_fernet_cache_on.rst | 113 +++++++++++++ .../all-in-one/liberty_uuid_cache_on.rst | 72 +++++++++ .../all-in-one/mitaka_fernet_cache_on.rst | 96 +++++++++++ .../all-in-one/mitaka_uuid_cache_on.rst | 149 ++++++++++++++++++ .../test_results/keystone/parse_json_res.py | 34 +++- 5 files changed, 459 insertions(+), 5 deletions(-) diff --git a/doc/source/test_results/keystone/all-in-one/liberty_fernet_cache_on.rst b/doc/source/test_results/keystone/all-in-one/liberty_fernet_cache_on.rst index e1ad747..724b250 100644 --- a/doc/source/test_results/keystone/all-in-one/liberty_fernet_cache_on.rst +++ b/doc/source/test_results/keystone/all-in-one/liberty_fernet_cache_on.rst @@ -106,6 +106,33 @@ Endpoint list request stats | **DB query** | **Time spent, ms** | +--------------+--------------------+ +**Cached operations stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _validate_token | , 'gAAAAABW-UBZFYDCk76jI3hJvTg2gRpANGk0J- | | 9 | +| | QqtTldQ7cCs2dRIPR1kw_BJzDcklb3IAAlPzAalHqPDfTyJUhNN4T0zNuIFf92lMEu-cyVRxZBVw-OLY8hO- | | | +| | nxOgh1FoLBqwe6SZgi0MvFVEdvgb9tfDKynks_CB1ApQtPmi3pkC54obPwHnY' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 10 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user | , '020fbf5e143146c2aa3816a5eb07e65b' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , 'e1ec2c364fa4480c9dd8db33e1de097e' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'e1ec2c364fa4480c9dd8db33e1de097e' | | 10 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 8 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Server create request stats ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -217,6 +244,33 @@ Server create request stats | **DB query** | **Time spent, ms** | +--------------+--------------------+ +**Cached operations stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , 'e1ec2c364fa4480c9dd8db33e1de097e' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user | , '020fbf5e143146c2aa3816a5eb07e65b' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _validate_token | , 'gAAAAABW-Tn9YF8 | | 1 | +| | -QHo3fneFWxPDbURkdQ1pFiQ4HwZcr3wilSG17WeilkpuKy16b0tcXvxUC3x7xXw7rVE5bUDhnuXup- | | | +| | EvzKd6k4aNHlPwqwemh0djiEdEmhyjfxXB76_fF0kcQlL2iw2l6MN42BQO_oU1OFYE01-9nTeheFIsii3rBkERAYQ' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'e1ec2c364fa4480c9dd8db33e1de097e' | | 10 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 10 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Service list request stats ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -322,6 +376,30 @@ Service list request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Cached operations stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user | , '020fbf5e143146c2aa3816a5eb07e65b' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , 'e1ec2c364fa4480c9dd8db33e1de097e' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'e1ec2c364fa4480c9dd8db33e1de097e' | | 10 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 7 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ + **Keystone DB queries with multi JOINs inside** +--------------+--------------------+ @@ -445,6 +523,17 @@ Token issue request stats | **DB query** | **Time spent, ms** | +--------------+--------------------+ +**Cached operations stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'e1ec2c364fa4480c9dd8db33e1de097e' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ User list request stats ~~~~~~~~~~~~~~~~~~~~~~~ @@ -561,3 +650,27 @@ User list request stats +--------------+--------------------+ | **DB query** | **Time spent, ms** | +--------------+--------------------+ + +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user | , '020fbf5e143146c2aa3816a5eb07e65b' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , 'e1ec2c364fa4480c9dd8db33e1de097e' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'e1ec2c364fa4480c9dd8db33e1de097e' | | 10 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'66ad606d34854993a502159d5aeb2220' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 8 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ diff --git a/doc/source/test_results/keystone/all-in-one/liberty_uuid_cache_on.rst b/doc/source/test_results/keystone/all-in-one/liberty_uuid_cache_on.rst index 1067f05..7bda9b2 100644 --- a/doc/source/test_results/keystone/all-in-one/liberty_uuid_cache_on.rst +++ b/doc/source/test_results/keystone/all-in-one/liberty_uuid_cache_on.rst @@ -103,6 +103,28 @@ Endpoint list request stats | **DB query** | **Time spent, ms** | +--------------+--------------------+ +**Cached operations stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _validate_token | , '0038b99a5d8b4888b54b41d5799f56a2' | | 9 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 1 | +| | '0038b99a5d8b4888b54b41d5799f56a2' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 10 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'68e61c80e05244f2ab9af0a9e2e0320a' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'741271ef2a554242af037d66d6682e3f' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Server create request stats ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -215,6 +237,26 @@ Service list request stats | **DB query** | **Time spent, ms** | +--------------+--------------------+ +**Cached operations stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user_by_name | , u'admin', 'default' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project_by_name | , u'admin', 'default' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 1 | +| | '1c61ea5b4b4c4583aa9c394631cf458b' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'68e61c80e05244f2ab9af0a9e2e0320a' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'741271ef2a554242af037d66d6682e3f' | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Token issue request stats ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -320,6 +362,15 @@ Token issue request stats | **DB query** | **Time spent, ms** | +--------------+--------------------+ +**Cached operations stats** + ++-----------------------+------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'741271ef2a554242af037d66d6682e3f' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------+------------+----------------+ User list request stats ~~~~~~~~~~~~~~~~~~~~~~~ @@ -424,3 +475,24 @@ User list request stats +--------------+--------------------+ | **DB query** | **Time spent, ms** | +--------------+--------------------+ + +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project_by_name | , u'admin', 'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 1 | +| | 'b7cf92a4467145c888974097112c2c3d' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'68e61c80e05244f2ab9af0a9e2e0320a' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'741271ef2a554242af037d66d6682e3f' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 4 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ diff --git a/doc/source/test_results/keystone/all-in-one/mitaka_fernet_cache_on.rst b/doc/source/test_results/keystone/all-in-one/mitaka_fernet_cache_on.rst index 058c2f8..78f53f9 100644 --- a/doc/source/test_results/keystone/all-in-one/mitaka_fernet_cache_on.rst +++ b/doc/source/test_results/keystone/all-in-one/mitaka_fernet_cache_on.rst @@ -256,6 +256,23 @@ Endpoint list request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'4ed859be7342465c945448395bac826f' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'4ed859be7342465c945448395bac826f' | | 9 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 9 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , '267e50e2487c46cdb60c1ec82adce5f9' | | 27 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'267e50e2487c46cdb60c1ec82adce5f9' | | 6 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Server create request stats ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -508,6 +525,39 @@ Server create request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 64 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , '2dc93f73479940d0b39ce2e4c52c108c' | | 106 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 160 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'c76d7947edb44079b7fca0b376674315' | | 36 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'3481c11394a64189bafc60551e1ee25c' | | 2 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'1f093e18f4ab4318bdb2876a03d81811' | | 6 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , '1f093e18f4ab4318bdb2876a03d81811' | | 108 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user | , 'a74255d40f634b9d8c83e7fb0959c082' | | 10 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_roles_for_user_and_project | , 'a74255d40f634b9d8c83e7fb0959c082', | | 10 | +| | '2dc93f73479940d0b39ce2e4c52c108c' | | | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_roles_for_user_and_project | , 'b4a6b5f09b9c4b57a582b16537f4a976', | | 27 | +| | '1f093e18f4ab4318bdb2876a03d81811' | | | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'3481c11394a64189bafc60551e1ee25c' | | 66 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_user | , 'b4a6b5f09b9c4b57a582b16537f4a976' | | 27 | ++--------------------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Service list request stats ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -760,6 +810,23 @@ Service list request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'4ed859be7342465c945448395bac826f' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'4ed859be7342465c945448395bac826f' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , '267e50e2487c46cdb60c1ec82adce5f9' | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'267e50e2487c46cdb60c1ec82adce5f9' | | 6 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Token issue request stats ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -998,6 +1065,17 @@ Token issue request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'4ed859be7342465c945448395bac826f' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'267e50e2487c46cdb60c1ec82adce5f9' | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ User list request stats ~~~~~~~~~~~~~~~~~~~~~~~ @@ -1267,3 +1345,21 @@ User list request stats | | | | | | | +------------------------------------------------------------------------------------------------------+--------------------+ + +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'4ed859be7342465c945448395bac826f' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'4ed859be7342465c945448395bac826f' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , '267e50e2487c46cdb60c1ec82adce5f9' | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'267e50e2487c46cdb60c1ec82adce5f9' | | 6 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ diff --git a/doc/source/test_results/keystone/all-in-one/mitaka_uuid_cache_on.rst b/doc/source/test_results/keystone/all-in-one/mitaka_uuid_cache_on.rst index e1f5c59..b10e14c 100644 --- a/doc/source/test_results/keystone/all-in-one/mitaka_uuid_cache_on.rst +++ b/doc/source/test_results/keystone/all-in-one/mitaka_uuid_cache_on.rst @@ -211,6 +211,17 @@ Endpoint list request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'a465ecd9f7004c38b30792a07b363b2c' | | 6 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'31c541984f48440ab8753d11d84e58ca' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Server create request stats ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -498,6 +509,110 @@ Server create request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 6 | +| | 'c1613dbf55ac423fb5c0ae8833e4884b' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_revoke_tree | , | | 66 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'a7e61cc2e4634e8c9179257bdb8dcb47' | | 81 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'141ab89993aa4d9fa645540dad1a3e2a' | | 27 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 16 | +| | 'c1613dbf55ac423fb5c0ae8833e4884b' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 27 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 5 | +| | 'c1613dbf55ac423fb5c0ae8833e4884b' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'a7e61cc2e4634e8c9179257bdb8dcb47' | | 6 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 5 | +| | 'e9d77e583df44f7ebf84de745882e722' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _get_token | , | | 1 | +| | 'e9d77e583df44f7ebf84de745882e722' | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| _validate_v3_token | , {u'tenant': {u'domain': {u'id': | | 6 | +| | u'default', u'name': u'Default'}, u'id': u'87dfc2348604428590293a3e6ec1c62c', u'name': u'service'}, | | | +| | 'user_id': u'bb2514e4901d4682a8ebdedc13b8df83', 'expires': datetime.datetime(2016, 3, 29, 21, 26, | | | +| | 35), u'token_data': {u'token': {u'methods': [u'password'], u'roles': [{u'id': | | | +| | u'bab7f95dd62e46d68d6aecca9d18c4fd', u'name': u'service'}], u'expires_at': | | | +| | u'2016-03-29T21:26:35.010736Z', u'project': {u'domain': {u'id': u'default', u'name': u'Default'}, | | | +| | u'id': u'87dfc2348604428590293a3e6ec1c62c', u'name': u'service'}, u'catalog': [{u'endpoints': | | | +| | [{u'url': u'http://10.0.2.15:8776/v1/87dfc2348604428590293a3e6ec1c62c', u'interface': u'public', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'56205029c0a1478cbd8c4fc075315746'}, | | | +| | {u'url': u'http://10.0.2.15:8776/v1/87dfc2348604428590293a3e6ec1c62c', u'interface': u'admin', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'80de6747b5f14681a14ebcadcd1bfa3c'}, | | | +| | {u'url': u'http://10.0.2.15:8776/v1/87dfc2348604428590293a3e6ec1c62c', u'interface': u'internal', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'cba6f65a146b4973ace876b38b3480b9'}], | | | +| | u'type': u'volume', u'id': u'4ebaed7acb634017a6913526311d98e9', u'name': u'cinder'}, {u'endpoints': | | | +| | [{u'url': u'http://10.0.2.15:8776/v2/87dfc2348604428590293a3e6ec1c62c', u'interface': u'public', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'853305e44f5d4236b081a46e1e9b83af'}, | | | +| | {u'url': u'http://10.0.2.15:8776/v2/87dfc2348604428590293a3e6ec1c62c', u'interface': u'admin', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'89fdb562d14e40e4ba01268ae79910c5'}, | | | +| | {u'url': u'http://10.0.2.15:8776/v2/87dfc2348604428590293a3e6ec1c62c', u'interface': u'internal', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'b27a27f962e44d69939a30ef3cb6b2a3'}], | | | +| | u'type': u'volumev2', u'id': u'4f1650e001bb49b1a995755b88812998', u'name': u'cinderv2'}, | | | +| | {u'endpoints': [{u'url': u'http://10.0.2.15:8774/v2/87dfc2348604428590293a3e6ec1c62c', u'interface': | | | +| | u'admin', u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': | | | +| | u'605496c2c01549e09e3c3511d5d050c1'}, {u'url': | | | +| | u'http://10.0.2.15:8774/v2/87dfc2348604428590293a3e6ec1c62c', u'interface': u'internal', u'region': | | | +| | u'RegionOne', u'region_id': u'RegionOne', u'id': u'a359f6aaf80643dd90fd5598f4cf0614'}, {u'url': | | | +| | u'http://10.0.2.15:8774/v2/87dfc2348604428590293a3e6ec1c62c', u'interface': u'public', u'region': | | | +| | u'RegionOne', u'region_id': u'RegionOne', u'id': u'f552054d19ca4cfe981ca02ff4558595'}], u'type': | | | +| | u'compute_legacy', u'id': u'4fb62933662a4017ac2f8beb7239a7c5', u'name': u'nova_legacy'}, | | | +| | {u'endpoints': [{u'url': u'http://10.0.2.15:8774/v2.1/87dfc2348604428590293a3e6ec1c62c', | | | +| | u'interface': u'internal', u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': | | | +| | u'21878ce4ff7d48a89f621675d89a0994'}, {u'url': | | | +| | u'http://10.0.2.15:8774/v2.1/87dfc2348604428590293a3e6ec1c62c', u'interface': u'public', u'region': | | | +| | u'RegionOne', u'region_id': u'RegionOne', u'id': u'645b3a5079ae4ed68c61890659b0af96'}, {u'url': | | | +| | u'http://10.0.2.15:8774/v2.1/87dfc2348604428590293a3e6ec1c62c', u'interface': u'admin', u'region': | | | +| | u'RegionOne', u'region_id': u'RegionOne', u'id': u'b20358e6f0574a4abbefd7d9fea42d27'}], u'type': | | | +| | u'compute', u'id': u'8c04194b75b846618a673b59a0a4bf3c', u'name': u'nova'}, {u'endpoints': [{u'url': | | | +| | u'http://10.0.2.15:9292', u'interface': u'admin', u'region': u'RegionOne', u'region_id': | | | +| | u'RegionOne', u'id': u'3f4f3c602e0c4b94aaef28d42f3fe1bc'}, {u'url': u'http://10.0.2.15:9292', | | | +| | u'interface': u'internal', u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': | | | +| | u'610b5a73106b412a992ad987782b7cd0'}, {u'url': u'http://10.0.2.15:9292', u'interface': u'public', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'f39bfd16ee7e43b7bc82fd78eb20a9c4'}], | | | +| | u'type': u'image', u'id': u'a4d2690b9ad34c4ea4e2eafe12125496', u'name': u'glance'}, {u'endpoints': | | | +| | [{u'url': u'http://10.0.2.15:8777', u'interface': u'public', u'region': u'RegionOne', u'region_id': | | | +| | u'RegionOne', u'id': u'40f20ee570504169902791abf506a49c'}, {u'url': u'http://10.0.2.15:8777', | | | +| | u'interface': u'internal', u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': | | | +| | u'49b66e88bdda4e648855b2c0e8b55227'}, {u'url': u'http://10.0.2.15:8777', u'interface': u'admin', | | | +| | u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': u'5f2f9f9a58064a04a449a170d176bce4'}], | | | +| | u'type': u'metering', u'id': u'ac90aa229d7048adb18219359fbbd437', u'name': u'ceilometer'}, | | | +| | {u'endpoints': [{u'url': u'http://10.0.2.15:9696/', u'interface': u'public', u'region': | | | +| | u'RegionOne', u'region_id': u'RegionOne', u'id': u'12dbac67dfd842929a73cc2da267a585'}, {u'url': | | | +| | u'http://10.0.2.15:9696/', u'interface': u'admin', u'region': u'RegionOne', u'region_id': | | | +| | u'RegionOne', u'id': u'b6f1f5f59a3649658a1c02c7c9be0e6b'}, {u'url': u'http://10.0.2.15:9696/', | | | +| | u'interface': u'internal', u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': | | | +| | u'd4f8473ff3bc4ba6ad754c5b9ea6fe11'}], u'type': u'network', u'id': | | | +| | u'e86e501b77344f35a4877f48f570f86a', u'name': u'neutron'}, {u'endpoints': [{u'url': | | | +| | u'http://10.0.2.15:5000/v2.0', u'interface': u'public', u'region': u'RegionOne', u'region_id': | | | +| | u'RegionOne', u'id': u'32eedd79382e42a693ae4ae36104e257'}, {u'url': u'http://10.0.2.15:5000/v2.0', | | | +| | u'interface': u'internal', u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': | | | +| | u'6c623f00190348aea66a29e86e980449'}, {u'url': u'http://10.0.2.15:35357/v2.0', u'interface': | | | +| | u'admin', u'region': u'RegionOne', u'region_id': u'RegionOne', u'id': | | | +| | u'c4f3f0e4a90542e6af07805a9570a91d'}], u'type': u'identity', u'id': | | | +| | u'f0dc03fd61e84f338abd2b40371a767a', u'name': u'keystone'}], u'user': {u'domain': {u'id': | | | +| | u'default', u'name': u'Default'}, u'id': u'bb2514e4901d4682a8ebdedc13b8df83', u'name': u'neutron'}, | | | +| | u'audit_ids': [u'1rgcCrgFQJqlLiCoeniFUQ'], u'issued_at': u'2016-03-29T20:26:35.010777Z'}}, u'user': | | | +| | {u'domain': {u'id': u'default', u'name': u'Default'}, u'id': u'bb2514e4901d4682a8ebdedc13b8df83', | | | +| | u'name': u'neutron'}, u'key': u'e9d77e583df44f7ebf84de745882e722', u'token_version': u'v3.0', 'id': | | | +| | u'e9d77e583df44f7ebf84de745882e722', 'trust_id': None, u'metadata': {u'roles': | | | +| | [u'bab7f95dd62e46d68d6aecca9d18c4fd']}} | | | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'141ab89993aa4d9fa645540dad1a3e2a' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Service list request stats ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -791,6 +906,17 @@ Service list request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'a465ecd9f7004c38b30792a07b363b2c' | | 6 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'31c541984f48440ab8753d11d84e58ca' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ Token issue request stats ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1063,6 +1189,17 @@ Token issue request stats | | | | +------------------------------------------------------------------------------------------------------+--------------------+ +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'a465ecd9f7004c38b30792a07b363b2c' | | 3 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'31c541984f48440ab8753d11d84e58ca' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 1 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ User list request stats ~~~~~~~~~~~~~~~~~~~~~~~ @@ -1366,3 +1503,15 @@ User list request stats | | | | | | | +------------------------------------------------------------------------------------------------------+--------------------+ + +**Keystone cached methods stats** + ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| **Cached operations** | **args** | **kwargs** | **Times used** | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_project | , u'a465ecd9f7004c38b30792a07b363b2c' | | 6 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_role | , u'31c541984f48440ab8753d11d84e58ca' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ +| get_domain | , u'default' | | 2 | ++-----------------------+------------------------------------------------------------------------------------------------------+------------+----------------+ diff --git a/doc/source/test_results/keystone/parse_json_res.py b/doc/source/test_results/keystone/parse_json_res.py index c213952..9cc9a76 100644 --- a/doc/source/test_results/keystone/parse_json_res.py +++ b/doc/source/test_results/keystone/parse_json_res.py @@ -254,7 +254,27 @@ def prepare_tables(nodes): for query in NODES["DB queries"]["red_flag"][key][ "time_spent"][ts]: multi_join_queries.add_row([db_query_tmpl % query, ts]) - return common_info_table, multi_join_queries, outliers_table + + # prepare table with cache info + cache_table = prettytable.PrettyTable(["**Cached operations**", + "**args**", + "**kwargs**", + "**Times used**"]) + cache_table.align["**Cached operations**"] = "l" + cache_table.align["**args**"] = "l" + cache_table.align["**kwargs**"] = "l" + cache_table.align["**Times used**"] = "l" + cache_table.max_width = 100 + cache_table.header = True + cache_table.hrules = prettytable.ALL + + for operation, times in nodes["Cached operations"].iteritems(): + operation = operation[1:-1].split(", ") + cache_table.add_row([operation[0][1:-1], + ", ".join(operation[1:-1])[1:-1], + operation[-1][1:-1], times]) + + return common_info_table, multi_join_queries, outliers_table, cache_table def main(): @@ -271,11 +291,12 @@ def main(): data = json.load(data_file) define_nodes(data) nodes = sort_dicts(NODES) - common_info_table, multi_join_queries, outliers_table = \ - prepare_tables(nodes) + common_info_table, multi_join_queries, outliers_table,\ + cache_table = prepare_tables(nodes) print(common_info_table) print(outliers_table) print(multi_join_queries) + print(cache_table) elif os.path.isdir(args.path): for item in os.listdir(args.path): if item.endswith(".txt"): @@ -284,8 +305,8 @@ def main(): NODES = copy.deepcopy(NODES_TEMPLATE) define_nodes(data) nodes = sort_dicts(NODES) - common_info_table, multi_join_queries, outliers_table = \ - prepare_tables(nodes) + common_info_table, multi_join_queries, outliers_table,\ + cache_table = prepare_tables(nodes) item_name = \ item.split(".")[0].replace("_", " ").capitalize() + \ " request stats" @@ -299,6 +320,9 @@ def main(): "JOINs inside") print(multi_join_queries) print("\n") + print("**Keystone cached methods stats**\n") + print(cache_table) + print("\n") if __name__ == "__main__":