backup: report when batches fail on restore

if one of the batches sent fails, zed will hide the underlying error and just report EOF. The gRPC backend will report EOF as part of an error, which will have to eb retrieved via CloseAndRecv(). A common error that surfaced as EOF was duplicate relationships after reimporting the same backup file. Closes #310. Co-authored-by: Víctor Roldán Betancort <[email protected]>
authzed · Dec 8, 2023 · 4869932 · 4869932
1 parent 274701f
commit 4869932
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/internal/cmd/backup.go b/internal/cmd/backup.go
@@ -359,7 +359,8 @@ func restoreCmdFunc(cmd *cobra.Command, args []string) error {
 			if err := relationshipWriter.Send(&v1.BulkImportRelationshipsRequest{
 				Relationships: batch,
 			}); err != nil {
-				return fmt.Errorf("error sending batch to server: %w", err)
+				_, closeErr := relationshipWriter.CloseAndRecv()
+				return fmt.Errorf("error sending batch to server: %w", errors.Join(err, closeErr))
 			}
 
 			// Reset the relationships in the batch