canvas_sync 0.19.0.beta8 → 0.19.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016fb182ae3234080415fdcd2283d6d05b40cc77c5ed36cfb3345c42b17d39b3
-  data.tar.gz: 3d485ca044b6f377aee719156206e6ca6a59ce2ff489c9b4d84ba713c7500ca8
+  metadata.gz: 3cd64554a1f451160b874e8901b7275a25b6f9c526d687a29e531abff9f0b285
+  data.tar.gz: 9cac31449a633b4c3513088abf00b0274b0ce794e54f72742d65802bf2bb5a8c
 SHA512:
-  metadata.gz: 5bff1ac3d68f5b01aed96f19cc66d61af8d23db671b14bc354397b8217fc30a103a63aa7c200771b15b756a784423ab2f92eeac598a1939938ced433a7eb11af
-  data.tar.gz: 5b38641379b39c8d3f85b01d6e06c1771a6ceb85e13d8878baa4b0ab1ae3a3f7e091776a5e77245b516f85c49f9c7c5cd56b4f570d936eb1bc3aae38b28b3055
+  metadata.gz: a479a1705e765b3e338c7aed688728436fbeedd82809218bcbd288775e9a2175c62d5294dc2a206fdb77a7945f0223be723b74e9ec6800635841124e42149c22
+  data.tar.gz: 96bef245b0ba1a4de671dfc1d49a184d35bd03fea62efad44dbaac1bdcff345cabd19b1f12147f1d334b967641ce72e9c66704e0709f55b5f2378475d39d9d86

data/lib/canvas_sync/concerns/ability_helper.rb

@@ -114,7 +114,7 @@ module CanvasSync::Concerns
         ROLE_TYPES.each do |rt|
           # LIS V1
           if role.downcase.start_with?(rt[:urn])
-            return clean_role(ContextTypeURN, role), rt
+            return clean_role(rt[:urn], role), rt
           end
 
           # LIS V2

data/lib/canvas_sync/job_batches/batch.rb

@@ -493,12 +493,8 @@ module CanvasSync
 
         def pipelined(*args, &block)
           Batch.redis do |r|
-            if block.arity == 1
-              r.pipelined(*args) do
-                block.call(r)
-              end
-            else
-              r.pipelined(*args, &block)
+            r.pipelined(*args) do |r2|
+              block.call(r2 || r)
             end
           end
         end

data/lib/canvas_sync/job_batches/pool.rb

@@ -90,7 +90,7 @@ module CanvasSync
 
         activec, pactivec, pendingc, clean_when_empty, keep_open = redis.multi do |r|
           r.hlen("#{redis_key}-active")
-          r.hincrby(redis_key, "_active_count", 0)
+          r.hget(redis_key, "_active_count")
           pending_count(r)
           r.hget(redis_key, 'clean_when_empty')
           r.hget(redis_key, 'keep_open')
@@ -98,7 +98,7 @@ module CanvasSync
 
         return if keep_open == 'true' || clean_when_empty == 'false'
 
-        if activec <= 0 && pactivec <= 0 && pendingc <= 0
+        if activec <= 0 && (pactivec.try(:to_i) || 0) <= 0 && pendingc <= 0
           cleanup_redis
         end
       end
@@ -125,9 +125,7 @@ module CanvasSync
       end
 
       def job_checked_in(status, options)
-        redis.hdel("#{redis_key}-active", status.bid)
-        redis.hincrby(redis_key, "complete_count", 1)
-        active_count = refill_allotment
+        active_count = refill_allotment(status.bid)
         cleanup_if_empty unless active_count > 0
       end
 
@@ -150,8 +148,8 @@ module CanvasSync
         "POOLID-#{pid}"
       end
 
-      def refill_allotment
-        active_count, job_descs = POOL_REFILL.call(redis, [redis_key, "#{redis_key}-jobs", "#{redis_key}-active"], [])
+      def refill_allotment(checkin_bid = nil)
+        active_count, job_descs = POOL_REFILL.call(redis, [redis_key, "#{redis_key}-jobs", "#{redis_key}-active"], [checkin_bid || ""])
         return active_count if active_count < 0
 
         pending_job_descs = job_descs.dup
@@ -220,27 +218,6 @@ module CanvasSync
         end
       end
 
-      # @deprecated
-      def pop_job_from_pool
-        jobs_key = "#{redis_key}-jobs"
-        order = self.order || 'fifo'
-
-        job_json = case order.to_sym
-        when :fifo
-          redis.lpop(jobs_key)
-        when :lifo
-          redis.rpop(jobs_key)
-        when :random
-          redis.spop(jobs_key)
-        when :priority
-          redis.zpopmax(jobs_key)&.[](0)
-        end
-
-        return nil unless job_json.present?
-
-        ::ActiveJob::Arguments.deserialize(JSON.parse(job_json))[0]&.symbolize_keys
-      end
-
       def self.redis(&blk)
         Batch.redis &blk
       end

data/lib/canvas_sync/job_batches/pool_refill.lua

@@ -3,10 +3,17 @@ local poolkey = KEYS[1]
 local qkey = KEYS[2]
 local activekey = KEYS[3]
 
+local checkin_item = ARGV[1]
+
 if redis.call('EXISTS', poolkey) == 0 then
     return { -1, {} } -- pool doesn't exist
 end
 
+if checkin_item ~= "" then
+    redis.call("HDEL", activekey, checkin_item)
+    redis.call("HINCRBY", poolkey, "complete_count", 1)
+end
+
 local pool_type = redis.call('HGET', poolkey, "order")
 local allotment = tonumber(redis.call("HGET", poolkey, "concurrency"))
 local active = redis.call("HLEN", activekey) + (redis.call("HGET", poolkey, "_active_count") or 0)

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.19.0.beta8".freeze
+  VERSION = "0.19.0.beta10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.19.0.beta8
+  version: 0.19.0.beta10
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails