Update Microsoft/hcsshim vendor
Updates Microsoft/hcsshim vendor commit hash to a recent version that now: 1. Supports container stats via the Stats RuntimeV2 gRPC call. 2. Fixes a regression when issuing a resize of the pty after the container has exited which previously in Docker was expected to be a non-error case. 3. Puts in a workaround when using a non-default sandbox size for Windows containers due to a platform bug. This expansion now happens in the go library itself. Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
This commit is contained in:
5
vendor/github.com/Microsoft/hcsshim/internal/schema2/memory_2.go
generated
vendored
5
vendor/github.com/Microsoft/hcsshim/internal/schema2/memory_2.go
generated
vendored
@@ -22,4 +22,9 @@ type Memory2 struct {
|
||||
|
||||
// EnableDeferredCommit is private in the schema. If regenerated need to add back.
|
||||
EnableDeferredCommit bool `json:"EnableDeferredCommit,omitempty"`
|
||||
|
||||
// EnableColdDiscardHint if enabled, then the memory cold discard hint feature is exposed
|
||||
// to the VM, allowing it to trim non-zeroed pages from the working set (if supported by
|
||||
// the guest operating system).
|
||||
EnableColdDiscardHint bool `json:"EnableColdDiscardHint,omitempty"`
|
||||
}
|
||||
|
||||
2
vendor/github.com/Microsoft/hcsshim/internal/schema2/memory_information_for_vm.go
generated
vendored
2
vendor/github.com/Microsoft/hcsshim/internal/schema2/memory_information_for_vm.go
generated
vendored
@@ -10,7 +10,7 @@
|
||||
package hcsschema
|
||||
|
||||
type MemoryInformationForVm struct {
|
||||
VirtualNodeCount int32 `json:"VirtualNodeCount,omitempty"`
|
||||
VirtualNodeCount uint32 `json:"VirtualNodeCount,omitempty"`
|
||||
|
||||
VirtualMachineMemory *VmMemory `json:"VirtualMachineMemory,omitempty"`
|
||||
|
||||
|
||||
6
vendor/github.com/Microsoft/hcsshim/internal/schema2/memory_stats.go
generated
vendored
6
vendor/github.com/Microsoft/hcsshim/internal/schema2/memory_stats.go
generated
vendored
@@ -11,9 +11,9 @@ package hcsschema
|
||||
|
||||
// Memory runtime statistics
|
||||
type MemoryStats struct {
|
||||
MemoryUsageCommitBytes int32 `json:"MemoryUsageCommitBytes,omitempty"`
|
||||
MemoryUsageCommitBytes uint64 `json:"MemoryUsageCommitBytes,omitempty"`
|
||||
|
||||
MemoryUsageCommitPeakBytes int32 `json:"MemoryUsageCommitPeakBytes,omitempty"`
|
||||
MemoryUsageCommitPeakBytes uint64 `json:"MemoryUsageCommitPeakBytes,omitempty"`
|
||||
|
||||
MemoryUsagePrivateWorkingSetBytes int32 `json:"MemoryUsagePrivateWorkingSetBytes,omitempty"`
|
||||
MemoryUsagePrivateWorkingSetBytes uint64 `json:"MemoryUsagePrivateWorkingSetBytes,omitempty"`
|
||||
}
|
||||
|
||||
6
vendor/github.com/Microsoft/hcsshim/internal/schema2/processor_stats.go
generated
vendored
6
vendor/github.com/Microsoft/hcsshim/internal/schema2/processor_stats.go
generated
vendored
@@ -11,9 +11,9 @@ package hcsschema
|
||||
|
||||
// CPU runtime statistics
|
||||
type ProcessorStats struct {
|
||||
TotalRuntime100ns int32 `json:"TotalRuntime100ns,omitempty"`
|
||||
TotalRuntime100ns uint64 `json:"TotalRuntime100ns,omitempty"`
|
||||
|
||||
RuntimeUser100ns int32 `json:"RuntimeUser100ns,omitempty"`
|
||||
RuntimeUser100ns uint64 `json:"RuntimeUser100ns,omitempty"`
|
||||
|
||||
RuntimeKernel100ns int32 `json:"RuntimeKernel100ns,omitempty"`
|
||||
RuntimeKernel100ns uint64 `json:"RuntimeKernel100ns,omitempty"`
|
||||
}
|
||||
|
||||
8
vendor/github.com/Microsoft/hcsshim/internal/schema2/properties.go
generated
vendored
8
vendor/github.com/Microsoft/hcsshim/internal/schema2/properties.go
generated
vendored
@@ -9,6 +9,10 @@
|
||||
|
||||
package hcsschema
|
||||
|
||||
import (
|
||||
v1 "github.com/containerd/cgroups/stats/v1"
|
||||
)
|
||||
|
||||
type Properties struct {
|
||||
Id string `json:"Id,omitempty"`
|
||||
|
||||
@@ -43,4 +47,8 @@ type Properties struct {
|
||||
SharedMemoryRegionInfo []SharedMemoryRegionInfo `json:"SharedMemoryRegionInfo,omitempty"`
|
||||
|
||||
GuestConnectionInfo *GuestConnectionInfo `json:"GuestConnectionInfo,omitempty"`
|
||||
|
||||
// Metrics is not part of the API for HCS but this is used for LCOW v2 to
|
||||
// return the full cgroup metrics from the guest.
|
||||
Metrics *v1.Metrics `json:"LCOWMetrics,omitempty"`
|
||||
}
|
||||
|
||||
2
vendor/github.com/Microsoft/hcsshim/internal/schema2/property_query.go
generated
vendored
2
vendor/github.com/Microsoft/hcsshim/internal/schema2/property_query.go
generated
vendored
@@ -11,5 +11,5 @@ package hcsschema
|
||||
|
||||
// By default the basic properties will be returned. This query provides a way to request specific properties.
|
||||
type PropertyQuery struct {
|
||||
PropertyTypes []string `json:"PropertyTypes,omitempty"`
|
||||
PropertyTypes []PropertyType `json:"PropertyTypes,omitempty"`
|
||||
}
|
||||
|
||||
23
vendor/github.com/Microsoft/hcsshim/internal/schema2/property_type.go
generated
vendored
Normal file
23
vendor/github.com/Microsoft/hcsshim/internal/schema2/property_type.go
generated
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
/*
|
||||
* HCS API
|
||||
*
|
||||
* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
|
||||
*
|
||||
* API version: 2.1
|
||||
* Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
|
||||
*/
|
||||
|
||||
package hcsschema
|
||||
|
||||
type PropertyType string
|
||||
|
||||
const (
|
||||
PTMemory PropertyType = "Memory"
|
||||
PTGuestMemory PropertyType = "GuestMemory"
|
||||
PTStatistics PropertyType = "Statistics"
|
||||
PTProcessList PropertyType = "ProcessList"
|
||||
PTTerminateOnLastHandleClosed PropertyType = "TerminateOnLastHandleClosed"
|
||||
PTSharedMemoryRegion PropertyType = "SharedMemoryRegion"
|
||||
PTGuestConnection PropertyType = "GuestConnection"
|
||||
PTICHeartbeatStatus PropertyType = "ICHeartbeatStatus"
|
||||
)
|
||||
2
vendor/github.com/Microsoft/hcsshim/internal/schema2/statistics.go
generated
vendored
2
vendor/github.com/Microsoft/hcsshim/internal/schema2/statistics.go
generated
vendored
@@ -19,7 +19,7 @@ type Statistics struct {
|
||||
|
||||
ContainerStartTime time.Time `json:"ContainerStartTime,omitempty"`
|
||||
|
||||
Uptime100ns int32 `json:"Uptime100ns,omitempty"`
|
||||
Uptime100ns uint64 `json:"Uptime100ns,omitempty"`
|
||||
|
||||
Processor *ProcessorStats `json:"Processor,omitempty"`
|
||||
|
||||
|
||||
8
vendor/github.com/Microsoft/hcsshim/internal/schema2/storage_stats.go
generated
vendored
8
vendor/github.com/Microsoft/hcsshim/internal/schema2/storage_stats.go
generated
vendored
@@ -11,11 +11,11 @@ package hcsschema
|
||||
|
||||
// Storage runtime statistics
|
||||
type StorageStats struct {
|
||||
ReadCountNormalized int32 `json:"ReadCountNormalized,omitempty"`
|
||||
ReadCountNormalized uint64 `json:"ReadCountNormalized,omitempty"`
|
||||
|
||||
ReadSizeBytes int32 `json:"ReadSizeBytes,omitempty"`
|
||||
ReadSizeBytes uint64 `json:"ReadSizeBytes,omitempty"`
|
||||
|
||||
WriteCountNormalized int32 `json:"WriteCountNormalized,omitempty"`
|
||||
WriteCountNormalized uint64 `json:"WriteCountNormalized,omitempty"`
|
||||
|
||||
WriteSizeBytes int32 `json:"WriteSizeBytes,omitempty"`
|
||||
WriteSizeBytes uint64 `json:"WriteSizeBytes,omitempty"`
|
||||
}
|
||||
|
||||
4
vendor/github.com/Microsoft/hcsshim/internal/schema2/vm_memory.go
generated
vendored
4
vendor/github.com/Microsoft/hcsshim/internal/schema2/vm_memory.go
generated
vendored
@@ -14,9 +14,9 @@ type VmMemory struct {
|
||||
|
||||
AvailableMemoryBuffer int32 `json:"AvailableMemoryBuffer,omitempty"`
|
||||
|
||||
ReservedMemory int32 `json:"ReservedMemory,omitempty"`
|
||||
ReservedMemory uint64 `json:"ReservedMemory,omitempty"`
|
||||
|
||||
AssignedMemory int32 `json:"AssignedMemory,omitempty"`
|
||||
AssignedMemory uint64 `json:"AssignedMemory,omitempty"`
|
||||
|
||||
SlpActive bool `json:"SlpActive,omitempty"`
|
||||
|
||||
|
||||
Reference in New Issue
Block a user