mirror of
https://github.com/minio/minio.git
synced 2024-12-25 06:35:56 -05:00
finalize startup-banner and remove unnecessary logs (#15202)
This commit is contained in:
parent
54a061bdda
commit
8856a2d77b
@ -116,7 +116,9 @@ func (t *apiConfig) init(cfg api.Config, setDriveCounts []int) {
|
|||||||
// + 2 * 10MiB (default erasure block size v1) + 2 * 1MiB (default erasure block size v2)
|
// + 2 * 10MiB (default erasure block size v1) + 2 * 1MiB (default erasure block size v2)
|
||||||
blockSize := xioutil.BlockSizeLarge + xioutil.BlockSizeSmall
|
blockSize := xioutil.BlockSizeLarge + xioutil.BlockSizeSmall
|
||||||
apiRequestsMaxPerNode = int(maxMem / uint64(maxSetDrives*blockSize+int(blockSizeV1*2+blockSizeV2*2)))
|
apiRequestsMaxPerNode = int(maxMem / uint64(maxSetDrives*blockSize+int(blockSizeV1*2+blockSizeV2*2)))
|
||||||
|
if globalIsDistErasure {
|
||||||
logger.Info("Automatically configured API requests per node based on available memory on the system: %d", apiRequestsMaxPerNode)
|
logger.Info("Automatically configured API requests per node based on available memory on the system: %d", apiRequestsMaxPerNode)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
apiRequestsMaxPerNode = cfg.RequestsMax
|
apiRequestsMaxPerNode = cfg.RequestsMax
|
||||||
if len(globalEndpoints.Hostnames()) > 0 {
|
if len(globalEndpoints.Hostnames()) > 0 {
|
||||||
|
@ -223,8 +223,6 @@ func (sys *IAMSys) Load(ctx context.Context) error {
|
|||||||
|
|
||||||
// Init - initializes config system by reading entries from config/iam
|
// Init - initializes config system by reading entries from config/iam
|
||||||
func (sys *IAMSys) Init(ctx context.Context, objAPI ObjectLayer, etcdClient *etcd.Client, iamRefreshInterval time.Duration) {
|
func (sys *IAMSys) Init(ctx context.Context, objAPI ObjectLayer, etcdClient *etcd.Client, iamRefreshInterval time.Duration) {
|
||||||
iamInitStart := time.Now()
|
|
||||||
|
|
||||||
sys.Lock()
|
sys.Lock()
|
||||||
defer sys.Unlock()
|
defer sys.Unlock()
|
||||||
|
|
||||||
@ -297,8 +295,6 @@ func (sys *IAMSys) Init(ctx context.Context, objAPI ObjectLayer, etcdClient *etc
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
iamLoadStart := time.Now()
|
|
||||||
|
|
||||||
// Load IAM data from storage.
|
// Load IAM data from storage.
|
||||||
for {
|
for {
|
||||||
if err := sys.Load(retryCtx); err != nil {
|
if err := sys.Load(retryCtx); err != nil {
|
||||||
@ -370,9 +366,6 @@ func (sys *IAMSys) Init(ctx context.Context, objAPI ObjectLayer, etcdClient *etc
|
|||||||
}
|
}
|
||||||
|
|
||||||
sys.printIAMRoles()
|
sys.printIAMRoles()
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
logger.Info("Finished loading IAM sub-system (took %.1fs of %.1fs).", now.Sub(iamLoadStart).Seconds(), now.Sub(iamInitStart).Seconds())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (sys *IAMSys) validateAndAddRolePolicyMappings(ctx context.Context, m map[arn.ARN]string) {
|
func (sys *IAMSys) validateAndAddRolePolicyMappings(ctx context.Context, m map[arn.ARN]string) {
|
||||||
|
@ -44,6 +44,7 @@ func mustGetStorageInfo(objAPI ObjectLayer) StorageInfo {
|
|||||||
|
|
||||||
// Prints the formatted startup message.
|
// Prints the formatted startup message.
|
||||||
func printStartupMessage(apiEndpoints []string, err error) {
|
func printStartupMessage(apiEndpoints []string, err error) {
|
||||||
|
logger.Info(color.Bold("MinIO Object Storage Server"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if globalConsoleSys != nil {
|
if globalConsoleSys != nil {
|
||||||
globalConsoleSys.Send(fmt.Sprintf("Server startup failed with '%v', some features may be missing", err), string(logger.All))
|
globalConsoleSys.Send(fmt.Sprintf("Server startup failed with '%v', some features may be missing", err), string(logger.All))
|
||||||
@ -53,7 +54,7 @@ func printStartupMessage(apiEndpoints []string, err error) {
|
|||||||
if len(globalSubnetConfig.APIKey) == 0 && err == nil {
|
if len(globalSubnetConfig.APIKey) == 0 && err == nil {
|
||||||
var builder strings.Builder
|
var builder strings.Builder
|
||||||
startupBanner(&builder)
|
startupBanner(&builder)
|
||||||
logger.Info("\n" + builder.String())
|
logger.Info(builder.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
strippedAPIEndpoints := stripStandardPorts(apiEndpoints, globalMinioHost)
|
strippedAPIEndpoints := stripStandardPorts(apiEndpoints, globalMinioHost)
|
||||||
|
@ -1055,10 +1055,10 @@ func (c Config) GetAvailableTargets(subSys string) ([]string, error) {
|
|||||||
|
|
||||||
func getEnvVarName(subSys, target, param string) string {
|
func getEnvVarName(subSys, target, param string) string {
|
||||||
if target == Default {
|
if target == Default {
|
||||||
return fmt.Sprintf("%s%s_%s", EnvPrefix, strings.ToUpper(subSys), strings.ToUpper(param))
|
return fmt.Sprintf("%s%s%s%s", EnvPrefix, strings.ToUpper(subSys), Default, strings.ToUpper(param))
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Sprintf("%s%s_%s_%s", EnvPrefix, strings.ToUpper(subSys), strings.ToUpper(param), target)
|
return fmt.Sprintf("%s%s%s%s%s%s", EnvPrefix, strings.ToUpper(subSys), Default, strings.ToUpper(param), Default, target)
|
||||||
}
|
}
|
||||||
|
|
||||||
var resolvableSubsystems = set.CreateStringSet(IdentityOpenIDSubSys)
|
var resolvableSubsystems = set.CreateStringSet(IdentityOpenIDSubSys)
|
||||||
|
@ -197,8 +197,17 @@ func LookupConfig(s config.Config, transport http.RoundTripper, closeRespFn func
|
|||||||
seenClientIDs = set.NewStringSet()
|
seenClientIDs = set.NewStringSet()
|
||||||
)
|
)
|
||||||
|
|
||||||
// remove this since we have removed support for this already.
|
|
||||||
deprecatedKeys := []string{JwksURL}
|
deprecatedKeys := []string{JwksURL}
|
||||||
|
|
||||||
|
// remove this since we have removed support for this already.
|
||||||
|
for k := range s[config.IdentityOpenIDSubSys] {
|
||||||
|
for _, dk := range deprecatedKeys {
|
||||||
|
kvs := s[config.IdentityOpenIDSubSys][k]
|
||||||
|
kvs.Delete(dk)
|
||||||
|
s[config.IdentityOpenIDSubSys][k] = kvs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if err := s.CheckValidKeys(config.IdentityOpenIDSubSys, deprecatedKeys); err != nil {
|
if err := s.CheckValidKeys(config.IdentityOpenIDSubSys, deprecatedKeys); err != nil {
|
||||||
return c, err
|
return c, err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user