test

Author: ashmeenkaur

internal/cache/data/file_info.go

@@ -48,13 +48,15 @@ type FileInfo struct {
 	ObjectGeneration int64
 	Offset           uint64
 	FileSize         uint64
+	FilePtr          *os.File
 }
 
 func (fi FileInfo) Size() uint64 {
 	return fi.FileSize
 }
 
 type FileSpec struct {
+	FilePtr  *os.File
 	Path     string
 	FilePerm os.FileMode
 	DirPerm  os.FileMode

internal/cache/file/cache_handler.go

@@ -108,12 +108,19 @@ func (chr *CacheHandler) createLocalFileReadHandle(objectName string, bucketName
 // and deletes the file in cache.
 func (chr *CacheHandler) cleanUpEvictedFile(fileInfo *data.FileInfo) error {
 	key := fileInfo.Key
-	_, err := key.Key()
+	keyString, err := key.Key()
 	if err != nil {
 		return fmt.Errorf("cleanUpEvictedFile: while creating key: %w", err)
 	}
 
 	chr.jobManager.InvalidateAndRemoveJob(key.ObjectName, key.BucketName)
+	fileInfoCacheEntry := chr.fileInfoCache.LookUpWithoutChangingOrder(keyString)
+	if fileInfoCacheEntry != nil {
+		err := fileInfo.FilePtr.Close()
+		if err != nil {
+			return fmt.Errorf("error while closing cached file: %v", err)
+		}
+	}
 
 	localFilePath := util.GetDownloadPath(chr.cacheDir, util.GetObjectPath(key.BucketName, key.ObjectName))
 	err = util.TruncateAndRemoveFile(localFilePath)

internal/cache/file/downloader/job.go

@@ -274,6 +274,7 @@ func (job *Job) updateStatusOffset(downloadedOffset int64) (err error) {
 
 	updatedFileInfo := data.FileInfo{
 		Key: fileInfoKey, ObjectGeneration: job.object.Generation,
+		FilePtr:  job.fileSpec.FilePtr,
 		FileSize: job.object.Size, Offset: uint64(downloadedOffset),
 	}
 
@@ -418,13 +419,14 @@ func (job *Job) downloadObjectAsync() {
 		job.handleError(err)
 		return
 	}
-	defer func() {
-		err = cacheFile.Close()
-		if err != nil {
-			err = fmt.Errorf("downloadObjectAsync: error while closing cache file: %w", err)
-			job.handleError(err)
-		}
-	}()
+	job.fileSpec.FilePtr = cacheFile
+	//defer func() {
+	//	err = cacheFile.Close()
+	//	if err != nil {
+	//		err = fmt.Errorf("downloadObjectAsync: error while closing cache file: %w", err)
+	//		job.handleError(err)
+	//	}
+	//}()
 
 	// Both parallel and non-parallel download functions support cancellation in
 	// case of job's cancellation.