Skip to content

fix: FuseServerService.CreateFuseServer don't block forever when Server.Run failed #113

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

Open
okhowang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: FuseServerService.CreateFuseServer don't block forever when Server.Run failed #113

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion domain/fuse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type FuseServerIface interface {
Destroy() error
MountPoint() string
Unmount()
InitWait()
InitWait() bool
SetCntrRegComplete()
IsCntrRegCompleted() bool
}
6 changes: 4 additions & 2 deletions fuse/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func (s *fuseServer) Create() error {
}

func (s *fuseServer) Run() error {
defer close(s.initDone)
//
// Creating a FUSE mount at the associated mountpoint.
//
Expand Down Expand Up @@ -202,8 +203,9 @@ func (s *fuseServer) Root() (bfusefs.Node, error) {

// Ensure that fuse-server initialization is completed before moving on
// with sys container's pre-registration sequence.
func (s *fuseServer) InitWait() {
<-s.initDone
func (s *fuseServer) InitWait() bool {
_, ok := <-s.initDone
return ok
}

func (s *fuseServer) MountPoint() string {
Expand Down
4 changes: 3 additions & 1 deletion fuse/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ func (fss *FuseServerService) CreateFuseServer(serveCntr, stateCntr domain.Conta
// Launch fuse-server in a separate goroutine and wait for 'ack' before
// moving on.
go srv.Run()
srv.InitWait()
if !srv.InitWait() {
return errors.New("FuseServer InitWait error")
}

// Store newly created fuse-server.
fss.Lock()
Expand Down