diff --git a/cmd/common-main.go b/cmd/common-main.go index ec71f067d..69b35367d 100644 --- a/cmd/common-main.go +++ b/cmd/common-main.go @@ -49,6 +49,7 @@ import ( "github.com/minio/console/restapi" "github.com/minio/console/restapi/operations" "github.com/minio/kes" + "github.com/minio/madmin-go" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/set" @@ -132,6 +133,8 @@ func init() { console.SetColor("Debug", fcolor.New()) gob.Register(StorageErr("")) + gob.Register(madmin.TimeInfo{}) + gob.Register(map[string]interface{}{}) defaultAWSCredProvider = []credentials.Provider{ &credentials.IAM{ diff --git a/cmd/peer-rest-client.go b/cmd/peer-rest-client.go index 4be655a27..6b9571b0f 100644 --- a/cmd/peer-rest-client.go +++ b/cmd/peer-rest-client.go @@ -422,12 +422,21 @@ func (client *peerRESTClient) GetSELinuxInfo(ctx context.Context) (info madmin.S // GetSysConfig - fetch sys config for a remote node. func (client *peerRESTClient) GetSysConfig(ctx context.Context) (info madmin.SysConfig, err error) { + sent := time.Now() respBody, err := client.callWithContext(ctx, peerRESTMethodSysConfig, nil, nil, -1) if err != nil { return } + roundtrip := int32(time.Since(sent).Milliseconds()) defer http.DrainBody(respBody) + err = gob.NewDecoder(respBody).Decode(&info) + cfg := info.Config["time-info"] + if cfg != nil { + ti := cfg.(madmin.TimeInfo) + ti.RoundtripDuration = roundtrip + info.Config["time-info"] = ti + } return info, err } diff --git a/go.mod b/go.mod index c0434595e..947517e7a 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/minio/csvparser v1.0.0 github.com/minio/highwayhash v1.0.2 github.com/minio/kes v0.14.0 - github.com/minio/madmin-go v1.1.23 + github.com/minio/madmin-go v1.2.3 github.com/minio/minio-go/v7 v7.0.20 github.com/minio/parquet-go v1.1.0 github.com/minio/pkg v1.1.11 diff --git a/go.sum b/go.sum index d7d58e196..5268cb77c 100644 --- a/go.sum +++ b/go.sum @@ -1087,8 +1087,9 @@ github.com/minio/kes v0.14.0 h1:plCGm4LwR++T1P1sXsJbyFRX54CE1WRuo9PAPj6MC3Q= github.com/minio/kes v0.14.0/go.mod h1:OUensXz2BpgMfiogslKxv7Anyx/wj+6bFC6qA7BQcfA= github.com/minio/madmin-go v1.0.12/go.mod h1:BK+z4XRx7Y1v8SFWXsuLNqQqnq5BO/axJ8IDJfgyvfs= github.com/minio/madmin-go v1.1.15/go.mod h1:Iu0OnrMWNBYx1lqJTW+BFjBMx0Hi0wjw8VmqhiOs2Jo= -github.com/minio/madmin-go v1.1.23 h1:VO/K+cFpX3HbNaLBEILd18V09ZpoSCE90522nHtmxdQ= github.com/minio/madmin-go v1.1.23/go.mod h1:wv8zCroSCnpjjQdmgsdJEkFH2oD4w9J40OZqbhxjiJ4= +github.com/minio/madmin-go v1.2.3 h1:Z0hgEOKHaOqfBv0hN62FkQJKDW1kmVw6K9vJwM8ol34= +github.com/minio/madmin-go v1.2.3/go.mod h1:wv8zCroSCnpjjQdmgsdJEkFH2oD4w9J40OZqbhxjiJ4= github.com/minio/mc v0.0.0-20211207230606-23a05f5a17f2 h1:xocb1RGyrDJ8PxkNn0NSbaBlfdU6J/Ag9QK62pb7nR8= github.com/minio/mc v0.0.0-20211207230606-23a05f5a17f2/go.mod h1:siI9jWTzj1KsNXgz6NOL/S7OTaAUM0OMi+zEkF08gnA= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=