forks/peertube
1
0
Fork 0
Code Releases Activity

Fix extendsLocalExpiration for redundancy

Browse source
This commit is contained in:
Chocobozzz 2021-11-12 09:02:53 +01:00
parent cd2fad008a
commit 3ef5909aec
No known key found for this signature in database
GPG key ID: 583A612D890159BE
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server/lib/schedulers/videos-redundancy-scheduler.ts
View file

@ -115,19 +115,11 @@ export class VideosRedundancyScheduler extends AbstractScheduler {
for (const redundancyModel of expired) { for (const redundancyModel of expired) {
try { try {
const redundancyConfig = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES.find(s => s.strategy === redundancyModel.strategy) const redundancyConfig = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES.find(s => s.strategy === redundancyModel.strategy)
const candidate: CandidateToDuplicate = { const { totalUsed } = await VideoRedundancyModel.getStats(redundancyConfig.strategy)
redundancy: redundancyConfig,
video: null,
files: [],
streamingPlaylists: []
}
// If the administrator disabled the redundancy or decreased the cache size, remove this redundancy instead of extending it // If the administrator disabled the redundancy or decreased the cache size, remove this redundancy instead of extending it
if (!redundancyConfig || await this.isTooHeavy(candidate)) { if (!redundancyConfig || totalUsed > redundancyConfig.size) {
logger.info( logger.info('Destroying redundancy %s because the cache size %s is too heavy.', redundancyModel.url, redundancyModel.strategy)
'Destroying redundancy %s because the cache size %s is too heavy.',
redundancyModel.url, redundancyModel.strategy, lTags(candidate.video.uuid)
)
await removeVideoRedundancy(redundancyModel) await removeVideoRedundancy(redundancyModel)
} else { } else {