Skip to content
This repository has been archived by the owner on Nov 9, 2020. It is now read-only.

Implement the new locking and notification system for vFile #2001

Merged
merged 2 commits into from
Nov 30, 2017
Merged

Implement the new locking and notification system for vFile #2001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dbd2aa
Implement the new locking and notification system for vFile
Nov 28, 2017
d00c4b2
Handle comments; Fix minor bugs
Nov 28, 2017
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
22 changes: 20 additions & 2 deletions client_plugin/drivers/vfile/dockerops/dockerops.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const (
// for communicating to clients
networkDriver = "overlay"
// Name of the Samba server docker image
sambaImageName = "dperson/samba"
sambaImageName = "luomiao/samba-debian"
// Name of the Samba share used to expose a volume
FileShareName = "share1"
// Default username for all accessing Samba server mounts
Expand Down Expand Up @@ -200,6 +200,16 @@ func (d *DockerOps) VolumeInspect(volName string) error {
// bool: Indicated success/failure of the function. If
// false, ignore other output values.
func (d *DockerOps) StartSMBServer(volName string) (int, string, bool) {
_, port, err := d.getServiceIDAndPort(volName)
if err == nil {
// if the service is already existing, just return corresponding port number and name
return int(port), serviceNamePrefix + volName, true
}

if err != nil && err.Error() != noSambaServiceError {
log.Warningf("Failed to check the if a server is running for volume %s", volName)
}

var service swarm.ServiceSpec
var options dockerTypes.ServiceCreateOptions

Expand Down Expand Up @@ -463,6 +473,9 @@ func (d *DockerOps) DeleteInternalVolume(volName string) {
// volume exists, continue waiting and retry removing
msg += fmt.Sprintf(" Internal volume still in use. Wait and retry before timeout.")
log.Warningf(msg)
} else {
log.Info("Successfully deleted internal volume.")
return
}
case <-timer.C:
// The deletion of internal volume will be handled by garbage collector
Expand All @@ -489,7 +502,12 @@ func (d *DockerOps) StopSMBServer(volName string) (int, string, bool) {
log.Infof("StopSMBServer for vol %s", volName)
serviceID, _, err := d.getServiceIDAndPort(volName)
if err != nil {
return 0, "", false
if err.Error() != noSambaServiceError {
return 0, "", false
} else {
// if the service is already stopped
return 0, "", true
Copy link
Contributor

Choose a reason for hiding this comment

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

Why here we return "true" to indicate the service is already stopped?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because the purpose of this function is to stop the service.
When the service is already stopped, we just return true so the event handlers can proceed to next steps.

}
}

//Stop the service
Expand Down
Loading