Merge pull request #2619 from nashasha1/fix/typo-in-runtime

crosbymichael · web-flow · commit c48cafea4048 · 2018-09-10T09:32:34.000-04:00
Fix some typo in runtime and snapshots
diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go
@@ -73,7 +73,7 @@ func (b *binary) Start(ctx context.Context) (_ *shim, err error) {
 		}
 	}()
 	// open the log pipe and block until the writer is ready
-	// this helps with syncronization of the shim
+	// this helps with synchronization of the shim
 	// copy the shim's logs to containerd's output
 	go func() {
 		defer f.Close()
diff --git a/runtime/v2/runhcs/service.go b/runtime/v2/runhcs/service.go
@@ -526,7 +526,7 @@ func (s *service) Delete(ctx context.Context, r *taskAPI.DeleteRequest) (*taskAP
 
 	select {
 	case <-time.After(5 * time.Second):
-		// Force close the container process since it didnt shutdown in time.
+		// Force close the container process since it didn't shutdown in time.
 		p.close()
 	case <-p.waitBlock:
 	}
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -66,7 +66,7 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
 		}
 	}()
 	// open the log pipe and block until the writer is ready
-	// this helps with syncronization of the shim
+	// this helps with synchronization of the shim
 	// copy the shim's logs to containerd's output
 	go func() {
 		defer f.Close()
diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go
@@ -315,7 +315,7 @@ func (s *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
 		if err := os.MkdirAll(snDir, 0700); err != nil {
 			return nil, err
 		}
-		// Create the scratch.vhdx cache file if it doesnt already exit.
+		// Create the scratch.vhdx cache file if it doesn't already exit.
 		scratchPath := filepath.Join(s.root, "scratch.vhdx")
 		scratchLockPath := filepath.Join(s.root, "scratch.vhdx.lock")
 		startTime := time.Now()
diff --git a/snapshots/overlay/check.go b/snapshots/overlay/check.go
@@ -71,7 +71,7 @@ func supportsMultipleLowerDir(d string) error {
 }
 
 // Supported returns nil when the overlayfs is functional on the system with the root directory.
-// Suppported is not called during plugin initialization, but exposed for downstream projects which uses
+// Supported is not called during plugin initialization, but exposed for downstream projects which uses
 // this snapshotter as a library.
 func Supported(root string) error {
 	if err := os.MkdirAll(root, 0700); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (b binary) Start(ctx context.Context) (_ shim, err error) {`
`73`	`73`	`}`
`74`	`74`	`}()`
`75`	`75`	`// open the log pipe and block until the writer is ready`
`76`		`- // this helps with syncronization of the shim`
	`76`	`+ // this helps with synchronization of the shim`
`77`	`77`	`// copy the shim's logs to containerd's output`
`78`	`78`	`go func() {`
`79`	`79`	`defer f.Close()`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ func (s service) Delete(ctx context.Context, r taskAPI.DeleteRequest) (*taskAP`
`526`	`526`
`527`	`527`	`select {`
`528`	`528`	`case <-time.After(5 * time.Second):`
`529`		`- // Force close the container process since it didnt shutdown in time.`
	`529`	`+ // Force close the container process since it didn't shutdown in time.`
`530`	`530`	`p.close()`
`531`	`531`	`case <-p.waitBlock:`
`532`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func loadShim(ctx context.Context, bundle Bundle, events exchange.Exchange, rt`
`66`	`66`	`}`
`67`	`67`	`}()`
`68`	`68`	`// open the log pipe and block until the writer is ready`
`69`		`- // this helps with syncronization of the shim`
	`69`	`+ // this helps with synchronization of the shim`
`70`	`70`	`// copy the shim's logs to containerd's output`
`71`	`71`	`go func() {`
`72`	`72`	`defer f.Close()`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ func (s *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k`
`315`	`315`	`if err := os.MkdirAll(snDir, 0700); err != nil {`
`316`	`316`	`return nil, err`
`317`	`317`	`}`
`318`		`- // Create the scratch.vhdx cache file if it doesnt already exit.`
	`318`	`+ // Create the scratch.vhdx cache file if it doesn't already exit.`
`319`	`319`	`scratchPath := filepath.Join(s.root, "scratch.vhdx")`
`320`	`320`	`scratchLockPath := filepath.Join(s.root, "scratch.vhdx.lock")`
`321`	`321`	`startTime := time.Now()`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func supportsMultipleLowerDir(d string) error {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Supported returns nil when the overlayfs is functional on the system with the root directory.`
`74`		`-// Suppported is not called during plugin initialization, but exposed for downstream projects which uses`
	`74`	`+// Supported is not called during plugin initialization, but exposed for downstream projects which uses`
`75`	`75`	`// this snapshotter as a library.`
`76`	`76`	`func Supported(root string) error {`
`77`	`77`	`if err := os.MkdirAll(root, 0700); err != nil {`