Skip to content

Commit b0028d3

Browse files
committed
Warn about conflicts only when there are actual changes
1 parent f569493 commit b0028d3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

internal/handles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (inode *Inode) SetFromBlobItem(item *BlobItemOutput) {
194194
// It's the simplest method of conflict resolution
195195
// Otherwise we may not be able to make a correct object version
196196
if item.ETag != nil && inode.knownETag != *item.ETag || item.Size != inode.knownSize {
197-
if inode.knownETag != "" || inode.knownSize > 0 {
197+
if inode.CacheState != ST_CACHED && (inode.knownETag != "" || inode.knownSize > 0) {
198198
s3Log.Warnf("Conflict detected: server-side ETag or size of %v"+
199199
" (%v, %v) differs from local (%v, %v). File is changed remotely, dropping cache",
200200
inode.FullName(), NilStr(item.ETag), item.Size, inode.knownETag, inode.knownSize)

0 commit comments

Comments
 (0)