bitfab 0.57.0 → 0.57.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cd6fe2aaa2d03dea82e1d6a14b63e5a60eec3169c33489ce54795840ab6db8c
-  data.tar.gz: 1637726e4aa1cfa7940ecb65e1b10684b0d1236885a3c1ddd0d3748c8c7a874f
+  metadata.gz: '054905de819e592d260f623159ed33c50c6062e24a35f28005940005c45c8652'
+  data.tar.gz: fbf28893c51b904efc74fc2d880d375df4c2d8cd6af46b2421d554083e706a87
 SHA512:
-  metadata.gz: 391ca0dbc155bf7826f8ff4245d305d6d426cd8cd330a2c92564de8eac72ee229d928faad6d74f72f3d7163cf8a950fab1c6dfc96c5ddefdbd215ba0167382a1
-  data.tar.gz: c8a4c5172ecb6f78b309303062167073384bbdd7079c5fc5618200b877526a44bd495f85b2e6120b9a602542f883b80d2872ba2519f81109d3e17d83977b301f
+  metadata.gz: 0d5dfb24ef74d933781ad9b6f8d445583dceffcfe0eaf5189b9ba2ec2405b5ef4b108ed828ea8fbb42c66f3bd3e82d171f88d873bb77ae99640185fcbbacf01c
+  data.tar.gz: f5509659a2e3f8d8df265d3abba09b106f6553bce8b7d1d9c4227d43c10f58ad74b01400f102e6140d2b37d6a8f518217a11a5914269b7a1a1de779489e0bcf0

data/lib/bitfab/replay_memory.rb

@@ -5,8 +5,23 @@ require "open3"
 module Bitfab
   class ReplayMemoryThrottle
     MIB = 1024 * 1024
+    MAX_SWAP_USED_RATIO = 0.85
+    CRITICAL_PRESSURE_LEVEL = 4
+    CRITICAL_STALL_PERCENT = 10.0
+    STALL_FILES = ["/sys/fs/cgroup/memory.pressure", "/proc/pressure/memory"].freeze
     attr_reader :condition
 
+    def self.pressure_critical_from_level(raw)
+      level = Integer(raw.to_s.strip, exception: false)
+      return nil unless level&.positive?
+      level >= CRITICAL_PRESSURE_LEVEL
+    end
+
+    def self.pressure_critical_from_stall(raw)
+      percent = raw.to_s[/^full\b[^\n]*?\bavg10=([\d.]+)/, 1]
+      percent && percent.to_f >= CRITICAL_STALL_PERCENT
+    end
+
     def initialize(enabled: true)
       @enabled = enabled && !%w[0 off false no].include?(ENV.fetch("BITFAB_REPLAY_MEMORY_THROTTLE", "").strip.downcase)
       @initial_budget = env_bytes("BITFAB_REPLAY_CHILD_MEMORY_MB", 2048 * MIB)
@@ -50,7 +65,7 @@ module Bitfab
     def headroom?
       return true if @resident.empty?
       snapshot = memory_snapshot
-      return false if snapshot[:swap_used_ratio] && snapshot[:swap_used_ratio] >= 0.85
+      return false if under_strain?(snapshot)
       return true unless snapshot[:available]
       budget = [@peak.positive? ? @peak : @initial_budget, *@resident.values].max
       unrealized = @resident.values.sum { |rss| [budget - rss, 0].max }
@@ -61,14 +76,15 @@ module Bitfab
       if File.file?("/proc/meminfo")
         fields = File.read("/proc/meminfo").scan(/^(\w+):\s+(\d+)/).to_h.transform_values { |value| value.to_i * 1024 }
         total = fields["SwapTotal"].to_i
-        {available: fields["MemAvailable"], swap_used_ratio: total.positive? ? 1.0 - fields["SwapFree"].to_f / total : 0.0}
+        {available: fields["MemAvailable"], swap_used_ratio: total.positive? ? 1.0 - fields["SwapFree"].to_f / total : 0.0, pressure_critical: stall_files_pressure_critical}
       elsif RUBY_PLATFORM.include?("darwin")
         total = Integer(read_command("sysctl", "-n", "hw.memsize").to_s, exception: false)
         percent = Integer(read_command("sysctl", "-n", "kern.memorystatus_level").to_s, exception: false)
         swap = read_command("sysctl", "-n", "vm.swapusage").to_s
         total_swap = swap[/total = ([\d.]+)/, 1].to_f
         used_swap = swap[/used = ([\d.]+)/, 1].to_f
-        {available: (percent && total&.positive?) ? total * percent.to_i.clamp(0, 100) / 100 : nil, swap_used_ratio: total_swap.positive? ? used_swap / total_swap : 0.0}
+        pressure = self.class.pressure_critical_from_level(read_command("sysctl", "-n", "kern.memorystatus_vm_pressure_level"))
+        {available: (percent && total&.positive?) ? total * percent.to_i.clamp(0, 100) / 100 : nil, swap_used_ratio: total_swap.positive? ? used_swap / total_swap : 0.0, pressure_critical: pressure}
       else
         {}
       end
@@ -89,6 +105,22 @@ module Bitfab
 
     private
 
+    def under_strain?(snapshot)
+      return snapshot[:pressure_critical] unless snapshot[:pressure_critical].nil?
+      !!(snapshot[:swap_used_ratio] && snapshot[:swap_used_ratio] >= MAX_SWAP_USED_RATIO)
+    end
+
+    def stall_files_pressure_critical
+      STALL_FILES.each do |path|
+        next unless File.file?(path)
+        critical = self.class.pressure_critical_from_stall(File.read(path))
+        return critical unless critical.nil?
+      end
+      nil
+    rescue
+      nil
+    end
+
     def env_bytes(key, fallback)
       value = Integer(ENV.fetch(key, "0"), exception: false)
       value&.positive? ? value * MIB : fallback

data/lib/bitfab/replay_registry.rb

@@ -91,6 +91,14 @@ module Bitfab
 
     module_function
 
+    # get_assertions returns every state so a reviewer can see drafts, but only an
+    # approved assertion is checked on a replay, so narrowing on anything else
+    # would pick traces the run cannot be judged against. The server applies the
+    # same rule when it revalidates the selection.
+    def approved_assertion?(assertions)
+      assertions.any? { |assertion| assertion["approvalState"] == "approved" }
+    end
+
     def bound_trace_ids(client, trace_ids, limit, only_with_assertions)
       unless limit.is_a?(Integer) && limit.positive?
         raise ArgumentError, "Replay limit must be a positive integer."
@@ -100,13 +108,13 @@ module Bitfab
       selected = []
       trace_ids.each do |trace_id|
         result = client.traces.get_assertions(trace_id)
-        if result.fetch("inheritedFrom").nil? && !result.fetch("assertions").empty?
+        if result.fetch("inheritedFrom").nil? && approved_assertion?(result.fetch("assertions"))
           selected << trace_id
           break if selected.length == limit
         end
       end
       if selected.empty?
-        raise ArgumentError, "No traces with active assertions matched this replay selection."
+        raise ArgumentError, "No traces with approved assertions matched this replay selection."
       end
       selected
     end

data/lib/bitfab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitfab
-  VERSION = "0.57.0"
+  VERSION = "0.57.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfab
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.57.2
 platform: ruby
 authors:
 - Harvest Team