fix: prevent hanging if node never returns

travisperson · travisperson · commit 4882a123ef07 · 2022-04-27T16:31:19.000Z
diff --git a/pkg/export/export.go b/pkg/export/export.go
@@ -128,6 +128,7 @@ func (e *Export) done() {
 }
 
 func (e *Export) Export(ctx context.Context) error {
+	defer e.done()
 	if err := e.node.Shutdown(ctx); err != nil {
 		return err
 	}
@@ -145,8 +146,6 @@ func (e *Export) Export(ctx context.Context) error {
 		return err
 	}
 
-	defer e.done()
-
 	var last bool
 	for b := range stream {
 		last = e.update(len(b)) == 0

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ func (e *Export) done() {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`func (e *Export) Export(ctx context.Context) error {`
	`131`	`+ defer e.done()`
`131`	`132`	`if err := e.node.Shutdown(ctx); err != nil {`
`132`	`133`	`return err`
`133`	`134`	`}`
`@@ -145,8 +146,6 @@ func (e *Export) Export(ctx context.Context) error {`
`145`	`146`	`return err`
`146`	`147`	`}`
`147`	`148`
`148`		`- defer e.done()`
`149`		`-`
`150`	`149`	`var last bool`
`151`	`150`	`for b := range stream {`
`152`	`151`	`last = e.update(len(b)) == 0`