fix: write error stack bug

This commit is contained in:
loveuer 2025-01-22 17:29:12 +08:00
parent b247b4fea8
commit b7b9c14e79
5 changed files with 45 additions and 16 deletions

6
.gitignore vendored
View File

@ -1,11 +1,7 @@
.idea .idea
.vscode .vscode
.DS_Store .DS_Store
*data.json *.json
*mapping.json
*setting.json
*output.json
*test.json
*.txt *.txt
dist dist
xtest xtest

View File

@ -60,10 +60,14 @@ func run(cmd *cobra.Command, args []string) error {
return err return err
} }
log.Debug("init: new input io success!")
if ioo, err = newIO(opt.Cfg.Args.Output, interfaces.IOOutput, es_oversion); err != nil { if ioo, err = newIO(opt.Cfg.Args.Output, interfaces.IOOutput, es_oversion); err != nil {
return err return err
} }
log.Debug("init: new output io success!")
defer func() { defer func() {
_ = ioi.Close() _ = ioi.Close()
_ = ioo.Close() _ = ioo.Close()
@ -186,10 +190,10 @@ func executeData(ctx context.Context, input, output interfaces.DumpIO) error {
wg = sync.WaitGroup{} wg = sync.WaitGroup{}
) )
wg.Add(1)
go func() { go func() {
wg.Add(1)
if err = output.WriteData(ctx, wch); err != nil { if err = output.WriteData(ctx, wch); err != nil {
e2ch <- err log.Fatal("Dump: write data err: %s", err.Error())
} }
wg.Done() wg.Done()
@ -210,18 +214,26 @@ Loop:
case <-ctx.Done(): case <-ctx.Done():
return ctx.Err() return ctx.Err()
case err, ok = <-ech: case err, ok = <-ech:
if err != nil { if !ok {
return err log.Debug("pipe: read io closed")
continue Loop
} }
log.Debug("pipe: got err from read io, err = %s", err.Error())
continue Loop return err
case err, _ = <-e2ch: case err, ok = <-e2ch:
if !ok {
log.Debug("pipe: write io closed")
continue Loop
}
log.Debug("pipe: got err from write io, err = %s", err.Error())
return err return err
case docs, ok = <-dch: case docs, ok = <-dch:
if !ok || len(docs) == 0 { if !ok || len(docs) == 0 {
continue Loop continue Loop
} }
log.Debug("pipe: got %d docs from read io", len(docs))
wch <- docs wch <- docs
} }
} }
@ -229,6 +241,7 @@ Loop:
close(wch) close(wch)
log.Debug("pipe: wait for all io closed")
wg.Wait() wg.Wait()
return nil return nil

View File

@ -119,6 +119,7 @@ func (c *client) ReadData(ctx context.Context, size int, _ map[string]any, _ []s
dch = make(chan []*model.ESSource) dch = make(chan []*model.ESSource)
ech = make(chan error) ech = make(chan error)
ready = make(chan bool) ready = make(chan bool)
total = 0
) )
go func(ctx context.Context) { go func(ctx context.Context) {
@ -144,6 +145,7 @@ func (c *client) ReadData(ctx context.Context, size int, _ map[string]any, _ []s
list = append(list, item) list = append(list, item)
count++ count++
total++
if count >= size { if count >= size {
dch <- list dch <- list
@ -162,6 +164,8 @@ func (c *client) ReadData(ctx context.Context, size int, _ map[string]any, _ []s
if err = c.scanner.Err(); err != nil { if err = c.scanner.Err(); err != nil {
ech <- err ech <- err
} }
log.Debug("read: read file succeed! total=%d", total)
}(ctx) }(ctx)
<-ready <-ready

View File

@ -32,7 +32,6 @@ func ReadData(ctx context.Context, client *elastic.Client, index string, size, m
defer func() { defer func() {
close(dataCh) close(dataCh)
close(errCh)
if scrollId != "" { if scrollId != "" {
bs, _ := json.Marshal(map[string]string{ bs, _ := json.Marshal(map[string]string{

View File

@ -35,11 +35,28 @@ func WriteData(ctx context.Context, client *elastic.Client, index string, docsCh
count := 0 count := 0
if indexer, err = esutil.NewBulkIndexer(esutil.BulkIndexerConfig{ if indexer, err = esutil.NewBulkIndexer(esutil.BulkIndexerConfig{
Client: client, NumWorkers: 0,
Index: index, FlushBytes: 0,
ErrorTrace: true, FlushInterval: 0,
Client: client,
Decoder: nil,
OnError: func(ctx context.Context, err error) { OnError: func(ctx context.Context, err error) {
log.Error("es7.writer: on error log, err = %s", err.Error())
}, },
Index: index,
ErrorTrace: true,
FilterPath: []string{},
Header: map[string][]string{},
Human: false,
Pipeline: "",
Pretty: false,
Refresh: "",
Routing: "",
Source: []string{},
SourceExcludes: []string{},
SourceIncludes: []string{},
Timeout: 0,
WaitForActiveShards: "",
}); err != nil { }); err != nil {
return err return err
} }