restore size diff calculation

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
butonic · Sep 19, 2023 · cfec3a6 · cfec3a6
1 parent b821d1a
commit cfec3a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/storage/utils/decomposedfs/upload.go b/pkg/storage/utils/decomposedfs/upload.go
@@ -360,7 +360,7 @@ func (fs *Decomposedfs) PreFinishResponseCallback(hook tusd.HookEvent) error {
 		}
 	}
 
-	var sizeDiff int64
+	sizeDiff := info.Size - n.Blobsize
 	if !fs.o.AsyncFileUploads {
 		// handle postprocessing synchronously
 		err = upload.Finalize(ctx, fs.blobstore, info, n) // moving or copying the blob only reads the blobid, no need to change the revision nodes nodeid

diff --git a/pkg/storage/utils/decomposedfs/upload/upload.go b/pkg/storage/utils/decomposedfs/upload/upload.go
@@ -215,7 +215,7 @@ func AddRevisionToNode(ctx context.Context, lu *lookup.Lookup, info tusd.FileInf
 		} else {
 			nodeHandle, err = openExistingNode(ctx, lu, n)
 			if err != nil {
-				log.Error().Err(err).Msg("could open existing node")
+				log.Error().Err(err).Msg("could not open existing node")
 				return nil, err
 			}
 			log.Info().Str("lockfile", nodeHandle.Name()).Msg("got lock file from openExistingNode")
@@ -230,7 +230,7 @@ func AddRevisionToNode(ctx context.Context, lu *lookup.Lookup, info tusd.FileInf
 		}
 		nodeHandle, err = openExistingNode(ctx, lu, n)
 		if err != nil {
-			log.Error().Err(err).Msg("could open existing node")
+			log.Error().Err(err).Msg("could not open existing node")
 			return nil, err
 		}
 		log.Info().Str("lockfile", nodeHandle.Name()).Msg("got lock file from openExistingNode")
@@ -459,6 +459,8 @@ func SetNodeToRevision(ctx context.Context, lu *lookup.Lookup, n *node.Node, rev
 		return 0, err
 	}
 
+	sizeDiff := revisionNode.Blobsize - n.Blobsize
+
 	n.BlobID = revisionNode.BlobID
 	n.Blobsize = revisionNode.Blobsize
 
@@ -483,7 +485,6 @@ func SetNodeToRevision(ctx context.Context, lu *lookup.Lookup, n *node.Node, rev
 		return 0, errors.Wrap(err, "Decomposedfs: could not write metadata")
 	}
 
-	sizeDiff := revisionNode.Blobsize - n.Blobsize
 	return sizeDiff, nil
 }