fix typo I found in this repo
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
This commit is contained in:
parent
0a58d55e63
commit
08bcbddb32
11 changed files with 16 additions and 16 deletions
|
@ -19,7 +19,7 @@ summarily closed.
|
||||||
While pull requests are the methodology for submitting changes to code, changes
|
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
|
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
|
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. Often times, it helps to first state the problem before presenting
|
||||||
solutions.
|
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
|
stating the problem. This issue can include a problem statement and a
|
||||||
checklist with requirements. If solutions are proposed, alternatives should be
|
checklist with requirements. If solutions are proposed, alternatives should be
|
||||||
listed and eliminated. Even if the criteria for elimination of a solution is
|
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
|
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
|
in `design/`. These are focused on providing context to the design at the time
|
||||||
|
|
|
@ -7,7 +7,7 @@ import (
|
||||||
"os"
|
"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.
|
// 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) {
|
func newConsole(uid, gid int) (*os.File, string, error) {
|
||||||
return nil, "", errors.New("newConsole not implemented on Solaris")
|
return nil, "", errors.New("newConsole not implemented on Solaris")
|
||||||
|
|
|
@ -27,7 +27,7 @@ type controlMessage struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// containerd-shim is a small shim that sits in front of a runtime implementation
|
// 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
|
// the cwd of the shim should be the path to the state directory where the shim
|
||||||
// can locate fifos and other information.
|
// can locate fifos and other information.
|
||||||
|
|
|
@ -196,7 +196,7 @@ func checkBlobPath(t *testing.T, cs *ContentStore, dgst digest.Digest) string {
|
||||||
t.Fatal(err, dgst)
|
t.Fatal(err, dgst)
|
||||||
}
|
}
|
||||||
if path != filepath.Join(cs.root, "blobs", dgst.Algorithm().String(), dgst.Hex()) {
|
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)
|
fi, err := os.Stat(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -40,7 +40,7 @@ may be exported for access via corresponding _services_.
|
||||||
|
|
||||||
## Modules
|
## 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
|
subsystem boundaries, referened to as components. We have the following
|
||||||
components:
|
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:
|
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
|
layer places the image content into the _content store_. The image name and
|
||||||
root manifest pointers are registered with the metadata store.
|
root manifest pointers are registered with the metadata store.
|
||||||
2. Once the image is pulled, the user can instruct the bundle controller to
|
2. Once the image is pulled, the user can instruct the bundle controller to
|
||||||
|
|
|
@ -32,7 +32,7 @@ graphdrivers, minimizing the need to new code and sprawling tests.
|
||||||
## Scope
|
## Scope
|
||||||
|
|
||||||
In the past, the `graphdriver` component has provided quite a lot of
|
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.
|
packing, mounting.
|
||||||
|
|
||||||
This _snapshot manager_ will only provide mount-oriented snapshot
|
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_.
|
directories with parent-child relationships, known as _Snapshots_.
|
||||||
|
|
||||||
Every snapshot is represented by an opaque `diff` directory, which acts as a
|
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.
|
data, parent information and arbitrary metadata.
|
||||||
|
|
||||||
The `diff` directory for a _snapshot_ is created with a transactional
|
The `diff` directory for a _snapshot_ is created with a transactional
|
||||||
|
|
|
@ -260,7 +260,7 @@ func (p *process) isAlive() bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// check that we have the same startttime
|
// check that we have the same starttime
|
||||||
stime, err := starttime.GetProcessStartTime(int(p.pid))
|
stime, err := starttime.GetProcessStartTime(int(p.pid))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
|
@ -286,10 +286,10 @@ func waitForPid(ctx context.Context, abortCh chan syscall.WaitStatus, root strin
|
||||||
return
|
return
|
||||||
case wait := <-abortCh:
|
case wait := <-abortCh:
|
||||||
if wait.Signaled() {
|
if wait.Signaled() {
|
||||||
err = errors.Errorf("shim died prematurarily: %v", wait.Signal())
|
err = errors.Errorf("shim died prematurely: %v", wait.Signal())
|
||||||
return
|
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
|
return
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,7 +211,7 @@ func (s *Service) SignalProcess(ctx context.Context, r *api.SignalProcessRequest
|
||||||
}
|
}
|
||||||
process := container.GetProcess(r.ProcessID)
|
process := container.GetProcess(r.ProcessID)
|
||||||
if process == nil {
|
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))
|
return emptyResponse, process.Signal(syscall.Signal(r.Signal))
|
||||||
}
|
}
|
||||||
|
|
2
gc/gc.go
2
gc/gc.go
|
@ -1,5 +1,5 @@
|
||||||
// Package gc experiments with providing central gc tooling to ensure
|
// 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
|
// For now, we just have a single exported implementation that can be used
|
||||||
// under certain use cases.
|
// under certain use cases.
|
||||||
|
|
|
@ -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
|
// for each layer if they don't exist, keyed by their chain id. If the snapshot
|
||||||
// already exists, it will be skipped.
|
// 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.
|
// identifier can be used to check out a snapshot.
|
||||||
func Prepare(snapshots Snaphotter, mounter Mounter, layers []ocispec.Descriptor,
|
func Prepare(snapshots Snaphotter, mounter Mounter, layers []ocispec.Descriptor,
|
||||||
// TODO(stevvooe): The following functions are candidate for internal
|
// TODO(stevvooe): The following functions are candidate for internal
|
||||||
|
|
|
@ -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
|
// 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
|
// Whether or not these are readonly mounts is implementation specific, but the
|
||||||
// caller may write to dst freely.
|
// caller may write to dst freely.
|
||||||
|
|
Loading…
Reference in a new issue