Adjusted limits logic; Added logging around limits to troubleshoot bug;

barbican/model/repositories.py

@@ -55,7 +55,8 @@ db_opts = [
     cfg.IntOpt('sql_retry_interval', default=1),
     cfg.BoolOpt('db_auto_create', default=True),
     cfg.StrOpt('sql_connection', default=None),
-    cfg.IntOpt('max_limit_paging', default=10),
+    cfg.IntOpt('max_limit_paging', default=100),
+    cfg.IntOpt('default_limit_paging', default=10),
 ]
 
 CONF = cfg.CONF
@@ -207,8 +208,11 @@ def clean_paging_values(offset_arg=None, limit_arg=None):
     offset = int(offset_arg) if offset_arg else 0
     offset = offset if offset >= 0 else 0
 
-    limit = int(limit_arg) if limit_arg else CONF.max_limit_paging
+    limit = int(limit_arg) if limit_arg else CONF.default_limit_paging
     limit = limit if limit >= 2 else 2
+    limit = limit if limit <= CONF.max_limit_paging else CONF.max_limit_paging
+    
+    LOG.debug("Limit={0}, offset={1}".format(limit, offset))
 
     return (offset, limit)
 
@@ -448,13 +452,10 @@ class TenantRepo(BaseRepo):
         session = self.get_session(session)
 
         try:
-            LOG.debug("Starting find by keystone_id steps...")
             query = session.query(models.Tenant).filter_by(keystone_id=
                                                            keystone_id)
-            LOG.debug("...query = {0}".format(repr(query)))
 
             entity = query.one()
-            LOG.debug("...post query.one()")
 
         except sa_orm.exc.NoResultFound:
             LOG.exception("Problem getting Tenant {0}".format(keystone_id))
@@ -499,6 +500,8 @@ class SecretRepo(BaseRepo):
 
             entities = query[offset:(offset + limit)]
 
+            LOG.debug('Number entities retrieved: {0}'.format(len(entities)))
+
         except sa_orm.exc.NoResultFound:
             entities = None
             if not suppress_exception:
@@ -597,6 +600,8 @@ class OrderRepo(BaseRepo):
 
             entities = query[offset:(offset + limit)]
 
+            LOG.debug('Number entities retrieved: {0}'.format(len(entities)))
+
         except sa_orm.exc.NoResultFound:
             entities = None
             if not suppress_exception:

bin/barbican-api

@@ -14,7 +14,7 @@ CONF_FILE=$PKG_DIR/barbican-api.ini
 PASTE_FILE=$PKG_DIR/barbican-api-paste.ini
 POLICY_FILE=$PKG_DIR/policy.json
 SIGNING_DIR=$PKG_DIR/cache/
-OPTS=''
+OPTS='--daemonize /var/log/barbican/uwsgi.log'
 
 # Configure for a local deployment environment:
 if [ ! -f $CONF_FILE ];

etc/barbican/barbican-api.conf

@@ -45,8 +45,11 @@ sql_connection = sqlite:///barbican.sqlite
 # before MySQL can drop the connection.
 sql_idle_timeout = 3600
 
+# Default page size for the 'limit' paging URL parameter.
+default_limit_paging = 10
+
 # Maximum page size for the 'limit' paging URL parameter.
-max_limit_paging = 2
+max_limit_paging = 100
 
 # Number of Barbican API worker processes to start.
 # On machines with more than one CPU increasing this value