floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix adding cluster_uuid

This commit is contained in:
liugq 2023-06-07 21:05:59 +08:00
parent 403b9ffc23
commit 4a3961ab1f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/setup/setup.go
View File

@ -181,7 +181,6 @@ func (module *Module) validate(w http.ResponseWriter, r *http.Request, ps httpro
if err != nil { if err != nil {
panic(err) panic(err)
} }
cfg.ClusterUUID = verInfo.ClusterUUID
if verInfo.Version.Distribution == elastic.Elasticsearch { if verInfo.Version.Distribution == elastic.Elasticsearch {
if verInfo.Version.Number != "" { if verInfo.Version.Number != "" {
ver := &util.Version{} ver := &util.Version{}
@ -290,6 +289,12 @@ func (module *Module) initTempClient(r *http.Request) (error, elastic.API, Setup
cfg.ID = GlobalSystemElasticsearchID cfg.ID = GlobalSystemElasticsearchID
cfg.Name = "INFINI_SYSTEM (" + util.PickRandomName() + ")" cfg.Name = "INFINI_SYSTEM (" + util.PickRandomName() + ")"
elastic.InitMetadata(&cfg, true) elastic.InitMetadata(&cfg, true)
verInfo, err := adapter.ClusterVersion(elastic.GetMetadata(cfg.ID))
if err != nil {
panic(err)
}
cfg.ClusterUUID = verInfo.ClusterUUID
client, err := elastic1.InitClientWithConfig(cfg) client, err := elastic1.InitClientWithConfig(cfg)
if err != nil { if err != nil {
return err, nil, request return err, nil, request