Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize: resume nydusd processes parallelizilly #518

Merged
merged 1 commit into from
Aug 16, 2023
Merged

optimize: resume nydusd processes parallelizilly #518

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
39 changes: 24 additions & 15 deletions pkg/filesystem/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/mohae/deepcopy"
"github.com/opencontainers/go-digest"
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"

"github.com/containerd/containerd/log"
"github.com/containerd/containerd/snapshots"
Expand Down Expand Up @@ -120,22 +121,30 @@ func NewFileSystem(ctx context.Context, opt ...NewFSOpt) (*Filesystem, error) {
}

// Try to bring all persisted and stopped nydusd up and remount Rafs
eg, _ := errgroup.WithContext(context.Background())
for _, d := range recoveringDaemons {
d.ClearVestige()
fsManager, err := fs.getManager(d.States.FsDriver)
if err != nil {
return nil, errors.Wrapf(err, "get filesystem manager for daemon %s", d.States.ID)
}
if err := fsManager.StartDaemon(d); err != nil {
return nil, errors.Wrapf(err, "start daemon %s", d.ID())
}
if err := d.WaitUntilState(types.DaemonStateRunning); err != nil {
return nil, errors.Wrapf(err, "wait for daemon %s", d.ID())
}
if err := d.RecoveredMountInstances(); err != nil {
return nil, errors.Wrapf(err, "recover mounts for daemon %s", d.ID())
}
fs.TryRetainSharedDaemon(d)
d := d
eg.Go(func() error {
d.ClearVestige()
fsManager, err := fs.getManager(d.States.FsDriver)
if err != nil {
return errors.Wrapf(err, "get filesystem manager for daemon %s", d.States.ID)
}
if err := fsManager.StartDaemon(d); err != nil {
return errors.Wrapf(err, "start daemon %s", d.ID())
}
if err := d.WaitUntilState(types.DaemonStateRunning); err != nil {
return errors.Wrapf(err, "wait for daemon %s", d.ID())
}
if err := d.RecoveredMountInstances(); err != nil {
return errors.Wrapf(err, "recover mounts for daemon %s", d.ID())
}
fs.TryRetainSharedDaemon(d)
return nil
})
}
if err := eg.Wait(); err != nil {
return nil, err
}

for _, d := range liveDaemons {
Expand Down
Loading