- slices[newslice].reset(0, 0, 0, 0, live[newslice]['_rspec'])
- else:
- # Double check time for dead slice in deaddb is within 24hr recording period.
- if (time.time() <= (deaddb[live[newslice]['name']].time + period)):
- logger.log("bwmon: Reinstantiating deleted slice %s" % live[newslice]['name'])
- slices[newslice] = deaddb[live[newslice]['name']]
- slices[newslice].xid = newslice
- # Start the HTB
- slices[newslice].reset(slices[newslice]['maxrate'],
- slices[newslice]['maxexemptrate'],
- slices[newslice]['usedbytes'],
- slices[newslice]['usedi2bytes'],
- live[newslice]['_rspec'])
- # Since the slice has been reinitialed, remove from dead database.
- del deaddb[live[newslice]['name']]
-
+ slices[newslice].reset( 0, 0, 0, 0, live[newslice]['_rspec'] )
+ # Double check time for dead slice in deaddb is within 24hr recording period.
+ elif (time.time() <= (deaddb[live[newslice]['name']]['slice'].time + period)):
+ deadslice = deaddb[live[newslice]['name']]
+ logger.log("bwmon: Reinstantiating deleted slice %s" % live[newslice]['name'])
+ slices[newslice] = deadslice['slice']
+ slices[newslice].xid = newslice
+ # Start the HTB
+ slices[newslice].reset(deadslice['slice'].MaxRate,
+ deadslice['slice'].Maxi2Rate,
+ deadslice['htb']['usedbytes'],
+ deadslice['htb']['usedi2bytes'],
+ live[newslice]['_rspec'])
+ # Bring up to date
+ slices[newslice].update(deadslice['slice'].MaxRate,
+ deadslice['slice'].Maxi2Rate,
+ deadslice['htb']['usedbytes'],
+ deadslice['htb']['usedi2bytes'],
+ deadslice['htb']['share'],
+ live[newslice]['_rspec'])
+ # Since the slice has been reinitialed, remove from dead database.
+ del deaddb[deadslice['slice'].name]