Add files via upload

autonomys · Feb 13, 2024 · d05df14 · d05df14
1 parent 87efb96
commit d05df14
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs b/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs
@@ -25,7 +25,7 @@ use subspace_erasure_coding::ErasureCoding;
 use subspace_farmer::piece_cache::PieceCache;
 use subspace_farmer::single_disk_farm::farming::FarmingNotification;
 use subspace_farmer::single_disk_farm::{
-    SectorPlottingDetails, SectorUpdate, SingleDiskFarm, SingleDiskFarmError, SingleDiskFarmOptions,
+    SectorPlottingDetails, SectorExpirationDetails, SectorUpdate, SingleDiskFarm, SingleDiskFarmError, SingleDiskFarmOptions,
 };
 use subspace_farmer::utils::farmer_piece_getter::FarmerPieceGetter;
 use subspace_farmer::utils::piece_validator::SegmentCommitmentPieceValidator;
@@ -664,6 +664,11 @@ where
 
     info!("Finished collecting already plotted pieces successfully");
 
+    for (_, single_disk_farm) in single_disk_farms.iter().enumerate() {
+        farmer_metrics.update_farm_size(single_disk_farm.id(), single_disk_farm.total_sectors_count() as i64);
+        farmer_metrics.update_farm_plotted(single_disk_farm.id(), single_disk_farm.plotted_sectors_count().await as u64);
+    }
+
     let mut single_disk_farms_stream = single_disk_farms
         .into_iter()
         .enumerate()
@@ -699,15 +704,7 @@ where
                     let farmer_metrics = farmer_metrics.clone();
 
                     move |(_sector_index, sector_state)| match sector_state {
-                        SectorUpdate::Plotting(SectorPlottingDetails::Starting {
-                            progress,
-                            last_queued, ..
-                        }) => {
-                            if *last_queued {
-                                farmer_metrics.update_sector_progress(&single_disk_farm_id, 100.0);
-                            } else {
-                                farmer_metrics.update_sector_progress(&single_disk_farm_id, *progress);
-                            };
+                        SectorUpdate::Plotting(SectorPlottingDetails::Starting { .. }) => {
                             farmer_metrics.sector_plotting.inc();
                         }
                         SectorUpdate::Plotting(SectorPlottingDetails::Downloading) => {
@@ -740,6 +737,17 @@ where
                             on_plotted_sector_callback(plotted_sector, old_plotted_sector);
                             farmer_metrics.observe_sector_plotting_time(&single_disk_farm_id, time);
                             farmer_metrics.sector_plotted.inc();
+                            if let Some(_) = &old_plotted_sector {
+                                farmer_metrics.update_farm_replotted(&single_disk_farm_id, 1);
+                            } else {
+                                farmer_metrics.update_farm_plotted(&single_disk_farm_id, 1);
+                            }
+                        }
+                        SectorUpdate::Expiration(SectorExpirationDetails::AboutToExpire) => {
+                            farmer_metrics.update_farm_expired(&single_disk_farm_id, 1);
+                        }
+                        SectorUpdate::Expiration(SectorExpirationDetails::Expired) => {
+                            farmer_metrics.update_farm_expired(&single_disk_farm_id, 1);
                         }
                         _ => {}
                     }
@@ -838,4 +846,4 @@ fn derive_libp2p_keypair(schnorrkel_sk: &schnorrkel::SecretKey) -> Keypair {
     );
 
     Keypair::from(keypair)
-} 
+}