canvas_sync 0.17.28 → 0.17.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8359f6a5054489357a480d15019981f0ade50a145f714bcbd2274c6570689316
-  data.tar.gz: c98c3d8ecda4291e162e31d7c4dfdf9ddff65763f0bb7c345006585f53894cf4
+  metadata.gz: '09cebb9b63254bcdf9e96ae0133d882fcf800ad405f6d53080793e8f3f0c052f'
+  data.tar.gz: 40d27ea858ac931d006ccbab54f7ee1b725166ad3fec4ecb369f6e3f0fa611f1
 SHA512:
-  metadata.gz: 4ce90338e8e3751fd5767a09eaaf89e733532ffa59df5569bf908930929f34d5167bc01e2637a5eef6ba5ef515c2e6410cc17ce757542b4d0620bb08bd03fd38
-  data.tar.gz: e4456ad37bbf87b63a495d041f038ad6ece797b59c11d19cd7028a030aef452281105f2c53ab56bef3b4cf515f838366874b56838c87936d113c3cacf5570771
+  metadata.gz: de38e11de998bef7cca15c875d63b29984d2cdf4dd90436854484e5686c5aca4eb249fd864e24b66d532afcba63b3f7ddb62c5e5abf55d1e2c621fa6cb566af7
+  data.tar.gz: 8493bc7a6f100da697840f65aeaceacbacc95c224aa53c66129e19d5a88d61b1f59202252ac80b2e8d42fc4661f974b30bd1825b448e58b477ce9e33f71a9f2c

data/lib/canvas_sync/job_batches/batch.rb

@@ -242,7 +242,7 @@ module CanvasSync
           _, pending, failed, children, complete, parent_bid = redis do |r|
             return unless r.exists?("BID-#{bid}")
 
-            r.multi do
+            r.multi do |r|
               r.sadd("BID-#{bid}-failed", jid)
 
               r.hincrby("BID-#{bid}", "pending", 0)
@@ -260,29 +260,19 @@ module CanvasSync
           end
         end
 
+        # Dead jobs are a Sidekiq feature.
+        # If this is called for a job, process_failed_job was also called
         def process_dead_job(bid, jid)
-          _, failed, children, complete, parent_bid = redis do |r|
+          _, dead_count = redis do |r|
             return unless r.exists?("BID-#{bid}")
 
-            r.multi do
+            r.multi do |r|
               r.sadd("BID-#{bid}-dead", jid)
-
               r.scard("BID-#{bid}-dead")
-              r.hincrby("BID-#{bid}", "children", 0)
-              r.scard("BID-#{bid}-batches-complete")
-              r.hget("BID-#{bid}", "parent_bid")
-
               r.expire("BID-#{bid}-dead", BID_EXPIRE_TTL)
             end
           end
 
-          if parent_bid
-            redis.multi do
-              r.sadd("BID-#{parent_bid}-dead", jid)
-              r.expire("BID-#{parent_bid}-dead", BID_EXPIRE_TTL)
-            end
-          end
-
           enqueue_callbacks(:death, bid)
         end
 
@@ -290,7 +280,7 @@ module CanvasSync
           _, failed, pending, children, complete, success, parent_bid, keep_open = redis do |r|
             return unless r.exists?("BID-#{bid}")
 
-            r.multi do
+            r.multi do |r|
               r.srem("BID-#{bid}-failed", jid)
 
               r.scard("BID-#{bid}-failed")
@@ -323,7 +313,7 @@ module CanvasSync
             return unless r.exists?(batch_key)
             return if r.hget(batch_key, 'keep_open') == 'true'
 
-            r.multi do
+            r.multi do |r|
               r.smembers(callback_key)
               r.hget(batch_key, "callback_queue")
               r.hget(batch_key, "parent_bid")
@@ -442,12 +432,8 @@ module CanvasSync
       class RedisProxy
         def multi(*args, &block)
           Batch.redis do |r|
-            if block.arity == 1
-              r.multi(*args) do
-                block.call(r)
-              end
-            else
-              r.multi(*args, &block)
+            r.multi(*args) do |r|
+              block.call(r)
             end
           end
         end

data/lib/canvas_sync/job_batches/callback.rb

@@ -69,7 +69,7 @@ module CanvasSync
                 # This is a callback for a callback. In this case we need to check if we should cleanup the original bid.
                 origin_bid = opts['origin']['for_bid']
                 _, pending, success_ran = Batch.redis do |r|
-                  r.multi do
+                  r.multi do |r|
                     r.srem("BID-#{origin_bid}-pending_callbacks", opts['origin']['event'])
                     r.scard("BID-#{origin_bid}-pending_callbacks")
                     r.hget("BID-#{origin_bid}", "success")
@@ -88,7 +88,7 @@ module CanvasSync
             return unless parent_bid
 
             _, _, success, _, _, complete, pending, children, success, failure = Batch.redis do |r|
-              r.multi do
+              r.multi do |r|
                 r.sadd("BID-#{parent_bid}-batches-success", bid)
                 r.expire("BID-#{parent_bid}-batches-success", Batch::BID_EXPIRE_TTL)
                 r.scard("BID-#{parent_bid}-batches-success")
@@ -116,7 +116,7 @@ module CanvasSync
 
           def complete(bid, status, parent_bid)
             pending, children, success = Batch.redis do |r|
-              r.multi do
+              r.multi do |r|
                 r.hincrby("BID-#{bid}", "pending", 0)
                 r.hincrby("BID-#{bid}", "children", 0)
                 r.scard("BID-#{bid}-batches-success")
@@ -131,7 +131,7 @@ module CanvasSync
 
               Batch.logger.debug {"Finalize parent complete bid: #{parent_bid}"}
               _, _, complete, pending, children, failure = Batch.redis do |r|
-                r.multi do
+                r.multi do |r|
                   r.sadd("BID-#{parent_bid}-batches-complete", bid)
                   r.sadd("BID-#{parent_bid}-batches-failed", bid)
                   r.scard("BID-#{parent_bid}-batches-complete")

data/lib/canvas_sync/job_batches/context_hash.rb

@@ -127,7 +127,7 @@ module CanvasSync
         return @hash_map[bid] if @hash_map.key?(bid)
 
         context_json, editable = Batch.redis do |r|
-          r.multi do
+          r.multi do |r|
             r.hget("BID-#{bid}", "context")
             r.hget("BID-#{bid}", "allow_context_changes")
           end

data/lib/canvas_sync/job_batches/jobs/managed_batch_job.rb

@@ -18,7 +18,7 @@ module CanvasSync
           man_batch_id = SecureRandom.urlsafe_base64(10)
 
           Batch.redis do |r|
-            r.multi do
+            r.multi do |r|
               r.hset("MNGBID-#{man_batch_id}", "root_bid", root_batch.bid)
               r.hset("MNGBID-#{man_batch_id}", "ordered", ordered)
               r.hset("MNGBID-#{man_batch_id}", "concurrency", concurrency)
@@ -87,7 +87,7 @@ module CanvasSync
 
       def self.perform_next_sequence_job(man_batch_id)
         root_bid, ordered = Batch.redis do |r|
-          r.multi do
+          r.multi do |r|
             r.hget("MNGBID-#{man_batch_id}", "root_bid")
             r.hget("MNGBID-#{man_batch_id}", "ordered")
           end

data/lib/canvas_sync/job_batches/pool.rb

@@ -94,16 +94,16 @@ module CanvasSync
         redis.hincrby(redis_key, "active_count", 0)
       end
 
-      def pending_count
+      def pending_count(r = redis)
         jobs_key = "#{redis_key}-jobs"
         order = self.order || 'fifo'
         case order.to_sym
         when :fifo, :lifo
-          redis.llen(jobs_key)
+          r.llen(jobs_key)
         when :random
-          redis.scard(jobs_key)
+          r.scard(jobs_key)
         when :priority
-          redis.zcard(jobs_key)
+          r.zcard(jobs_key)
         end
       end
 
@@ -114,9 +114,9 @@ module CanvasSync
           # Make sure this is loaded outside of the pipeline
           self.order
 
-          redis.multi do
+          redis.multi do |r|
             r.hincrby(redis_key, "active_count", -1)
-            self.pending_count
+            self.pending_count(r)
           end
         end
 

data/lib/canvas_sync/job_batches/redis_model.rb

@@ -40,7 +40,7 @@ module CanvasSync
       def persist_bid_attr(attribute, value)
         if @initialized || @existing
           redis do |r|
-            r.multi do
+            r.multi do |r|
               r.hset(redis_key, attribute, value)
               r.expire(redis_key, Batch::BID_EXPIRE_TTL)
             end

data/lib/canvas_sync/job_batches/sidekiq/web/helpers.rb

@@ -13,7 +13,7 @@ module CanvasSync::JobBatches::Sidekiq
 
       def drain_zset(key)
         items, _ = Batch.redis do |r|
-          r.multi do
+          r.multi do |r|
             r.zrange(key, 0, -1)
             r.zremrangebyrank(key, 0, -1)
           end

data/lib/canvas_sync/jobs/sync_submissions_job.rb

@@ -10,7 +10,7 @@ module CanvasSync
       def perform(options)
         super(
           "proserv_student_submissions_csv",
-          merge_report_params(options, { include_all: options[:include_all] }, {}),
+          merge_report_params(options, { include_all: options[:include_all], enrollment_batch_size: options[:enrollment_batch_size] }, {}),
           CanvasSync::Processors::SubmissionsProcessor.to_s,
           {},
         )

data/lib/canvas_sync/jobs/term_batches_job.rb

@@ -20,9 +20,9 @@ module CanvasSync
               end
 
               JobBatches::ManagedBatchJob.make_batch(jobs, ordered: false, concurrency: true) do |b|
-                b.description = "TermBatchJob(#{term.canvas_id}) Root"
+                b.description = "TermBatchJob(#{term_id}) Root"
                 b.context = local_context
-                b.on(:success, "#{self.class.to_s}.batch_finished")
+                b.on(:success, "#{self.class.to_s}.batch_finished") unless options[:mark_synced] == false
               end
             end
           else

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.28".freeze
+  VERSION = "0.17.31".freeze
 end

data/spec/canvas_sync/jobs/sync_submissions_job_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe CanvasSync::Jobs::SyncSubmissionsJob do
     context "a term id is in the global_options" do
       it "enqueues a ReportStarter for the proserv_student_submissions_csv for the given term" do
         expect_any_instance_of(Bearcat::Client).to receive(:start_report)
-          .with("self", "proserv_student_submissions_csv", { parameters: { enrollment_term_id: 1, include_all: nil } })
+          .with("self", "proserv_student_submissions_csv", { parameters: { enrollment_term_id: 1, include_all: nil, enrollment_batch_size: nil } })
           .and_return("id" => 1)
 
         expect(CanvasSync::Jobs::ReportChecker).to receive(:set).and_call_original