Remove num_roles from schedule info, as it doesn't work any more

Temporary `num_roles` is `0` in status.
tailhook · Jul 2, 2018 · 4909fd3 · 4909fd3
1 parent a172d4c
commit 4909fd3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/src/daemon/frontend/api.rs b/src/daemon/frontend/api.rs
@@ -266,7 +266,8 @@ pub fn serve<S: 'static>(state: &SharedState, config: &Arc<Config>,
                     peers: peers.peers.len(),
                     peers_timestamp: Some(peers.timestamp),
                     leader: leader,
-                    roles: schedule.map(|x| x.num_roles).unwrap_or(0),
+                    // TODO(tailhook)
+                    roles: 0,
                     last_stable_timestamp: election.last_stable_timestamp,
                     num_errors: errors.len() + failed_roles.len(),
                     errors: &*errors,

diff --git a/src/daemon/scheduler/main.rs b/src/daemon/scheduler/main.rs
@@ -17,7 +17,6 @@ use hash::hash;
 use id::Id;
 use peer::Peer;
 use scheduler::{self, Schedule};
-use scheduler::state::num_roles;
 use shared::{SharedState};
 use time_util::ToMsec;
 use watchdog::{self, Alarm};
@@ -240,7 +239,6 @@ pub fn main(state: SharedState, settings: Settings) -> !
             info!("New schedule {}, done in {} ms", hash,
                 SCHEDULING_TIME.get());
             state.set_schedule_by_leader(cookie, Schedule {
-                num_roles: num_roles(&result.schedule),
                 timestamp: timestamp.to_msec(),
                 hash: hash,
                 data: result.schedule,

diff --git a/src/daemon/scheduler/state.rs b/src/daemon/scheduler/state.rs
@@ -2,7 +2,6 @@ use serde_json::Value as Json;
 
 use hash::hash;
 use id::Id;
-use itertools::Itertools;
 
 pub type ScheduleId = String; // temporarily
 
@@ -12,23 +11,6 @@ pub struct Schedule {
     pub hash: ScheduleId,
     pub data: Json,
     pub origin: Id,
-    pub num_roles: usize,
-}
-
-pub fn num_roles(json: &Json) -> usize {
-    (
-        json.get("roles")
-        .and_then(|x| x.as_object())
-        .map(|x| x.keys())
-    ).into_iter().chain(
-        json.get("nodes")
-        .and_then(|x| x.as_object())
-        .map(|x| x.values().filter_map(|x|
-            x.get("roles")
-             .and_then(|x| x.as_object())
-             .map(|x| x.keys())))
-        .into_iter().flat_map(|x| x)
-    ).kmerge().dedup().count()
 }
 
 pub fn from_json(json: Json) -> Result<Schedule, String> {
@@ -50,7 +32,6 @@ pub fn from_json(json: Json) -> Result<Schedule, String> {
                 Err(format!("Invalid hash {:?} data {}", h, d))
             } else {
                 Ok(Schedule {
-                    num_roles: num_roles(&d),
                     timestamp: t,
                     hash: h.to_string(),
                     data: d,