Skip to content

Commit d4536df

Browse files
vitalifvitalif
committed
Change log level of retriable errors to WARN
1 parent 89bb9b5 commit d4536df

File tree

4 files changed

+22
-23
lines changed

4 files changed

+22
-23
lines changed

‎internal/backend_s3.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ func (s *S3Backend) HeadBlob(req *HeadBlobInput) (resp *HeadBlobOutput, err erro
517517
s.readBackoff(func(attempt int) error {
518518
resp, err = s.tryHeadBlob(req)
519519
if err != nil && shouldRetry(err) {
520-
s3Log.Errorf("Error getting metadata of %v (attempt %v): %v\n", req.Key, attempt, err)
520+
s3Log.Warnf("Error getting metadata of %v (attempt %v): %v\n", req.Key, attempt, err)
521521
}
522522
return err
523523
})
@@ -559,7 +559,7 @@ func (s *S3Backend) ListBlobs(req *ListBlobsInput) (resp *ListBlobsOutput, err e
559559
s.readBackoff(func(attempt int) error {
560560
resp, err = s.tryListBlobs(req)
561561
if err != nil && shouldRetry(err) {
562-
s3Log.Errorf("Error listing objects with prefix=%v delimiter=%v start-after=%v max-keys=%v (attempt %v): %v\n",
562+
s3Log.Warnf("Error listing objects with prefix=%v delimiter=%v start-after=%v max-keys=%v (attempt %v): %v\n",
563563
NilStr(req.Prefix), NilStr(req.Delimiter), NilStr(req.StartAfter), NilUInt32(req.MaxKeys), attempt, err)
564564
}
565565
return err
@@ -682,7 +682,7 @@ func (s *S3Backend) mpuCopyPart(from string, to string, mpuId string, bytes stri
682682

683683
resp, err := s.UploadPartCopy(params)
684684
if err != nil {
685-
s3Log.Errorf("UploadPartCopy %v = %v", params, err)
685+
s3Log.Warnf("UploadPartCopy %v = %v", params, err)
686686
*errout = err
687687
return
688688
}
@@ -799,7 +799,7 @@ func (s *S3Backend) copyObjectMultipart(size int64, from string, to string, mpuI
799799
req, _ := s.CompleteMultipartUploadRequest(params)
800800
err = req.Send()
801801
if err != nil {
802-
s3Log.Errorf("Complete MPU %v = %v", params, err)
802+
s3Log.Warnf("Complete MPU %v = %v", params, err)
803803
} else {
804804
requestId = s.getRequestId(req)
805805
}
@@ -886,7 +886,7 @@ func (s *S3Backend) CopyBlob(param *CopyBlobInput) (*CopyBlobOutput, error) {
886886
req.Config.HTTPClient.Timeout = 15 * time.Minute
887887
err := req.Send()
888888
if err != nil {
889-
s3Log.Errorf("CopyObject %v = %v", params, err)
889+
s3Log.Warnf("CopyObject %v = %v", params, err)
890890
return nil, err
891891
}
892892

@@ -928,7 +928,7 @@ func (s *S3Backend) GetBlob(req *GetBlobInput) (resp *GetBlobOutput, err error)
928928
s.readBackoff(func(attempt int) error {
929929
resp, err = s.tryGetBlob(req)
930930
if err != nil && shouldRetry(err) {
931-
log.Errorf("Error reading %v +%v of %v (attempt %v): %v", req.Start, req.Count, req.Key, attempt, err)
931+
s3Log.Warnf("Error reading %v +%v of %v (attempt %v): %v", req.Start, req.Count, req.Key, attempt, err)
932932
}
933933
return err
934934
})
@@ -1070,7 +1070,7 @@ func (s *S3Backend) MultipartBlobBegin(param *MultipartBlobBeginInput) (*Multipa
10701070

10711071
resp, err := s.CreateMultipartUpload(&mpu)
10721072
if err != nil {
1073-
s3Log.Errorf("CreateMultipartUpload %v = %v", param.Key, err)
1073+
s3Log.Warnf("CreateMultipartUpload %v = %v", param.Key, err)
10741074
return nil, err
10751075
}
10761076

‎internal/dir.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ func (parent *Inode) listObjectsSlurp(inode *Inode, startAfter string, sealEnd b
248248
resp, err := cloud.ListBlobs(params)
249249
if err != nil {
250250
parent.fs.completeInflightListing(myList)
251-
s3Log.Errorf("ListObjects %v = %v", params, err)
252251
return
253252
}
254253
s3Log.Debug(resp)
@@ -1152,7 +1151,7 @@ func (inode *Inode) SendDelete() {
11521151
}
11531152
inode.recordFlushError(err)
11541153
if err != nil {
1155-
log.Errorf("Failed to delete object %v: %v", key, err)
1154+
log.Warnf("Failed to delete object %v: %v", key, err)
11561155
inode.mu.Unlock()
11571156
inode.fs.WakeupFlusher()
11581157
return
@@ -1414,7 +1413,7 @@ func (dir *Inode) SendMkDir() {
14141413
dir.IsFlushing -= dir.fs.flags.MaxParallelParts
14151414
dir.recordFlushError(err)
14161415
if err != nil {
1417-
log.Errorf("Failed to create directory object %v: %v", key, err)
1416+
log.Warnf("Failed to create directory object %v: %v", key, err)
14181417
dir.fs.WakeupFlusher()
14191418
return
14201419
}
@@ -1729,7 +1728,7 @@ func renameInCache(fromInode *Inode, newParent *Inode, to string) {
17291728
err = os.Rename(oldFileName, newFileName)
17301729
}
17311730
if err != nil {
1732-
log.Errorf("Error renaming %v to %v: %v", oldFileName, newFileName, err)
1731+
log.Warnf("Error renaming %v to %v: %v", oldFileName, newFileName, err)
17331732
if fromInode.DiskCacheFD != nil {
17341733
fromInode.DiskCacheFD.Close()
17351734
fromInode.DiskCacheFD = nil

‎internal/file.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,7 @@ func (inode *Inode) SendUpload() bool {
13731373
oldParent.mu.Unlock()
13741374
}
13751375
} else {
1376-
log.Debugf("Failed to copy %v to %v (rename): %v", from, key, err)
1376+
log.Warnf("Failed to copy %v to %v (rename): %v", from, key, err)
13771377
inode.mu.Lock()
13781378
inode.recordFlushError(err)
13791379
if inode.Parent == oldParent && inode.Name == oldName {
@@ -1502,7 +1502,7 @@ func (inode *Inode) SendUpload() bool {
15021502
s3Log.Warnf("Conflict detected (inode %v): File %v is deleted or resized remotely, discarding local changes", inode.Id, inode.FullName())
15031503
inode.resetCache()
15041504
}
1505-
log.Errorf("Error flushing metadata using COPY for %v: %v", key, err)
1505+
log.Warnf("Error flushing metadata using COPY for %v: %v", key, err)
15061506
} else if inode.CacheState == ST_MODIFIED && !inode.isStillDirty() {
15071507
inode.SetCacheState(ST_CACHED)
15081508
inode.SetAttrTime(time.Now())
@@ -1551,7 +1551,7 @@ func (inode *Inode) SendUpload() bool {
15511551
inode.mu.Lock()
15521552
inode.recordFlushError(err)
15531553
if err != nil {
1554-
log.Errorf("Failed to initiate multipart upload for %v: %v", key, err)
1554+
log.Warnf("Failed to initiate multipart upload for %v: %v", key, err)
15551555
} else {
15561556
log.Debugf("Started multi-part upload of object %v", key)
15571557
inode.mpu = resp
@@ -1709,7 +1709,7 @@ func (inode *Inode) resetCache() {
17091709
go func(mpu *MultipartBlobCommitInput) {
17101710
_, abortErr := cloud.MultipartBlobAbort(mpu)
17111711
if abortErr != nil {
1712-
log.Errorf("Failed to abort multi-part upload of object %v: %v", key, abortErr)
1712+
log.Warnf("Failed to abort multi-part upload of object %v: %v", key, abortErr)
17131713
}
17141714
}(inode.mpu)
17151715
inode.mpu = nil
@@ -1776,7 +1776,7 @@ func (inode *Inode) FlushSmallObject() {
17761776
go func(mpu *MultipartBlobCommitInput) {
17771777
_, abortErr := cloud.MultipartBlobAbort(mpu)
17781778
if abortErr != nil {
1779-
log.Errorf("Failed to abort multi-part upload of object %v: %v", key, abortErr)
1779+
log.Warnf("Failed to abort multi-part upload of object %v: %v", key, abortErr)
17801780
}
17811781
}(inode.mpu)
17821782
inode.mpu = nil
@@ -1789,7 +1789,7 @@ func (inode *Inode) FlushSmallObject() {
17891789

17901790
inode.recordFlushError(err)
17911791
if err != nil {
1792-
log.Errorf("Failed to flush small file %v: %v", key, err)
1792+
log.Warnf("Failed to flush small file %v: %v", key, err)
17931793
if params.Metadata != nil {
17941794
inode.userMetadataDirty = 2
17951795
}
@@ -1890,7 +1890,7 @@ func (inode *Inode) copyUnmodifiedParts(numParts uint64) (err error) {
18901890
Size: size,
18911891
})
18921892
if requestErr != nil {
1893-
log.Errorf("Failed to copy unmodified range %v-%v MB of object %v: %v",
1893+
log.Warnf("Failed to copy unmodified range %v-%v MB of object %v: %v",
18941894
offset/1024/1024, (offset+size+1024*1024-1)/1024/1024, key, requestErr)
18951895
err = requestErr
18961896
} else {
@@ -1943,7 +1943,7 @@ func (inode *Inode) FlushPart(part uint64) {
19431943
return
19441944
}
19451945
if err != nil {
1946-
log.Errorf("Failed to load part %v of object %v to flush it: %v", part, key, err)
1946+
log.Warnf("Failed to load part %v of object %v to flush it: %v", part, key, err)
19471947
return
19481948
}
19491949
// File size may have been changed again
@@ -1981,7 +1981,7 @@ func (inode *Inode) FlushPart(part uint64) {
19811981
}
19821982
inode.recordFlushError(err)
19831983
if err != nil {
1984-
log.Errorf("Failed to flush part %v of object %v: %v", part, key, err)
1984+
log.Warnf("Failed to flush part %v of object %v: %v", part, key, err)
19851985
} else {
19861986
if inode.mpu != nil {
19871987
// It could become nil if the file was deleted remotely in the meantime
@@ -2044,7 +2044,7 @@ func (inode *Inode) completeMultipart() {
20442044
if inode.CacheState == ST_CREATED || inode.CacheState == ST_MODIFIED {
20452045
inode.recordFlushError(err)
20462046
if err != nil {
2047-
log.Errorf("Failed to finalize multi-part upload of object %v: %v", key, err)
2047+
log.Warnf("Failed to finalize multi-part upload of object %v: %v", key, err)
20482048
if inode.mpu.Metadata != nil {
20492049
inode.userMetadataDirty = 2
20502050
}

‎internal/goofys.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,14 +1134,14 @@ func mapAwsError(err error) error {
11341134
if err != nil {
11351135
return err
11361136
} else {
1137-
s3Log.Errorf("http=%v %v s3=%v request=%v\n",
1137+
s3Log.Warnf("http=%v %v s3=%v request=%v\n",
11381138
reqErr.StatusCode(), reqErr.Message(),
11391139
awsErr.Code(), reqErr.RequestID())
11401140
return reqErr
11411141
}
11421142
} else {
11431143
// Generic AWS Error with Code, Message, and original error (if any)
1144-
s3Log.Errorf("code=%v msg=%v, err=%v\n", awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
1144+
s3Log.Warnf("code=%v msg=%v, err=%v\n", awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
11451145
return awsErr
11461146
}
11471147
} else {

0 commit comments

Comments
 (0)