mirror of https://github.com/minio/minio.git
Compare commits
5 Commits
b908dcef7c
...
646be7ba29
| Author | SHA1 | Date |
|---|---|---|
|
|
646be7ba29 | |
|
|
e909be6380 | |
|
|
e0182b85e0 | |
|
|
9611aa9b15 | |
|
|
bebf04e2b6 |
|
|
@ -524,6 +524,7 @@ func lookupConfigs(s config.Config, objAPI ObjectLayer) {
|
|||
configLogIf(ctx, fmt.Errorf("Invalid site configuration: %w", err))
|
||||
}
|
||||
globalSite.Update(siteCfg)
|
||||
xhttp.SetSiteName(globalSite.Name())
|
||||
|
||||
globalAutoEncryption = crypto.LookupAutoEncryption() // Enable auto-encryption if enabled
|
||||
if globalAutoEncryption && GlobalKMS == nil {
|
||||
|
|
|
|||
|
|
@ -1185,6 +1185,13 @@ func (z *erasureServerPools) DeleteObject(ctx context.Context, bucket string, ob
|
|||
return z.deleteObjectFromAllPools(ctx, bucket, object, opts, noReadQuorumPools)
|
||||
}
|
||||
|
||||
// All replication requests needs to go to pool with the object.
|
||||
if opts.ReplicationRequest {
|
||||
objInfo, err = z.serverPools[pinfo.Index].DeleteObject(ctx, bucket, object, opts)
|
||||
objInfo.Name = decodeDirObject(object)
|
||||
return objInfo, err
|
||||
}
|
||||
|
||||
for _, pool := range z.serverPools {
|
||||
objInfo, err := pool.DeleteObject(ctx, bucket, object, opts)
|
||||
if err != nil && !isErrObjectNotFound(err) && !isErrVersionNotFound(err) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@ var (
|
|||
|
||||
// GlobalDeploymentID - is sent in the header to all http targets
|
||||
GlobalDeploymentID string
|
||||
|
||||
// GlobalSiteName - is sent in the header to all http targets
|
||||
GlobalSiteName string
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -236,3 +239,8 @@ func SetMinIOVersion(version string) {
|
|||
func SetDeploymentID(deploymentID string) {
|
||||
GlobalDeploymentID = deploymentID
|
||||
}
|
||||
|
||||
// SetSiteName -- user defined site from environment variable `MINIO_SITE_NAME` or from configuration `site.name`
|
||||
func SetSiteName(siteName string) {
|
||||
GlobalSiteName = siteName
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ func GetAuditEntry(ctx context.Context) *audit.Entry {
|
|||
r = &audit.Entry{
|
||||
Version: internalAudit.Version,
|
||||
DeploymentID: xhttp.GlobalDeploymentID,
|
||||
SiteName: xhttp.GlobalSiteName,
|
||||
Time: time.Now().UTC(),
|
||||
}
|
||||
return r
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ func NewEntry(deploymentID string) audit.Entry {
|
|||
return audit.Entry{
|
||||
Version: Version,
|
||||
DeploymentID: deploymentID,
|
||||
SiteName: xhttp.GlobalSiteName,
|
||||
Time: time.Now().UTC(),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue