canvas_sync 0.19.0.beta1 → 0.19.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2a5e403bcaaaaf0fcbab739a2b9b6657ed42a5a5692de0b9d6a84e429d2a232
-  data.tar.gz: acef06fb5cae9aa20d70e308972d9416fd8280ddb3c944718ef937679ac468b5
+  metadata.gz: 2d6b617272cdcd0d707dcf732e93b537aba165054ea8c3c2ddf9eb85f141b75b
+  data.tar.gz: 836afc2cca6c11d8917188c7cb68853c23455a450c983a738f4c21c7382e5280
 SHA512:
-  metadata.gz: 91ed4f8c3312c398ee9bb19cad4333ddda8f738330470d4582c1c92ff00abeef12e52ff344a94edc50a726616c2533126c99b211da1a348cd18d5062a6939e40
-  data.tar.gz: a95413c17cc1029fd5c8adb6fbd19add7a0d18fda2c8c790f71bbc57df8b51223c1a554120dd93bbedc61223c60a7f549849d1686358fe9e357af5bf20467eb1
+  metadata.gz: b33944c8079dc4315c71afe6998c79e83d12fa476223c81a943a75025e0faca50e4cde96a68a195d90cb66d674303666992a9f75de840ee00e0bce3beba75ba7
+  data.tar.gz: 931b2cc7992a8069c152cf3651544a6600603a45bb25baa3a8679011fd0c809726054d203da41cf558aa685f88e31b152f78ee78c535e40c2f487c4d0fa65746

data/lib/canvas_sync/concerns/account/base.rb

@@ -0,0 +1,15 @@
+module CanvasSync::Concerns
+  module Account
+    module Base
+      extend ActiveSupport::Concern
+
+      CanvasSync::Record.define_feature self, default: true
+
+      class_methods do
+        def root_account
+          where(canvas_parent_account_id: nil).last
+        end
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module CanvasSync
               r.hset("MNGBID-#{man_batch_id}", "root_bid", root_batch.bid)
               r.hset("MNGBID-#{man_batch_id}", "ordered", ordered ? 1 : 0)
               r.hset("MNGBID-#{man_batch_id}", "concurrency", concurrency)
-              r.hset("MNGBID-#{man_batch_id}", "preflight_check", preflight_check)
+              r.hset("MNGBID-#{man_batch_id}", "preflight_check", preflight_check) if preflight_check.present?
               r.expire("MNGBID-#{man_batch_id}", Batch::BID_EXPIRE_TTL)
 
               mapped_sub_jobs = sub_jobs.each_with_index.map do |j, i|

data/lib/canvas_sync/job_batches/pool.rb

@@ -9,6 +9,7 @@ module CanvasSync
       redis_attr :description
       redis_attr :created_at
       redis_attr :concurrency, :int
+      redis_attr :complete_count, :int
       redis_attr :order
       redis_attr :on_failed_job, :symbol
       redis_attr :clean_when_empty, :bool
@@ -88,7 +89,7 @@ module CanvasSync
         self.order
 
         activec, pactivec, pendingc, clean_when_empty, keep_open = redis.multi do |r|
-          r.scard("#{redis_key}-active")
+          r.hlen("#{redis_key}-active")
           r.hincrby(redis_key, "_active_count", 0)
           pending_count(r)
           r.hget(redis_key, 'clean_when_empty')
@@ -103,7 +104,7 @@ module CanvasSync
       end
 
       def active_count(r = redis)
-        r.scard("#{redis_key}-active") + r.hincrby(redis_key, "_active_count", 0)
+        r.hlen("#{redis_key}-active") + r.hincrby(redis_key, "_active_count", 0)
       end
 
       def pending_count(r = redis)
@@ -120,7 +121,8 @@ module CanvasSync
       end
 
       def job_checked_in(status, options)
-        redis.srem("#{redis_key}-active", status.bid)
+        redis.hdel("#{redis_key}-active", status.bid)
+        redis.hincrby(redis_key, "complete_count", 1)
         active_count = refill_allotment
         cleanup_if_empty unless active_count > 0
       end
@@ -150,7 +152,7 @@ module CanvasSync
 
         pending_job_descs = job_descs.dup
 
-        added_jobs = []
+        added_jobs = {}
         failed_to_add_jobs = []
         add_exception = nil
 
@@ -165,7 +167,7 @@ module CanvasSync
               ChainBuilder.enqueue_job(job_desc)
             end
 
-            added_jobs << wbid
+            added_jobs[wbid] = job_json
           rescue => ex
             failed_to_add_jobs << job_json
             add_exception = ex
@@ -173,7 +175,7 @@ module CanvasSync
         end
 
         redis.multi do |r|
-          r.sadd("#{redis_key}-active", added_jobs) if added_jobs.count > 0
+          r.mapped_hmset("#{redis_key}-active", added_jobs) if added_jobs.count > 0
           # Release reserved slots now that we've added the jobs to `-active`
           r.hincrby(redis_key, "_active_count", -job_descs.count)
 

data/lib/canvas_sync/job_batches/pool_refill.lua

@@ -9,7 +9,7 @@ end
 
 local pool_type = redis.call('HGET', poolkey, "order")
 local allotment = tonumber(redis.call("HGET", poolkey, "concurrency"))
-local active = redis.call("SCARD", activekey) + (redis.call("HGET", poolkey, "_active_count") or 0)
+local active = redis.call("HLEN", activekey) + (redis.call("HGET", poolkey, "_active_count") or 0)
 
 local pop_count = allotment - active
 

data/lib/canvas_sync/job_batches/sidekiq/web/views/pool.erb

@@ -31,14 +31,57 @@
                 <th scope=row><%= t('Pending Tasks') %></td>
                 <td><%= @pool.pending_count %></td>
             </tr>
+            <tr>
+                <th scope=row><%= t('Returned Tasks') %></td>
+                <td><%= @pool.complete_count %></td>
+            </tr>
         </tbody>
     </table>
 </div>
 
+<%# Queued/Active Tasks %>
+<header class="row">
+    <div class="col-sm-5">
+        <h3>
+            <%= t('Queued/Active Tasks') %>
+        </h3>
+    </div>
+</header>
+
+<% if @active_tasks.any? %>
+<div class="table_container">
+    <table class="table table-striped table-bordered table-hover">
+        <thead>
+            <tr>
+                <th><%= t('Wrapper Batch BID') %></th>
+                <th><%= t('Job Class') %></th>
+                <th><%= t('Parameters') %></th>
+            </tr>
+        </thead>
+
+        <% @active_tasks.each do |job_desc| %>
+            <tr>
+                <td><a href="<%= root_path %>batches/<%= job_desc['pool_wrapper_batch'] %>"><%= job_desc['pool_wrapper_batch'] %></a></td>
+                <td><%= job_desc['job'] %></td>
+                <td>
+                    <code class="code-wrap">
+                        <div class="args-extended">
+                            <%= job_desc['args']&.to_json %>
+                            <%= job_desc['kwargs']&.to_json %>
+                        </div>
+                    </code>
+                </td>
+            </tr>
+        <% end %>
+    </table>
+</div>
+<% end %>
+
+<%# Pending Tasks %>
 <header class="row">
     <div class="col-sm-5">
         <h3>
-            <%= t('Tasks') %>
+            <%= t('Pending Tasks') %>
         </h3>
     </div>
     <%

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

@@ -166,6 +166,8 @@ module CanvasSync::JobBatches::Sidekiq
         @pid = params[:pid]
         @pool = CanvasSync::JobBatches::Pool.new(@pid)
 
+        @active_tasks = @pool.redis.hvals("#{@pool.redis_key}-active").map {|desc, score=nil| JSON.parse(desc) }
+
         @count = (params['count'] || 25).to_i
         @current_jobs_page, @total_jobs_size, @jobs = page("POOLID-#{@pool.pid}-jobs", params['job_page'], @count)
         @jobs = @jobs.map {|desc, score=nil| JSON.parse(desc)[0] }

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.19.0.beta1".freeze
+  VERSION = "0.19.0.beta3".freeze
 end