diff --git a/docker-compose.yml b/docker-compose.yml index 4acd00cdd..3460bc881 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,6 +51,7 @@ services: ports: - "12181:2181" environment: + #JVMFLAGS: "-Xms32m -Xmx128m" TZ: "Asia/Shanghai" ALLOW_ANONYMOUS_LOGIN: "yes" restart: always @@ -70,6 +71,7 @@ services: command: > bash -c "/opt/bitnami/scripts/kafka/run.sh & /opt/bitnami/kafka/create-topic.sh; wait" environment: + #KAFKA_HEAP_OPTS: "-Xms128m -Xmx256m" TZ: Asia/Shanghai KAFKA_CFG_NODE_ID: 0 KAFKA_CFG_PROCESS_ROLES: controller,broker diff --git a/tools/check-component/main.go b/tools/check-component/main.go index d3225abb8..816677e0b 100644 --- a/tools/check-component/main.go +++ b/tools/check-component/main.go @@ -66,6 +66,7 @@ func initConfig(configDir string) (*config.Mongo, *config.Redis, *config.Kafka, kafkaConfig = &config.Kafka{} minioConfig = &config.Minio{} zookeeperConfig = &config.ZooKeeper{} + thirdConfig = &config.Third{} ) err := config.LoadConfig(filepath.Join(configDir, cmd.MongodbConfigFileName), cmd.ConfigEnvPrefixMap[cmd.MongodbConfigFileName], mongoConfig) if err != nil { @@ -82,11 +83,18 @@ func initConfig(configDir string) (*config.Mongo, *config.Redis, *config.Kafka, return nil, nil, nil, nil, nil, err } - err = config.LoadConfig(filepath.Join(configDir, cmd.MinioConfigFileName), cmd.ConfigEnvPrefixMap[cmd.MinioConfigFileName], minioConfig) + err = config.LoadConfig(filepath.Join(configDir, cmd.OpenIMRPCThirdCfgFileName), cmd.ConfigEnvPrefixMap[cmd.OpenIMRPCThirdCfgFileName], thirdConfig) if err != nil { return nil, nil, nil, nil, nil, err } - + if thirdConfig.Object.Enable == "minio" { + err = config.LoadConfig(filepath.Join(configDir, cmd.MinioConfigFileName), cmd.ConfigEnvPrefixMap[cmd.MinioConfigFileName], minioConfig) + if err != nil { + return nil, nil, nil, nil, nil, err + } + } else { + minioConfig = nil + } err = config.LoadConfig(filepath.Join(configDir, cmd.ZookeeperConfigFileName), cmd.ConfigEnvPrefixMap[cmd.ZookeeperConfigFileName], zookeeperConfig) if err != nil { return nil, nil, nil, nil, nil, err @@ -131,14 +139,17 @@ func performChecks(ctx context.Context, mongoConfig *config.Mongo, redisConfig * "Redis": func() error { return CheckRedis(ctx, redisConfig) }, - "MinIO": func() error { - return CheckMinIO(ctx, minioConfig) - }, "Kafka": func() error { return CheckKafka(ctx, kafkaConfig) }, } + if minioConfig != nil { + checks["MinIO"] = func() error { + return CheckMinIO(ctx, minioConfig) + } + } + for i := 0; i < maxRetry; i++ { allSuccess := true for name, check := range checks {