handle errors from commit on add
fixes #6139 License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Mar 28, 2019 at 17:43 UTC
337bf0f4aa6b7125245782c3827125a1dcdb50c4
1 file changed
+8
-5
core/coreunix/add.go
+8
-5
@@ -104,9 +104,6 @@ func (adder *Adder) add(reader io.Reader) (ipld.Node, error) {
104
return nil, err
105
}
106
107
- // Make sure all added nodes are written when done.
108
- defer adder.bufferedDS.Commit()
109
-
107
params := ihelper.DagBuilderParams{
108
Dagserv: adder.bufferedDS,
109
RawLeaves: adder.RawLeaves,
@@ -119,11 +116,17 @@ func (adder *Adder) add(reader io.Reader) (ipld.Node, error) {
116
if err != nil {
117
return nil, err
118
}
119
+ var nd ipld.Node
120
if adder.Trickle {
123
- return trickle.Layout(db)
121
+ nd, err = trickle.Layout(db)
122
+ } else {
123
+ nd, err = balanced.Layout(db)
124
+ }
125
+ if err != nil {
126
+ return nil, err
127
}
128
126
- return balanced.Layout(db)
129
+ return nd, adder.bufferedDS.Commit()
130
}
131
132
// RootNode returns the mfs root node