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

Commit

Permalink
Cleanup debugging info.
Browse files Browse the repository at this point in the history
  • Loading branch information
Miao Luo committed Oct 20, 2017
1 parent 434de68 commit d6964d5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
6 changes: 1 addition & 5 deletions client_plugin/drivers/vfile/dockerops/dockerops.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ func (d *DockerOps) StartSMBServer(volName string) (int, string, bool) {
return 0, "", false
}

log.Errorf("After create SMB service, ID: %s, volName: %s", resp.ID, volName)
// Wait till service container starts
ticker := time.NewTicker(checkTicker)
defer ticker.Stop()
Expand Down Expand Up @@ -347,15 +346,12 @@ func (d *DockerOps) isFileServiceRunning(servID string, volName string) (uint32,
log.Warningf("Failed to get task list for file service for volume %s. %v", volName, err)
return port, false
}
for _, task := range tasks {
log.Infof("tasks state is %s", task.Status.State)
}
for _, task := range tasks {
if task.Status.State == swarm.TaskStateRunning {
log.Infof("File server not running for volume %s", volName)
return port, true
}
}
log.Infof("File server not running for volume %s", volName)
return port, false
}

Expand Down
13 changes: 1 addition & 12 deletions tests/e2e/advanced_vfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
package e2e

import (
"log"
"strconv"

"github.com/vmware/docker-volume-vsphere/tests/utils/dockercli"
"github.com/vmware/docker-volume-vsphere/tests/utils/inputparams"
"github.com/vmware/docker-volume-vsphere/tests/utils/misc"
"github.com/vmware/docker-volume-vsphere/tests/utils/ssh"
"github.com/vmware/docker-volume-vsphere/tests/utils/verification"
. "gopkg.in/check.v1"
)
Expand Down Expand Up @@ -71,19 +69,10 @@ var _ = Suite(&AdvancedVFileTestSuite{})
func (s *AdvancedVFileTestSuite) TestVFileVolumeLifecycle(c *C) {
misc.LogTestStart(c.TestName())

out, err := dockercli.CreateService(s.master, "testnginx", "-p 8080:80 --replicas 1 nginx")
c.Assert(err, IsNil, Commentf(out))

status := verification.IsDockerServiceRunning(s.master, "testnginx", 1)
c.Assert(status, Equals, true, Commentf("Service %s is not running", "testnginx"))

out, err = ssh.InvokeCommand(s.worker1, "curl http://127.0.0.1:8080")
log.Println("curl of nginx output is %s", out)

data := []string{"QWERTYUIOP000000000000",
"ASDFGHJKLL111111111111"}
// Create vFile volume
out, err = dockercli.CreateVFileVolume(s.worker1, s.volName1)
out, err := dockercli.CreateVFileVolume(s.worker1, s.volName1)
c.Assert(err, IsNil, Commentf(out))

// Check if the vFile volume got created properly
Expand Down

0 comments on commit d6964d5

Please sign in to comment.