Merge pull request #2540 from subspace/fix-metrics-deadlock

Fix accidental deadlock in metrics
autonomys · Feb 19, 2024 · 760c1a8 · 760c1a8
2 parents df8ba53 + ccd2067
commit 760c1a8
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm/metrics.rs b/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm/metrics.rs
@@ -298,31 +298,37 @@ impl FarmerMetrics {
                 // Never called, doesn't make sense
             }
             SectorState::Plotted => {
-                let not_plotted_sectors = self.sectors_total.get_or_create(&vec![
-                    ("farm_id".to_string(), single_disk_farm_id.to_string()),
-                    ("state".to_string(), SectorState::NotPlotted.to_string()),
-                ]);
-                if not_plotted_sectors.get() > 0 {
-                    // Initial plotting
-                    not_plotted_sectors.dec();
-                } else {
+                // Separate blocks in because of mutex guard returned by `get_or_create` resulting
+                // in deadlock otherwise
+                {
+                    let not_plotted_sectors = self.sectors_total.get_or_create(&vec![
+                        ("farm_id".to_string(), single_disk_farm_id.to_string()),
+                        ("state".to_string(), SectorState::NotPlotted.to_string()),
+                    ]);
+                    if not_plotted_sectors.get() > 0 {
+                        // Initial plotting
+                        not_plotted_sectors.dec();
+                        return;
+                    }
+                }
+                {
                     let expired_sectors = self.sectors_total.get_or_create(&vec![
                         ("farm_id".to_string(), single_disk_farm_id.to_string()),
                         ("state".to_string(), SectorState::Expired.to_string()),
                     ]);
                     if expired_sectors.get() > 0 {
                         // Replaced expired sector
                         expired_sectors.dec();
-                    } else {
-                        // Replaced about to expire sector
-                        self.sectors_total
-                            .get_or_create(&vec![
-                                ("farm_id".to_string(), single_disk_farm_id.to_string()),
-                                ("state".to_string(), SectorState::AboutToExpire.to_string()),
-                            ])
-                            .dec();
+                        return;
                     }
                 }
+                // Replaced about to expire sector
+                self.sectors_total
+                    .get_or_create(&vec![
+                        ("farm_id".to_string(), single_disk_farm_id.to_string()),
+                        ("state".to_string(), SectorState::AboutToExpire.to_string()),
+                    ])
+                    .dec();
             }
             SectorState::AboutToExpire | SectorState::Expired => {
                 self.sectors_total