Commit 74ee7606 authored by Filippos Giannakos's avatar Filippos Giannakos
Browse files

Merge branch 'feature-rados' into develop

Conflicts:
	snf-pithos-app/README
parents e10a4628 664e46e8
......@@ -49,7 +49,10 @@ PITHOS_BACKEND_VERSIONING auto
PITHOS_BACKEND_FREE_VERSIONING True Default versioning debit policy (default free)
PITHOS_UPDATE_MD5 True Update object checksums when using hashmaps
PITHOS_SERVICE_TOKEN '' Service token acquired by the identity provider (astakos)
=============================== ==================================================== ============================================================
PITHOS_RADOS_STORAGE False Enables or disables secondary Pithos storage on RADOS
PITHOS_RADOS_POOL_BLOCKS None RADOS pool to be used for block storage
PITHOS_RADOS_POOL_MAPS None RADOS pool to be used for maps storage
=============================== ================================================== ============================================================
To update checksums asynchronously, enable the queue, install snf-pithos-tools and use ``pithos-dispatcher``::
......
......@@ -57,7 +57,7 @@ class Blocker(object):
if params['blockpool']:
from radosblocker import RadosBlocker
self.rblocker = RadosBlocker(**params)
except:
except KeyError:
pass
self.fblocker = FileBlocker(**params)
......
......@@ -47,7 +47,7 @@ class Mapper(object):
if params['mappool']:
from radosmapper import RadosMapper
self.rmap = RadosMapper(**params)
except:
except KeyError:
pass
self.fmap = FileMapper(**params)
......
......@@ -54,9 +54,6 @@ class RadosBlocker(object):
rados = Rados(conffile=CEPH_CONF_FILE)
rados.connect()
if not rados.pool_exists(blockpool):
rados.create_pool(blockpool)
ioctx = rados.open_ioctx(blockpool)
hashtype = params['hashtype']
......
......@@ -53,9 +53,6 @@ class RadosMapper(object):
rados = Rados(conffile=CEPH_CONF_FILE)
rados.connect()
if not rados.pool_exists(mappool):
rados.create_pool(mappool)
ioctx = rados.open_ioctx(mappool)
self.mappool = mappool
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment