From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 19 Nov 2014 17:54:02 +0000 (+0100)
Subject: ceph_objectstore_tool: add pgnum option
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b29c91187b709b2a66643c4de8b9e9c5ff6b1664;p=ceph.git

ceph_objectstore_tool: add pgnum option

Instead of hardcoding 12 use a configuration option that defaults to
12. It is handy during development to lower the number to 4 and speed up
the test cycle.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit d0caf5cdffe26f27b0a25ebdb96d9b0fd37ffffc)
---

diff --git a/tasks/ceph_objectstore_tool.py b/tasks/ceph_objectstore_tool.py
index ad28063e20c..4ea6ad255f1 100644
--- a/tasks/ceph_objectstore_tool.py
+++ b/tasks/ceph_objectstore_tool.py
@@ -144,7 +144,8 @@ def task(ctx, config):
     The config should be as follows::
 
         ceph_objectstore_tool:
-          objects: <number of objects>
+          objects: 20 # <number of objects>
+          pgnum: 12
     """
 
     if config is None:
@@ -200,11 +201,14 @@ def task(ctx, config):
     manager.raw_cluster_cmd('osd', 'set', 'noout')
     manager.raw_cluster_cmd('osd', 'set', 'nodown')
 
+    PGNUM = config.get('pgnum', 12)
+    log.info("pgnum: {num}".format(num=PGNUM))
+
     ERRORS = 0
 
     REP_POOL = "rep_pool"
     REP_NAME = "REPobject"
-    create_replicated_pool(cli_remote, REP_POOL, 12)
+    create_replicated_pool(cli_remote, REP_POOL, PGNUM)
     ERRORS += test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME)
 
     if ERRORS == 0: