From 4a3961ab1f814c5a7da60a8671006b02e5348fc3 Mon Sep 17 00:00:00 2001 From: liugq Date: Wed, 7 Jun 2023 21:05:59 +0800 Subject: [PATCH] fix adding cluster_uuid --- plugin/setup/setup.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugin/setup/setup.go b/plugin/setup/setup.go index fd07ca74..1da4a313 100644 --- a/plugin/setup/setup.go +++ b/plugin/setup/setup.go @@ -181,7 +181,6 @@ func (module *Module) validate(w http.ResponseWriter, r *http.Request, ps httpro if err != nil { panic(err) } - cfg.ClusterUUID = verInfo.ClusterUUID if verInfo.Version.Distribution == elastic.Elasticsearch { if verInfo.Version.Number != "" { ver := &util.Version{} @@ -290,6 +289,12 @@ func (module *Module) initTempClient(r *http.Request) (error, elastic.API, Setup cfg.ID = GlobalSystemElasticsearchID cfg.Name = "INFINI_SYSTEM (" + util.PickRandomName() + ")" 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) if err != nil { return err, nil, request