[next-0.10] admin api: fix logic in get cluster status

src/api/admin/cluster.rs

@@ -70,18 +70,21 @@ pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<
 					);
 				}
 				Some(n) => {
-					if n.role.is_none() {
 					n.role = Some(role);
 				}
 			}
 		}
 	}
-	}
 
 	for ver in layout.versions().iter().rev().skip(1) {
 		for (id, _, role) in ver.roles.items().iter() {
 			if let layout::NodeRoleV(Some(r)) = role {
-				if !nodes.contains_key(id) && r.capacity.is_some() {
+				if r.capacity.is_some() {
+					if let Some(n) = nodes.get_mut(id) {
+						if n.role.is_none() {
+							n.draining = true;
+						}
+					} else {
 						nodes.insert(
 							*id,
 							NodeResp {
@@ -94,6 +97,7 @@ pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response<
 				}
 			}
 		}
+	}
 
 	let mut nodes = nodes.into_values().collect::<Vec<_>>();
 	nodes.sort_by(|x, y| x.id.cmp(&y.id));