Skip to content

feat: support Elasticsearch 9 for command storage #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wanpl-Java wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: support Elasticsearch 9 for command storage #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion storage/es.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ func (es ESCommandStorage) BulkSave(commands []*model.Command) error {
if es.IsEs8() {
return es.BulkSaveEs8(commands)
}
// 探测失败时也先试 Es8，避免 ES9 误走带 type 的旧接口
if err := es.BulkSaveEs8(commands); err == nil {
return nil
}
return es.BulkSaveEs(commands)
}

Expand Down Expand Up @@ -167,7 +171,8 @@ func (es ESCommandStorage) IsEs8() bool {
if err2 := json.NewDecoder(resp.Body).Decode(&infoResp); err2 != nil {
return false
}
return infoResp.Version.Number[0] == '8'
major := infoResp.Version.Number[0]
return major == '8' || major == '9'
}

func (es ESCommandStorage) createEsClient() (*elasticsearch.Client, error) {
Expand Down