diff --git a/daemon/graphdriver/lcow/lcow.go b/daemon/graphdriver/lcow/lcow.go index 97e73889ce..a26d13ede1 100644 --- a/daemon/graphdriver/lcow/lcow.go +++ b/daemon/graphdriver/lcow/lcow.go @@ -236,7 +236,7 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped logrus.Debugf("%s: adding entry to service vm map", title) svm, exists, err := d.serviceVms.add(id) if err != nil && err == errVMisTerminating { - // VM is in the process of terminating. Wait until it's done and and then try again + // VM is in the process of terminating. Wait until it's done and then try again logrus.Debugf("%s: VM with current ID still in the process of terminating", title) if err := svm.getStopError(); err != nil { logrus.Debugf("%s: VM did not stop successfully: %s", title, err) @@ -751,7 +751,7 @@ func (d *Driver) Cleanup() error { // Note we don't return an error below - it's possible the files // are locked. However, next time around after the daemon exits, - // we likely will be able to to cleanup successfully. Instead we log + // we likely will be able to cleanup successfully. Instead we log // warnings if there are errors. for _, item := range items { if item.IsDir() && strings.HasSuffix(item.Name(), "-removing") { diff --git a/daemon/graphdriver/windows/windows.go b/daemon/graphdriver/windows/windows.go index 52b0c6d845..347231b104 100644 --- a/daemon/graphdriver/windows/windows.go +++ b/daemon/graphdriver/windows/windows.go @@ -456,7 +456,7 @@ func (d *Driver) Cleanup() error { // Note we don't return an error below - it's possible the files // are locked. However, next time around after the daemon exits, - // we likely will be able to to cleanup successfully. Instead we log + // we likely will be able to cleanup successfully. Instead we log // warnings if there are errors. for _, item := range items { if item.IsDir() && strings.HasSuffix(item.Name(), "-removing") { diff --git a/daemon/logger/logger.go b/daemon/logger/logger.go index 12e8d0054e..6308270b20 100644 --- a/daemon/logger/logger.go +++ b/daemon/logger/logger.go @@ -103,7 +103,7 @@ type LogReader interface { type LogWatcher struct { // For sending log messages to a reader. Msg chan *Message - // For sending error messages that occur while while reading logs. + // For sending error messages that occur while reading logs. Err chan error producerOnce sync.Once producerGone chan struct{}