Merge pull request #2846 from huanggze/master

fix: exported logs are incomplete
This commit is contained in:
KubeSphere CI Bot
2020-08-12 10:45:55 +08:00
committed by GitHub

View File

@@ -295,15 +295,14 @@ func (es *Elasticsearch) ExportLogs(sf logging.SearchFilter, w io.Writer) error
for _, hit := range res.AllHits {
data = append(data, hit.Log)
}
if len(data) == 0 {
return nil
}
// limit to retrieve max 100k records
for i := 0; i < 100; i++ {
data, id, err = es.scroll(id)
if err != nil {
return err
if i != 0 {
data, id, err = es.scroll(id)
if err != nil {
return err
}
}
if len(data) == 0 {
return nil