MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-28 05:38:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unexpected logging from peer calls (#17888)

Browse Source 
also make sure RequestID is set for system logs
This commit is contained in:
Harshavardhana 2023-08-21 14:25:24 -07:00 committed by GitHub
parent 328cb0a076
commit 3a0125fa1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/data-scanner.go
View File

@ -550,7 +550,6 @@ func (f *folderScanner) scanFolder(ctx context.Context, folder cachedFolder, int
dst = &dataUsageEntry{Compacted: false} dst = &dataUsageEntry{Compacted: false}
} }
if err := f.scanFolder(ctx, folder, dst); err != nil { if err := f.scanFolder(ctx, folder, dst); err != nil {
logger.LogIf(ctx, err)
return return
} }
if !into.Compacted { if !into.Compacted {

8
cmd/peer-rest-client.go
View File

@ -488,12 +488,10 @@ func (client *peerRESTClient) BackgroundHealStatus() (madmin.BgHealState, error)
func (client *peerRESTClient) GetLocalDiskIDs(ctx context.Context) (diskIDs []string) { func (client *peerRESTClient) GetLocalDiskIDs(ctx context.Context) (diskIDs []string) {
respBody, err := client.callWithContext(ctx, peerRESTMethodGetLocalDiskIDs, nil, nil, -1) respBody, err := client.callWithContext(ctx, peerRESTMethodGetLocalDiskIDs, nil, nil, -1)
if err != nil { if err != nil {
logger.LogIf(ctx, err)
return nil return nil
} }
defer xhttp.DrainBody(respBody) defer xhttp.DrainBody(respBody)
if err = gob.NewDecoder(respBody).Decode(&diskIDs); err != nil { if err = gob.NewDecoder(respBody).Decode(&diskIDs); err != nil {
logger.LogIf(ctx, err)
return nil return nil
} }
return diskIDs return diskIDs
@ -513,7 +511,6 @@ func (client *peerRESTClient) GetMetacacheListing(ctx context.Context, o listPat
} }
respBody, err := client.callWithContext(ctx, peerRESTMethodGetMetacacheListing, nil, &reader, int64(reader.Len())) respBody, err := client.callWithContext(ctx, peerRESTMethodGetMetacacheListing, nil, &reader, int64(reader.Len()))
if err != nil { if err != nil {
logger.LogIf(ctx, err)
return nil, err return nil, err
} }
var resp metacache var resp metacache
@ -532,7 +529,6 @@ func (client *peerRESTClient) UpdateMetacacheListing(ctx context.Context, m meta
} }
respBody, err := client.callWithContext(ctx, peerRESTMethodUpdateMetacacheListing, nil, bytes.NewBuffer(b), int64(len(b))) respBody, err := client.callWithContext(ctx, peerRESTMethodUpdateMetacacheListing, nil, bytes.NewBuffer(b), int64(len(b)))
if err != nil { if err != nil {
logger.LogIf(ctx, err)
return m, err return m, err
} }
defer xhttp.DrainBody(respBody) defer xhttp.DrainBody(respBody)
@ -543,7 +539,6 @@ func (client *peerRESTClient) UpdateMetacacheListing(ctx context.Context, m meta
func (client *peerRESTClient) ReloadPoolMeta(ctx context.Context) error { func (client *peerRESTClient) ReloadPoolMeta(ctx context.Context) error {
respBody, err := client.callWithContext(ctx, peerRESTMethodReloadPoolMeta, nil, nil, 0) respBody, err := client.callWithContext(ctx, peerRESTMethodReloadPoolMeta, nil, nil, 0)
if err != nil { if err != nil {
logger.LogIf(ctx, err)
return err return err
} }
defer xhttp.DrainBody(respBody) defer xhttp.DrainBody(respBody)
@ -553,7 +548,6 @@ func (client *peerRESTClient) ReloadPoolMeta(ctx context.Context) error {
func (client *peerRESTClient) StopRebalance(ctx context.Context) error { func (client *peerRESTClient) StopRebalance(ctx context.Context) error {
respBody, err := client.callWithContext(ctx, peerRESTMethodStopRebalance, nil, nil, 0) respBody, err := client.callWithContext(ctx, peerRESTMethodStopRebalance, nil, nil, 0)
if err != nil { if err != nil {
logger.LogIf(ctx, err)
return err return err
} }
defer xhttp.DrainBody(respBody) defer xhttp.DrainBody(respBody)
@ -565,7 +559,6 @@ func (client *peerRESTClient) LoadRebalanceMeta(ctx context.Context, startRebala
values.Set(peerRESTStartRebalance, strconv.FormatBool(startRebalance)) values.Set(peerRESTStartRebalance, strconv.FormatBool(startRebalance))
respBody, err := client.callWithContext(ctx, peerRESTMethodLoadRebalanceMeta, values, nil, 0) respBody, err := client.callWithContext(ctx, peerRESTMethodLoadRebalanceMeta, values, nil, 0)
if err != nil { if err != nil {
logger.LogIf(ctx, err)
return err return err
} }
defer xhttp.DrainBody(respBody) defer xhttp.DrainBody(respBody)
@ -575,7 +568,6 @@ func (client *peerRESTClient) LoadRebalanceMeta(ctx context.Context, startRebala
func (client *peerRESTClient) LoadTransitionTierConfig(ctx context.Context) error { func (client *peerRESTClient) LoadTransitionTierConfig(ctx context.Context) error {
respBody, err := client.callWithContext(ctx, peerRESTMethodLoadTransitionTierConfig, nil, nil, 0) respBody, err := client.callWithContext(ctx, peerRESTMethodLoadTransitionTierConfig, nil, nil, 0)
if err != nil { if err != nil {
logger.LogIf(ctx, err)
return err return err
} }
defer xhttp.DrainBody(respBody) defer xhttp.DrainBody(respBody)

5
internal/logger/logger.go
View File

@ -268,7 +268,10 @@ func errToEntry(ctx context.Context, err error, errKind ...interface{}) log.Entr
req := GetReqInfo(ctx) req := GetReqInfo(ctx)
if req == nil { if req == nil {
req = &ReqInfo{API: "SYSTEM"} req = &ReqInfo{
API: "SYSTEM",
RequestID: fmt.Sprintf("%X", time.Now().UTC().UnixNano()),
}
} }
req.RLock() req.RLock()
defer req.RUnlock() defer req.RUnlock()