Revert "cache service: don't skip already up to date archives"
This reverts commit cb90940b54dc07dd2221d3169e569b08876a3265.
This commit is contained in:
@@ -279,10 +279,6 @@ public class CacheClient implements AutoCloseable
|
|||||||
{
|
{
|
||||||
logger.debug("Archive {}/{} in index {} is up to date",
|
logger.debug("Archive {}/{} in index {} is up to date",
|
||||||
ad.getId(), indexData.getArchives().length, index.getId());
|
ad.getId(), indexData.getArchives().length, index.getId());
|
||||||
if (watcher != null)
|
|
||||||
{
|
|
||||||
watcher.alreadyUpToDate(existing);
|
|
||||||
}
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,5 @@ public interface DownloadWatcher
|
|||||||
{
|
{
|
||||||
void indexComplete(Index index);
|
void indexComplete(Index index);
|
||||||
|
|
||||||
void alreadyUpToDate(Archive archive);
|
|
||||||
|
|
||||||
void downloadComplete(Archive archive, byte[] data);
|
void downloadComplete(Archive archive, byte[] data);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public class CacheUpdater
|
|||||||
|
|
||||||
private final Sql2o sql2o;
|
private final Sql2o sql2o;
|
||||||
private final MinioClient minioClient;
|
private final MinioClient minioClient;
|
||||||
|
|
||||||
@Value("${minio.bucket}")
|
@Value("${minio.bucket}")
|
||||||
private String minioBucket;
|
private String minioBucket;
|
||||||
|
|
||||||
@@ -116,21 +116,11 @@ public class CacheUpdater
|
|||||||
indexEntryMap.put(index, entry);
|
indexEntryMap.put(index, entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void alreadyUpToDate(Archive archive)
|
|
||||||
{
|
|
||||||
updateArchive(archive);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void downloadComplete(Archive archive, byte[] data)
|
public void downloadComplete(Archive archive, byte[] data)
|
||||||
{
|
{
|
||||||
executor.submit(new CacheUploader(minioClient, minioBucket, archive, data));
|
executor.submit(new CacheUploader(minioClient, minioBucket, archive, data));
|
||||||
updateArchive(archive);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateArchive(Archive archive)
|
|
||||||
{
|
|
||||||
IndexEntry entry = indexEntryMap.get(archive.getIndex());
|
IndexEntry entry = indexEntryMap.get(archive.getIndex());
|
||||||
ArchiveEntry archiveEntry = cacheDao.findArchive(con, entry, archive.getArchiveId(),
|
ArchiveEntry archiveEntry = cacheDao.findArchive(con, entry, archive.getArchiveId(),
|
||||||
archive.getNameHash(), archive.getCrc(), archive.getRevision());
|
archive.getNameHash(), archive.getCrc(), archive.getRevision());
|
||||||
|
|||||||
Reference in New Issue
Block a user