Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dragonfly-api"
version = "2.2.15"
version = "2.2.16"
authors = ["Gaius <gaius.qi@gmail.com>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
732 changes: 350 additions & 382 deletions pkg/apis/common/v2/common.pb.go

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions pkg/apis/common/v2/common.pb.validate.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 2 additions & 8 deletions pkg/apis/common/v2/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -473,12 +473,10 @@ message CPU {

// Cgroup CPU Stat.
message CgroupCPU {
// CFS shares.
uint64 shares = 1;
// CFS period in microseconds.
uint64 period = 2;
uint64 period = 1;
// CFS quota in microseconds.
int64 quota = 3;
int64 quota = 2;
}

// CPUTimes contains the amounts of time the CPU has spent performing different
Expand Down Expand Up @@ -536,10 +534,6 @@ message CgroupMemory {
int64 limit = 1;
// Usage is the current memory usage in bytes.
uint64 usage = 2;
// MaxUsage is the maximum memory usage recorded in bytes.
uint64 max_usage = 3;
// Failcnt is the number of times memory allocation failed.
uint64 failcnt = 4;
}

// Network Stat.
Expand Down
10 changes: 2 additions & 8 deletions proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,10 @@ message CPU {

// Cgroup CPU Stat.
message CgroupCPU {
// CFS shares.
uint64 shares = 1;
// CFS period in microseconds.
uint64 period = 2;
uint64 period = 1;
// CFS quota in microseconds.
int64 quota = 3;
int64 quota = 2;
}

// CPUTimes contains the amounts of time the CPU has spent performing different
Expand Down Expand Up @@ -497,10 +495,6 @@ message CgroupMemory {
int64 limit = 1;
// Usage is the current memory usage in bytes.
uint64 usage = 2;
// MaxUsage is the maximum memory usage recorded in bytes.
uint64 max_usage = 3;
// Failcnt is the number of times memory allocation failed.
uint64 failcnt = 4;
}

// Network Stat.
Expand Down
13 changes: 2 additions & 11 deletions src/common.v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,14 +480,11 @@ pub struct Cpu {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
pub struct CgroupCpu {
/// CFS shares.
#[prost(uint64, tag = "1")]
pub shares: u64,
/// CFS period in microseconds.
#[prost(uint64, tag = "2")]
#[prost(uint64, tag = "1")]
pub period: u64,
/// CFS quota in microseconds.
#[prost(int64, tag = "3")]
#[prost(int64, tag = "2")]
pub quota: i64,
}
/// CPUTimes contains the amounts of time the CPU has spent performing different
Expand Down Expand Up @@ -565,12 +562,6 @@ pub struct CgroupMemory {
/// Usage is the current memory usage in bytes.
#[prost(uint64, tag = "2")]
pub usage: u64,
/// MaxUsage is the maximum memory usage recorded in bytes.
#[prost(uint64, tag = "3")]
pub max_usage: u64,
/// Failcnt is the number of times memory allocation failed.
#[prost(uint64, tag = "4")]
pub failcnt: u64,
}
/// Network Stat.
#[derive(serde::Serialize, serde::Deserialize)]
Expand Down
Binary file modified src/descriptor.bin
Binary file not shown.