From 08bcbddb3283e6752d30ddb4bb91ebf7f1acaf11 Mon Sep 17 00:00:00 2001 From: "Aaron.L.Xu" Date: Fri, 20 Jan 2017 01:18:18 +0800 Subject: [PATCH] fix typo I found in this repo Signed-off-by: Aaron.L.Xu --- CONTRIBUTING.md | 4 ++-- cmd/containerd-shim/console_solaris.go | 2 +- cmd/containerd-shim/main.go | 2 +- content/content_test.go | 2 +- design/architecture.md | 4 ++-- design/snapshots.md | 4 ++-- execution/executors/shim/process.go | 6 +++--- execution/service.go | 2 +- gc/gc.go | 2 +- rootfs/apply.go | 2 +- snapshot/manager.go | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 07c22bc..8304864 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ summarily closed. While pull requests are the methodology for submitting changes to code, changes are much more likely to be accepted if they are accompanied by additional engineering work. While we don't define this explicitly, most of these goals -are accomplished through communication of the design goals and subsqeuent +are accomplished through communication of the design goals and subsequent solutions. Often times, it helps to first state the problem before presenting solutions. @@ -27,7 +27,7 @@ Typically, the best methods of accomplishing this are to submit an issue, stating the problem. This issue can include a problem statement and a checklist with requirements. If solutions are proposed, alternatives should be listed and eliminated. Even if the criteria for elimination of a solution is -frivelous, say so. +frivolous, say so. Larger changes typically work best with design documents, similar to those found in `design/`. These are focused on providing context to the design at the time diff --git a/cmd/containerd-shim/console_solaris.go b/cmd/containerd-shim/console_solaris.go index 37b3368..13713be 100644 --- a/cmd/containerd-shim/console_solaris.go +++ b/cmd/containerd-shim/console_solaris.go @@ -7,7 +7,7 @@ import ( "os" ) -// NewConsole returns an initalized console that can be used within a container by copying bytes +// NewConsole returns an initialized console that can be used within a container by copying bytes // from the master side to the slave that is attached as the tty for the container's init process. func newConsole(uid, gid int) (*os.File, string, error) { return nil, "", errors.New("newConsole not implemented on Solaris") diff --git a/cmd/containerd-shim/main.go b/cmd/containerd-shim/main.go index 1c82f50..906f223 100644 --- a/cmd/containerd-shim/main.go +++ b/cmd/containerd-shim/main.go @@ -27,7 +27,7 @@ type controlMessage struct { } // containerd-shim is a small shim that sits in front of a runtime implementation -// that allows it to be repartented to init and handle reattach from the caller. +// that allows it to be reparented to init and handle reattach from the caller. // // the cwd of the shim should be the path to the state directory where the shim // can locate fifos and other information. diff --git a/content/content_test.go b/content/content_test.go index 7afc4c4..fe0e562 100644 --- a/content/content_test.go +++ b/content/content_test.go @@ -196,7 +196,7 @@ func checkBlobPath(t *testing.T, cs *ContentStore, dgst digest.Digest) string { t.Fatal(err, dgst) } if path != filepath.Join(cs.root, "blobs", dgst.Algorithm().String(), dgst.Hex()) { - t.Fatalf("unxpected path: %q", path) + t.Fatalf("unexpected path: %q", path) } fi, err := os.Stat(path) if err != nil { diff --git a/design/architecture.md b/design/architecture.md index e605cad..fc6d236 100644 --- a/design/architecture.md +++ b/design/architecture.md @@ -40,7 +40,7 @@ may be exported for access via corresponding _services_. ## Modules -In addition to the subsystems have, we have sevaral components that may cross +In addition to the subsystems have, we have several components that may cross subsystem boundaries, referened to as components. We have the following components: @@ -71,7 +71,7 @@ is a diagram illustrating the data flow for bundle creation. Let's take pulling an image as a demonstrated example: -1. Instruct the Distribution layer to pull a particuler image. The distribution +1. Instruct the Distribution layer to pull a particular image. The distribution layer places the image content into the _content store_. The image name and root manifest pointers are registered with the metadata store. 2. Once the image is pulled, the user can instruct the bundle controller to diff --git a/design/snapshots.md b/design/snapshots.md index 66a48a3..504e9a3 100644 --- a/design/snapshots.md +++ b/design/snapshots.md @@ -32,7 +32,7 @@ graphdrivers, minimizing the need to new code and sprawling tests. ## Scope In the past, the `graphdriver` component has provided quite a lot of -funcionality in Docker. This includes serialization, hashing, unpacking, +functionality in Docker. This includes serialization, hashing, unpacking, packing, mounting. This _snapshot manager_ will only provide mount-oriented snapshot @@ -49,7 +49,7 @@ abstract, layer-based filesystems. The model works by building up sets of directories with parent-child relationships, known as _Snapshots_. Every snapshot is represented by an opaque `diff` directory, which acts as a -handle to the snapshot. It may contain driver specifc data, including changeset +handle to the snapshot. It may contain driver specific data, including changeset data, parent information and arbitrary metadata. The `diff` directory for a _snapshot_ is created with a transactional diff --git a/execution/executors/shim/process.go b/execution/executors/shim/process.go index b1045cc..669e1c5 100644 --- a/execution/executors/shim/process.go +++ b/execution/executors/shim/process.go @@ -260,7 +260,7 @@ func (p *process) isAlive() bool { return false } - // check that we have the same startttime + // check that we have the same starttime stime, err := starttime.GetProcessStartTime(int(p.pid)) if err != nil { if os.IsNotExist(err) { @@ -286,10 +286,10 @@ func waitForPid(ctx context.Context, abortCh chan syscall.WaitStatus, root strin return case wait := <-abortCh: if wait.Signaled() { - err = errors.Errorf("shim died prematurarily: %v", wait.Signal()) + err = errors.Errorf("shim died prematurely: %v", wait.Signal()) return } - err = errors.Errorf("shim exited prematurarily with exit code %v", wait.ExitStatus()) + err = errors.Errorf("shim exited prematurely with exit code %v", wait.ExitStatus()) return default: } diff --git a/execution/service.go b/execution/service.go index fa95576..3c115fb 100644 --- a/execution/service.go +++ b/execution/service.go @@ -211,7 +211,7 @@ func (s *Service) SignalProcess(ctx context.Context, r *api.SignalProcessRequest } process := container.GetProcess(r.ProcessID) if process == nil { - return nil, fmt.Errorf("Make me a constant! Process not foumd!") + return nil, fmt.Errorf("Make me a constant! Process not found!") } return emptyResponse, process.Signal(syscall.Signal(r.Signal)) } diff --git a/gc/gc.go b/gc/gc.go index d39738b..b9c2650 100644 --- a/gc/gc.go +++ b/gc/gc.go @@ -1,5 +1,5 @@ // Package gc experiments with providing central gc tooling to ensure -// deterministic resource removaol within containerd. +// deterministic resource removal within containerd. // // For now, we just have a single exported implementation that can be used // under certain use cases. diff --git a/rootfs/apply.go b/rootfs/apply.go index 23237a9..2ea427b 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -79,7 +79,7 @@ func ApplyLayer(snapshots Snapshotter, mounter Mounter, rd io.Reader, parent dig // for each layer if they don't exist, keyed by their chain id. If the snapshot // already exists, it will be skipped. // -// If sucessful, the chainID for the top-level layer is returned. That +// If successful, the chainID for the top-level layer is returned. That // identifier can be used to check out a snapshot. func Prepare(snapshots Snaphotter, mounter Mounter, layers []ocispec.Descriptor, // TODO(stevvooe): The following functions are candidate for internal diff --git a/snapshot/manager.go b/snapshot/manager.go index e6f9e22..a83934e 100644 --- a/snapshot/manager.go +++ b/snapshot/manager.go @@ -203,7 +203,7 @@ func (lm *Manager) Prepare(dst, parent string) ([]containerd.Mount, error) { } // View behaves identically to Prepare except the result may not be committed -// back to the snappshot manager. +// back to the snapshot manager. // // Whether or not these are readonly mounts is implementation specific, but the // caller may write to dst freely.