entitlements-app 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff39c49f02bf4b3dcc8ced68357e2c85084416468d8300a79dd19c5685cac35
-  data.tar.gz: c40fb54374427dda1782344df0bdeb9d5401774a755e4c89d5795438d43a6605
+  metadata.gz: 739d6fcd34da1ba6e5af155386469c9192546338cb3ce5a7e3aa56b34979eac7
+  data.tar.gz: a14101ee81be9f88732c42119563beb3cea0e2e01b59280f2f6ad4344f0e0392
 SHA512:
-  metadata.gz: 0f0b5e0b20fc9a52547233b9b9f5dec204976d5a62d893a5d74b913af3222972fddadc12b2da5be4b7fb59ac8cf4722adc5f0da8a0415d8166cae3fc2066c119
-  data.tar.gz: 3585576afa5953596609cec10ca8995166e8803666cdece35003839dd365389eb46ee6e1298e8599537560083b28212f05e2d71155cd2dcc4e776f3ccbe934ec
+  metadata.gz: e4090f203171ab34ca7aff65e37d036e3b10b604b86a03d8dfb01c1373e18e6e05434fd6fee6a54cf79065e5c6568320b703c3784f112cf0313183ac7d869ee7
+  data.tar.gz: fe95f3cc1ef013e6d5fe91249f17a16878bfb780c70356cd6bbdefb56a18857f9a2a007907fb3b96746c7757888e314dfcbbb98d04243d01ef43e11a33e12d3f

data/lib/entitlements.rb

@@ -22,6 +22,7 @@ require "logger"
 require "ostruct"
 require "resolv"
 require "stringio"
+require "thread"
 require "uri"
 require "yaml"
 
@@ -457,25 +458,41 @@ module Entitlements
     # Calculate old and new membership in each group.
     thread_pool = Concurrent::FixedThreadPool.new(max_parallelism)
     logger.debug("Begin prefetch and validate for all groups")
+
     prep_start = Time.now
-    futures = Entitlements.child_classes.map do |group_name, obj|
-      Concurrent::Future.execute({ executor: thread_pool }) do
-        group_start = Time.now
-        logger.debug("Begin prefetch and validate for #{group_name}")
-        provider = Entitlements.config["groups"].fetch(group_name).fetch("type")
-        timed_operation(phase: "prefetch", provider: provider, target: group_name, concurrent: true) { obj.prefetch }
-        timed_operation(phase: "validate", provider: provider, target: group_name, concurrent: true) { obj.validate }
-        logger.debug("Finished prefetch and validate for #{group_name} in #{Time.now - group_start}")
+    jobs = Entitlements.child_classes
+    completions = Queue.new
+
+    begin
+      jobs.each do |group_name, obj|
+        thread_pool.post do
+          group_start = Time.now
+          logger.debug("Begin prefetch and validate for #{group_name}")
+          provider = Entitlements.config["groups"].fetch(group_name).fetch("type")
+          timed_operation(phase: "prefetch", provider: provider, target: group_name, concurrent: true) { obj.prefetch }
+          timed_operation(phase: "validate", provider: provider, target: group_name, concurrent: true) { obj.validate }
+          logger.debug("Finished prefetch and validate for #{group_name} in #{Time.now - group_start}")
+          completions << nil
+        rescue => e
+          completions << e
+        end
       end
-    end
 
-    futures.each(&:value!)
+      jobs.size.times do
+        exception = completions.pop
+        raise exception if exception
+      end
+    ensure
+      thread_pool.kill
+    end
     logger.debug("Finished all prefetch and validate in #{Time.now - prep_start}")
 
     logger.debug("Begin all calculations")
     calc_start = Time.now
     actions = []
     Entitlements.child_classes.map do |group_name, obj|
+      group_start = Time.now
+      logger.debug("Begin calculation for #{group_name}")
       provider = Entitlements.config["groups"].fetch(group_name).fetch("type")
       timed_operation(phase: "calculate", provider: provider, target: group_name) { obj.calculate }
       if obj.change_count > 0
@@ -483,6 +500,7 @@ module Entitlements
         cache[:change_count] += obj.change_count
       end
       actions.concat(obj.actions)
+      logger.debug("Finished calculation for #{group_name} in #{Time.now - group_start}")
     end
     logger.debug("Finished all calculations in #{Time.now - calc_start}")
     logger.debug("Finished all prefetch, validate, and calculation in #{Time.now - prep_start}")

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Entitlements
   module Version
-    VERSION = "1.2.4"
+    VERSION = "1.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entitlements-app
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - GitHub, Inc. Security Ops