Revision 16f2673e snf-pithos-backend/pithos/backends/modular.py
| b/snf-pithos-backend/pithos/backends/modular.py | ||
|---|---|---|
| 141 | 141 |
return ret |
| 142 | 142 |
except: |
| 143 | 143 |
if serials: |
| 144 |
self.quotaholder.resolve_commissions(
|
|
| 145 |
token=self.quotaholder_token,
|
|
| 144 |
self.astakosclient.resolve_commissions(
|
|
| 145 |
token=self.service_token,
|
|
| 146 | 146 |
accept_serials=[], |
| 147 | 147 |
reject_serials=serials) |
| 148 | 148 |
self.wrapper.rollback() |
| ... | ... | |
| 159 | 159 |
def __init__(self, db_module=None, db_connection=None, |
| 160 | 160 |
block_module=None, block_path=None, block_umask=None, |
| 161 | 161 |
queue_module=None, queue_hosts=None, queue_exchange=None, |
| 162 |
quotaholder_enabled=False, |
|
| 163 |
quotaholder_url=None, quotaholder_token=None, |
|
| 164 |
quotaholder_client_poolsize=None, |
|
| 162 |
astakos_url=None, service_token=None, |
|
| 163 |
astakosclient_poolsize=None, |
|
| 165 | 164 |
free_versioning=True, block_params=None, |
| 166 | 165 |
public_url_security=None, |
| 167 | 166 |
public_url_alphabet=None, |
| ... | ... | |
| 205 | 204 |
params = {'wrapper': self.wrapper}
|
| 206 | 205 |
self.permissions = self.db_module.Permissions(**params) |
| 207 | 206 |
self.config = self.db_module.Config(**params) |
| 208 |
self.quotaholder_serials = self.db_module.QuotaholderSerial(**params)
|
|
| 207 |
self.commission_serials = self.db_module.QuotaholderSerial(**params)
|
|
| 209 | 208 |
for x in ['READ', 'WRITE']: |
| 210 | 209 |
setattr(self, x, getattr(self.db_module, x)) |
| 211 | 210 |
self.node = self.db_module.Node(**params) |
| ... | ... | |
| 237 | 236 |
|
| 238 | 237 |
self.queue = NoQueue() |
| 239 | 238 |
|
| 240 |
self.quotaholder_enabled = quotaholder_enabled |
|
| 241 |
if quotaholder_enabled: |
|
| 242 |
self.quotaholder_url = quotaholder_url |
|
| 243 |
self.quotaholder_token = quotaholder_token |
|
| 244 |
self.quotaholder = AstakosClient( |
|
| 245 |
quotaholder_url, |
|
| 246 |
use_pool=True, |
|
| 247 |
pool_size=quotaholder_client_poolsize) |
|
| 239 |
self.astakos_url = astakos_url |
|
| 240 |
self.service_token = service_token |
|
| 241 |
self.astakosclient = AstakosClient( |
|
| 242 |
astakos_url, |
|
| 243 |
use_pool=True, |
|
| 244 |
pool_size=astakosclient_poolsize) |
|
| 248 | 245 |
|
| 249 | 246 |
self.serials = [] |
| 250 | 247 |
self.messages = [] |
| ... | ... | |
| 255 | 252 |
|
| 256 | 253 |
@property |
| 257 | 254 |
def using_external_quotaholder(self): |
| 258 |
return self.quotaholder_enabled
|
|
| 255 |
return True
|
|
| 259 | 256 |
|
| 260 | 257 |
@backend_method |
| 261 | 258 |
def list_accounts(self, user, marker=None, limit=10000): |
| ... | ... | |
| 1366 | 1363 |
|
| 1367 | 1364 |
try: |
| 1368 | 1365 |
name = details['path'] if 'path' in details else '' |
| 1369 |
serial = self.quotaholder.issue_one_commission(
|
|
| 1370 |
token=self.quotaholder_token,
|
|
| 1366 |
serial = self.astakosclient.issue_one_commission(
|
|
| 1367 |
token=self.service_token,
|
|
| 1371 | 1368 |
holder=account, |
| 1372 | 1369 |
source=DEFAULT_SOURCE, |
| 1373 | 1370 |
provisions={'pithos.diskspace': size},
|
Also available in: Unified diff