863784f991
What started out as a simple PR to remove the "Readonly" column became an adventure to add a proper type for a "View" snapshot. The short story here is that we now get the following output: ``` $ sudo ctr snapshot ls ID PARENT KIND sha256:08c2295a7fa5c220b0f60c994362d290429ad92f6e0235509db91582809442f3 Committed testing4 sha256:08c2295a7fa5c220b0f60c994362d290429ad92f6e0235509db91582809442f3 Active ``` In pursuing this output, it was found that the idea of having "readonly" as an attribute on all snapshots was redundant. For committed, they are always readonly, as they are not accessible without an active snapshot. For active snapshots that were views, we'd have to check the type before interpreting "readonly". With this PR, this is baked fully into the kind of snapshot. When `Snapshotter.View` is called, the kind of snapshot is `KindView`, and the storage system reflects this end to end. Unfortunately, this will break existing users. There is no migration, so they will have to wipe `/var/lib/containerd` and recreate everything. However, this is deemed worthwhile at this point, as we won't have to judge validity of the "Readonly" field when new snapshot types are added. Signed-off-by: Stephen J Day <stephen.day@docker.com>
105 lines
2.3 KiB
Protocol Buffer
105 lines
2.3 KiB
Protocol Buffer
syntax = "proto3";
|
|
|
|
package containerd.services.snapshots.v1;
|
|
|
|
import "gogoproto/gogo.proto";
|
|
import "google/protobuf/empty.proto";
|
|
import "github.com/containerd/containerd/api/types/mount.proto";
|
|
|
|
option go_package = "github.com/containerd/containerd/api/services/snapshot/v1;snapshot";
|
|
|
|
// Snapshot service manages snapshots
|
|
service Snapshots {
|
|
rpc Prepare(PrepareSnapshotRequest) returns (PrepareSnapshotResponse);
|
|
rpc View(ViewSnapshotRequest) returns (ViewSnapshotResponse);
|
|
rpc Mounts(MountsRequest) returns (MountsResponse);
|
|
rpc Commit(CommitSnapshotRequest) returns (google.protobuf.Empty);
|
|
rpc Remove(RemoveSnapshotRequest) returns (google.protobuf.Empty);
|
|
rpc Stat(StatSnapshotRequest) returns (StatSnapshotResponse);
|
|
rpc List(ListSnapshotsRequest) returns (stream ListSnapshotsResponse);
|
|
rpc Usage(UsageRequest) returns (UsageResponse);
|
|
}
|
|
|
|
message PrepareSnapshotRequest {
|
|
string snapshotter = 1;
|
|
string key = 2;
|
|
string parent = 3;
|
|
}
|
|
|
|
message PrepareSnapshotResponse {
|
|
repeated containerd.types.Mount mounts = 1;
|
|
}
|
|
|
|
message ViewSnapshotRequest {
|
|
string snapshotter = 1;
|
|
string key = 2;
|
|
string parent = 3;
|
|
}
|
|
|
|
message ViewSnapshotResponse {
|
|
repeated containerd.types.Mount mounts = 1;
|
|
}
|
|
|
|
message MountsRequest {
|
|
string snapshotter = 1;
|
|
string key = 2;
|
|
}
|
|
|
|
message MountsResponse {
|
|
repeated containerd.types.Mount mounts = 1;
|
|
}
|
|
|
|
message RemoveSnapshotRequest {
|
|
string snapshotter = 1;
|
|
string key = 2;
|
|
}
|
|
|
|
message CommitSnapshotRequest {
|
|
string snapshotter = 1;
|
|
string name = 2;
|
|
string key = 3;
|
|
}
|
|
|
|
message StatSnapshotRequest {
|
|
string snapshotter = 1;
|
|
string key = 2;
|
|
}
|
|
|
|
enum Kind {
|
|
option (gogoproto.goproto_enum_prefix) = false;
|
|
option (gogoproto.enum_customname) = "Kind";
|
|
|
|
UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "KindUnknown"];
|
|
VIEW = 1 [(gogoproto.enumvalue_customname) = "KindView"];
|
|
ACTIVE = 2 [(gogoproto.enumvalue_customname) = "KindActive"];
|
|
COMMITTED = 3 [(gogoproto.enumvalue_customname) = "KindCommitted"];
|
|
}
|
|
|
|
message Info {
|
|
string name = 1;
|
|
string parent = 2;
|
|
Kind kind = 3;
|
|
}
|
|
|
|
message StatSnapshotResponse {
|
|
Info info = 1 [(gogoproto.nullable) = false];
|
|
}
|
|
|
|
message ListSnapshotsRequest{
|
|
string snapshotter = 1;
|
|
}
|
|
|
|
message ListSnapshotsResponse {
|
|
repeated Info info = 1 [(gogoproto.nullable) = false];
|
|
}
|
|
|
|
message UsageRequest {
|
|
string snapshotter = 1;
|
|
string key = 2;
|
|
}
|
|
|
|
message UsageResponse {
|
|
int64 size = 1;
|
|
int64 inodes = 2;
|
|
}
|