Add madmin package context support (#9172)
This is to improve responsiveness for all admin API operations and allowing callers to cancel any on-going admin operations, if they happen to be waiting too long.master
Harshavardhana
5 years ago
committed by
GitHub
parent
1ffa983a9d
commit
ae654831aa
@ -0,0 +1,52 @@ |
|||||||
|
/* |
||||||
|
* MinIO Cloud Storage, (C) 2020 MinIO, Inc. |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package madmin |
||||||
|
|
||||||
|
// Args - defines the arguments for the API.
|
||||||
|
type logArgs struct { |
||||||
|
Bucket string `json:"bucket,omitempty"` |
||||||
|
Object string `json:"object,omitempty"` |
||||||
|
Metadata map[string]string `json:"metadata,omitempty"` |
||||||
|
} |
||||||
|
|
||||||
|
// Trace - defines the trace.
|
||||||
|
type logTrace struct { |
||||||
|
Message string `json:"message,omitempty"` |
||||||
|
Source []string `json:"source,omitempty"` |
||||||
|
Variables map[string]string `json:"variables,omitempty"` |
||||||
|
} |
||||||
|
|
||||||
|
// API - defines the api type and its args.
|
||||||
|
type logAPI struct { |
||||||
|
Name string `json:"name,omitempty"` |
||||||
|
Args *logArgs `json:"args,omitempty"` |
||||||
|
} |
||||||
|
|
||||||
|
// Entry - defines fields and values of each log entry.
|
||||||
|
type logEntry struct { |
||||||
|
DeploymentID string `json:"deploymentid,omitempty"` |
||||||
|
Level string `json:"level"` |
||||||
|
LogKind string `json:"errKind"` |
||||||
|
Time string `json:"time"` |
||||||
|
API *logAPI `json:"api,omitempty"` |
||||||
|
RemoteHost string `json:"remotehost,omitempty"` |
||||||
|
Host string `json:"host,omitempty"` |
||||||
|
RequestID string `json:"requestID,omitempty"` |
||||||
|
UserAgent string `json:"userAgent,omitempty"` |
||||||
|
Message string `json:"message,omitempty"` |
||||||
|
Trace *logTrace `json:"error,omitempty"` |
||||||
|
} |
||||||
@ -0,0 +1,60 @@ |
|||||||
|
/* |
||||||
|
* MinIO Cloud Storage, (C) 2020 MinIO, Inc. |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package madmin |
||||||
|
|
||||||
|
import ( |
||||||
|
"crypto/tls" |
||||||
|
"net" |
||||||
|
"net/http" |
||||||
|
"time" |
||||||
|
) |
||||||
|
|
||||||
|
// DefaultTransport - this default transport is similar to
|
||||||
|
// http.DefaultTransport but with additional param DisableCompression
|
||||||
|
// is set to true to avoid decompressing content with 'gzip' encoding.
|
||||||
|
var DefaultTransport = func(secure bool) http.RoundTripper { |
||||||
|
tr := &http.Transport{ |
||||||
|
Proxy: http.ProxyFromEnvironment, |
||||||
|
DialContext: (&net.Dialer{ |
||||||
|
Timeout: 5 * time.Second, |
||||||
|
KeepAlive: 15 * time.Second, |
||||||
|
}).DialContext, |
||||||
|
MaxIdleConns: 1024, |
||||||
|
MaxIdleConnsPerHost: 1024, |
||||||
|
ResponseHeaderTimeout: 60 * time.Second, |
||||||
|
IdleConnTimeout: 60 * time.Second, |
||||||
|
TLSHandshakeTimeout: 10 * time.Second, |
||||||
|
ExpectContinueTimeout: 1 * time.Second, |
||||||
|
// Set this value so that the underlying transport round-tripper
|
||||||
|
// doesn't try to auto decode the body of objects with
|
||||||
|
// content-encoding set to `gzip`.
|
||||||
|
//
|
||||||
|
// Refer:
|
||||||
|
// https://golang.org/src/net/http/transport.go?h=roundTrip#L1843
|
||||||
|
DisableCompression: true, |
||||||
|
} |
||||||
|
|
||||||
|
if secure { |
||||||
|
tr.TLSClientConfig = &tls.Config{ |
||||||
|
// Can't use SSLv3 because of POODLE and BEAST
|
||||||
|
// Can't use TLSv1.0 because of POODLE and BEAST using CBC cipher
|
||||||
|
// Can't use TLSv1.1 because of RC4 cipher usage
|
||||||
|
MinVersion: tls.VersionTLS12, |
||||||
|
} |
||||||
|
} |
||||||
|
return tr |
||||||
|
} |
||||||
Loading…
Reference in new issue