openstack
/
deb-gnocchi
Code Issues Proposed changes

tools: make measure injector works without gnocchiclient 

Change-Id: I838b86ef92a44bb47e059a62ca40457008b96164
This commit is contained in:
Julien Danjou 2017-02-01 17:36:47 +01:00
parent c7c1f64981
commit 6e41c34c31
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/gate/post_test_hook.sh
View File

@ -46,7 +46,6 @@ curl -X GET ${GNOCCHI_SERVICE_URL}/v1/archive_policy -H "Content-Type: applicati
sudo gnocchi-upgrade sudo gnocchi-upgrade
# Just ensure tools still works # Just ensure tools still works
gnocchi metric create
sudo -E -H -u stack $GNOCCHI_DIR/tools/measures_injector.py --metrics 1 --batch-of-measures 2 --measures-per-batch 2 sudo -E -H -u stack $GNOCCHI_DIR/tools/measures_injector.py --metrics 1 --batch-of-measures 2 --measures-per-batch 2
# NOTE(sileht): on swift job permissions are wrong, I don't known why # NOTE(sileht): on swift job permissions are wrong, I don't known why

21
tools/measures_injector.py
View File

@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import random import random
import uuid
from concurrent import futures from concurrent import futures
from oslo_config import cfg from oslo_config import cfg
@ -28,7 +29,9 @@ from gnocchi import utils
def injector(): def injector():
conf = cfg.ConfigOpts() conf = cfg.ConfigOpts()
conf.register_cli_opts([ conf.register_cli_opts([
cfg.IntOpt("metrics"), cfg.IntOpt("metrics", default=1, min=1),
cfg.StrOpt("archive-policy-name", default="low"),
cfg.StrOpt("creator", default="admin"),
cfg.IntOpt("batch-of-measures", default=1000), cfg.IntOpt("batch-of-measures", default=1000),
cfg.IntOpt("measures-per-batch", default=10), cfg.IntOpt("measures-per-batch", default=10),
]) ])
@ -37,11 +40,12 @@ def injector():
index.connect() index.connect()
s = storage.get_driver(conf) s = storage.get_driver(conf)
metrics = index.list_metrics() def todo():
if conf.metrics: metric = index.create_metric(
metrics = metrics[:conf.metrics] uuid.uuid4(),
creator=conf.creator,
archive_policy_name=conf.archive_policy_name)
def todo(metric):
for _ in six.moves.range(conf.batch_of_measures): for _ in six.moves.range(conf.batch_of_measures):
measures = [ measures = [
storage.Measure( storage.Measure(
@ -49,10 +53,9 @@ def injector():
for __ in six.moves.range(conf.measures_per_batch)] for __ in six.moves.range(conf.measures_per_batch)]
s.incoming.add_measures(metric, measures) s.incoming.add_measures(metric, measures)
with futures.ThreadPoolExecutor(max_workers=len(metrics)) as executor: with futures.ThreadPoolExecutor(max_workers=conf.metrics) as executor:
# We use 'list' to iterate all threads here to raise the first for m in six.moves.range(conf.metrics):
# exception now, not much choice executor.submit(todo)
list(executor.map(todo, metrics))
if __name__ == '__main__': if __name__ == '__main__':