Cut metrics (#280)

This commit is contained in:
Maciej Hirsz
2020-08-21 17:01:39 +02:00
committed by GitHub
parent e9f2e119e7
commit a721cc4e42
10 changed files with 9 additions and 207 deletions
+1 -1
View File
@@ -288,7 +288,7 @@ impl Handler<Connect> for Aggregator {
connector.do_send(Connected(fid));
self.serializer.push(feed::Version(29));
self.serializer.push(feed::Version(30));
// TODO: keep track on number of nodes connected to each chain
for (_, entry) in self.chains.iter() {
-15
View File
@@ -130,12 +130,6 @@ impl Node {
pub fn update_hardware(&mut self, interval: &SystemInterval) -> bool {
let mut changed = false;
if let Some(cpu) = interval.cpu {
changed |= self.hardware.cpu.push(cpu);
}
if let Some(memory) = interval.memory {
changed |= self.hardware.memory.push(memory);
}
if let Some(upload) = interval.bandwidth_upload {
changed |= self.hardware.upload.push(upload);
}
@@ -162,15 +156,6 @@ impl Node {
if let Some(size) = interval.used_state_cache_size {
changed |= self.io.used_state_cache_size.push(size);
}
if let Some(size) = interval.used_db_cache_size {
changed |= self.io.used_db_cache_size.push(size);
}
if let Some(bps) = interval.disk_read_per_sec {
changed |= self.io.disk_read_per_sec.push(bps);
}
if let Some(bps) = interval.disk_write_per_sec {
changed |= self.io.disk_write_per_sec.push(bps);
}
if changed {
Some(&self.io)
-5
View File
@@ -65,8 +65,6 @@ pub struct SystemConnected {
pub struct SystemInterval {
#[serde(flatten)]
pub stats: NodeStats,
pub memory: Option<f32>,
pub cpu: Option<f32>,
pub bandwidth_upload: Option<f64>,
pub bandwidth_download: Option<f64>,
pub finalized_height: Option<BlockNumber>,
@@ -75,9 +73,6 @@ pub struct SystemInterval {
pub block: Block,
pub network_state: Option<IgnoredAny>,
pub used_state_cache_size: Option<f32>,
pub used_db_cache_size: Option<f32>,
pub disk_read_per_sec: Option<f32>,
pub disk_write_per_sec: Option<f32>,
}
#[derive(Deserialize, Debug)]
+2 -14
View File
@@ -28,9 +28,6 @@ pub struct NodeStats {
#[derive(Default)]
pub struct NodeIO {
pub used_state_cache_size: MeanList<f32>,
pub used_db_cache_size: MeanList<f32>,
pub disk_read_per_sec: MeanList<f32>,
pub disk_write_per_sec: MeanList<f32>,
}
#[derive(Deserialize, Debug, Clone, Copy)]
@@ -61,10 +58,6 @@ impl Default for BlockDetails {
#[derive(Default)]
pub struct NodeHardware {
/// CPU use means
pub cpu: MeanList<f32>,
/// Memory use means
pub memory: MeanList<f32>,
/// Upload uses means
pub upload: MeanList<f64>,
/// Download uses means
@@ -112,11 +105,8 @@ impl Serialize for NodeIO {
where
S: Serializer,
{
let mut tup = serializer.serialize_tuple(4)?;
let mut tup = serializer.serialize_tuple(1)?;
tup.serialize_element(self.used_state_cache_size.slice())?;
tup.serialize_element(self.used_db_cache_size.slice())?;
tup.serialize_element(self.disk_read_per_sec.slice())?;
tup.serialize_element(self.disk_write_per_sec.slice())?;
tup.end()
}
}
@@ -154,9 +144,7 @@ impl Serialize for NodeHardware {
where
S: Serializer,
{
let mut tup = serializer.serialize_tuple(5)?;
tup.serialize_element(self.memory.slice())?;
tup.serialize_element(self.cpu.slice())?;
let mut tup = serializer.serialize_tuple(3)?;
tup.serialize_element(self.upload.slice())?;
tup.serialize_element(self.download.slice())?;
tup.serialize_element(self.chart_stamps.slice())?;