Skip to content
This repository has been archived by the owner on Jun 26, 2023. It is now read-only.

root: make calling Close on the root actually close everything #58

Closed
wants to merge 1 commit into from
Closed

root: make calling Close on the root actually close everything #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,23 @@ func IsFile(fsn FSNode) bool {

// Root represents the root of a filesystem tree.
type Root struct {

// Root directory of the MFS layout.
dir *Directory

repub *Republisher

ctx context.Context
cancel context.CancelFunc
}

// NewRoot creates a new Root and starts up a republisher routine for it.
func NewRoot(parent context.Context, ds ipld.DAGService, node *dag.ProtoNode, pf PubFunc) (*Root, error) {
func NewRoot(ctx context.Context, ds ipld.DAGService, node *dag.ProtoNode, pf PubFunc) (*Root, error) {

ctx, cancel := context.WithCancel(ctx)

var repub *Republisher
if pf != nil {
repub = NewRepublisher(parent, pf, time.Millisecond*300, time.Second*3)
repub = NewRepublisher(ctx, pf, time.Millisecond*300, time.Second*3)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is probably better to create and start the new republisher at the very end of this function. Otherwise, if an error occurs, the republisher remains running unless the caller cancels the context. Although it may not matter since failure to create mfs root is probably fatal.


// No need to take the lock here since we just created
// the `Republisher` and no one has access to it yet.
Expand All @@ -106,7 +110,9 @@ func NewRoot(parent context.Context, ds ipld.DAGService, node *dag.ProtoNode, pf
}

root := &Root{
repub: repub,
repub: repub,
ctx: ctx,
cancel: cancel,
}

fsn, err := ft.FSNodeFromBytes(node.Data())
Expand All @@ -118,7 +124,7 @@ func NewRoot(parent context.Context, ds ipld.DAGService, node *dag.ProtoNode, pf

switch fsn.Type() {
case ft.TDirectory, ft.THAMTShard:
newDir, err := NewDirectory(parent, node.String(), node, root, ds)
newDir, err := NewDirectory(ctx, node.String(), node, root, ds)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -190,7 +196,7 @@ func (kr *Root) FlushMemFree(ctx context.Context) error {
// the top), document it and maybe make it an anonymous variable (if
// that's possible).
func (kr *Root) updateChildEntry(c child) error {
err := kr.GetDirectory().dagService.Add(context.TODO(), c.Node)
err := kr.GetDirectory().dagService.Add(kr.ctx, c.Node)
if err != nil {
return err
}
Expand All @@ -204,6 +210,8 @@ func (kr *Root) updateChildEntry(c child) error {
}

func (kr *Root) Close() error {
defer kr.cancel()

nd, err := kr.GetDirectory().GetNode()
if err != nil {
return err
Expand Down