Revision 71585c27 snf-pithos-backend/pithos/backends/modular.py
| b/snf-pithos-backend/pithos/backends/modular.py | ||
|---|---|---|
| 122 | 122 |
ret = func(self, *args, **kw) |
| 123 | 123 |
for m in self.messages: |
| 124 | 124 |
self.queue.send(*m) |
| 125 |
if serials: |
|
| 126 |
self.quotaholder_serials.insert_many(serials)
|
|
| 125 |
if self.serials:
|
|
| 126 |
self.commission_serials.insert_many(serials)
|
|
| 127 | 127 |
|
| 128 | 128 |
# commit to ensure that the serials are registered |
| 129 | 129 |
# even if accept commission fails |
| 130 | 130 |
self.wrapper.commit() |
| 131 | 131 |
self.wrapper.execute() |
| 132 | 132 |
|
| 133 |
self.quotaholder.accept_commission( |
|
| 134 |
context = {},
|
|
| 135 |
clientkey = 'pithos', |
|
| 136 |
serials = serials) |
|
| 137 |
|
|
| 138 |
self.quotaholder_serials.delete_many(serials) |
|
| 133 |
r = self.astakosclient.resolve_commissions( |
|
| 134 |
token=self.service_token, |
|
| 135 |
accept_serials=self.serials, |
|
| 136 |
reject_serials=[]) |
|
| 137 |
self.commission_serials.delete_many(r['accepted']) |
|
| 139 | 138 |
|
| 140 | 139 |
self.wrapper.commit() |
| 141 | 140 |
return ret |
| 142 | 141 |
except: |
| 143 |
if serials: |
|
| 142 |
if self.serials:
|
|
| 144 | 143 |
self.astakosclient.resolve_commissions( |
| 145 | 144 |
token=self.service_token, |
| 146 | 145 |
accept_serials=[], |
| 147 |
reject_serials=serials) |
|
| 146 |
reject_serials=self.serials)
|
|
| 148 | 147 |
self.wrapper.rollback() |
| 149 | 148 |
raise |
| 150 | 149 |
return fn |
Also available in: Unified diff