cellect-server 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1efbe81e4f9f98a1badc9aea8141532d0ecfda51
-  data.tar.gz: 52905f8f3f68771afeb1067dec99ad197644735f
+  metadata.gz: 74908885c875bf40e8557678c00d26c9cc53d8a2
+  data.tar.gz: 6710bfad63345a08390a2a98a5ea2a84d5ce9966
 SHA512:
-  metadata.gz: 177f11e20220a38821d3f9385e064687f605f5a3dc86129529083f573c9d23c78c58d2ba07601250cf8b198ac464f1da36d4fb6138b2895dc68b00ed0b8a87bf
-  data.tar.gz: 469c823c50b7166c72d85c97dfa542400ec0c09e32720e1c232a0034011c3f5bc582d5b965166466da978276adaa1308e8ce16147e3a6d840405713366adb866
+  metadata.gz: ebe51236bc8f2077127a20265ed0aba6dbbb980ea37b72cf0e82a1653caefa4f7477596319eb187a08ad78be6b48f3612dd5f11665db6313b2745f61eadf1f1f
+  data.tar.gz: 86ad844b31e3c21d45d4c9881499bdaf53db5c7452f2abde3f721bfbf7380b073d003a0e160ba6d8ca989ece79a07609c34a06f6d12678971795ab92da798802

data/lib/cellect/node_set.rb

@@ -16,10 +16,8 @@ module Cellect
 
     # Connect to ZooKeeper, setup this node, and change state
     def initialize_zk
-      begin
-        Timeout::timeout(timeout_duration) do
-          self.zk = ZK.new zk_url, chroot: '/cellect'
-        end
+      Timeout::timeout(timeout_duration) do
+        self.zk = ZK.new zk_url, chroot: '/cellect'
       end
       setup
       self.state = :ready

data/lib/cellect/server/adapters/default.rb

@@ -34,6 +34,11 @@ module Cellect
           raise NotImplementedError
         end
 
+        # Report adapter status as a Hash
+        def status
+          { }
+        end
+
         def load_workflows(*names)
           workflow_list(*names).each{ |workflow_info| load_workflow workflow_info }
         end

data/lib/cellect/server/adapters/postgres.rb

@@ -65,6 +65,12 @@ module Cellect
           end
         end
 
+        def status
+          {
+            connected: pg.status == PG::CONNECTION_OK
+          }
+        end
+
         def with_pg
           @pg.with{ |pg| yield pg }
         end

data/lib/cellect/server/api.rb

@@ -13,13 +13,19 @@ module Cellect
       # 
       # Provides system load information
       get :stats do
+        node_set = Cellect::Server.node_set.actors.first
         usage = ->(keyword) do
           `ps axo #{ keyword }`.chomp.split("\n")[1..-1].collect(&:to_f).inject :+
         end
 
         {
           memory: usage.call('%mem'),
-          cpu: usage.call('%cpu')
+          cpu: usage.call('%cpu'),
+          node_set: { id: node_set.id, ready: node_set.ready? },
+          status: Cellect::Server.adapter.status.merge({
+            workflows_ready: Cellect::Server.ready?,
+            workflows: Workflow.all.map(&:status)
+          })
         }
       end
 

data/lib/cellect/server/workflow.rb

@@ -3,6 +3,11 @@ module Cellect
     class Workflow
       include Celluloid
 
+      class << self
+        attr_accessor :workflow_names
+      end
+      self.workflow_names = { }
+
       attr_accessor :name, :users, :subjects, :state
       attr_accessor :pairwise, :prioritized
 
@@ -14,14 +19,14 @@ module Cellect
 
       # Load a workflow
       def self.[]=(name, opts)
+        Workflow.workflow_names[name] = true
         Actor[name] = supervise name, pairwise: opts['pairwise'], prioritized: opts['prioritized']
       end
 
       # The names of all workflows currently loaded
       def self.names
         actor_names = Celluloid.actor_system.registry.names.collect &:to_s
-        workflow_actors = actor_names.select{ |key| key =~ /^workflow_/ }
-        workflow_actors.collect{ |name| name.sub(/^workflow_/, '').to_sym }
+        actor_names.select{ |key| workflow_names[key] }
       end
 
       # All currently loaded workflows
@@ -146,6 +151,7 @@ module Cellect
       # General information about this workflow
       def status
         {
+          name: name,
           state: state,
           grouped: false,
           prioritized: prioritized,

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/server/api/add_seen_spec.rb

@@ -10,7 +10,7 @@ module Cellect::Server
           let(:workflow_type){ [grouping, set_type].compact.join '_' }
           let(:workflow){ Workflow[workflow_type] }
           let(:user){ workflow.user 123 }
-          before(:each){ pass_until workflow, is: :ready }
+          before(:each){ pass_until_state_of workflow, is: :ready }
 
           it 'should add seen subjects' do
             async_workflow = double

data/spec/server/api/add_spec.rb

@@ -10,7 +10,7 @@ module Cellect::Server
           let(:workflow_type){ [grouping, set_type].compact.join '_' }
           let(:workflow){ Workflow[workflow_type] }
           let(:user){ workflow.user 123 }
-          before(:each){ pass_until workflow, is: :ready }
+          before(:each){ pass_until_state_of workflow, is: :ready }
 
           let(:opts) do
             { subject_id: 123 }.tap do |h|

data/spec/server/api/remove_spec.rb

@@ -10,7 +10,7 @@ module Cellect::Server
           let(:workflow_type){ [grouping, set_type].compact.join '_' }
           let(:workflow){ Workflow[workflow_type] }
           let(:user){ workflow.user 123 }
-          before(:each){ pass_until workflow, is: :ready }
+          before(:each){ pass_until_state_of workflow, is: :ready }
 
           let(:opts) do
             { subject_id: 123 }.tap do |h|

data/spec/server/api/sample_spec.rb

@@ -10,7 +10,7 @@ module Cellect::Server
           let(:workflow_type){ [grouping, set_type].compact.join '_' }
           let(:workflow){ Workflow[workflow_type] }
           let(:user){ workflow.user 123 }
-          before(:each){ pass_until workflow, is: :ready }
+          before(:each){ pass_until_state_of workflow, is: :ready }
 
           it 'should sample without a user, limit, or group' do
             expect(workflow).to receive(:sample).with(limit: 5, user_id: nil, group_id: nil).and_call_original

data/spec/server/api/user_load_spec.rb

@@ -9,7 +9,7 @@ module Cellect::Server
         context "#{ grouping_type } #{ set_type }" do
           let(:workflow_type){ [grouping, set_type].compact.join '_' }
           let(:workflow){ Workflow[workflow_type] }
-          before(:each){ pass_until workflow, is: :ready }
+          before(:each){ pass_until_state_of workflow, is: :ready }
 
           it 'should load users' do
             async_workflow = double

data/spec/server/grouped_workflow_spec.rb

@@ -8,7 +8,7 @@ module Cellect::Server
         let(:workflow){ GroupedWorkflow[workflow_type] }
         let(:user){ workflow.user 123 }
         let(:set_klass){ workflow.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet }
-        before(:each){ pass_until workflow, is: :ready }
+        before(:each){ pass_until_state_of workflow, is: :ready }
 
         it 'should provide unseen from a random group for users' do
           workflow.groups = { }

data/spec/server/server_spec.rb

@@ -20,5 +20,55 @@ module Cellect::Server
         expect(default.workflow_for('name' => 'e', 'pairwise' => true, 'prioritized' => true)).to be_prioritized
       end
     end
+
+    describe '/stats' do
+      include_context 'API'
+
+      let(:response){ JSON.parse last_response.body }
+      let(:all_workflows) do
+        [].tap do |list|
+          { 'Ungrouped' => nil, 'Grouped' => 'grouped' }.each_pair do |grouping_type, grouping|
+            SET_TYPES.each do |set_type|
+              workflow_type = [grouping, set_type].compact.join '_'
+              list << Workflow[workflow_type]
+            end
+          end
+        end
+      end
+
+      before(:each) do
+        pass_until{ all_workflows.all? &:ready? }
+        get :stats
+      end
+
+      it 'should include information' do
+        expect(response.keys).to match_array %w(memory cpu node_set status)
+      end
+
+      context 'node_set' do
+        let(:node_set){ response['node_set'] }
+
+        it 'should include information' do
+          expect(node_set['id']).to eql 'node0000000000'
+          expect(node_set['ready']).to eql true
+        end
+      end
+
+      context 'status' do
+        let(:status){ response['status'] }
+
+        it 'should include the aggregate workflow status' do
+          expect(status['workflows_ready']).to eql true
+        end
+
+        context 'workflows' do
+          let(:workflows){ status['workflows'] }
+
+          it 'should include all workflow statuses' do
+            expect(workflows.length).to eql all_workflows.length
+          end
+        end
+      end
+    end
   end
 end

data/spec/server/workflow_spec.rb

@@ -12,7 +12,7 @@ module Cellect::Server
         it_behaves_like 'workflow', :workflow
         let(:workflow){ Workflow[workflow_type] }
         let(:user){ workflow.user 123 }
-        before(:each){ pass_until workflow, is: :ready }
+        before(:each){ pass_until_state_of workflow, is: :ready }
 
         it 'should provide unseen for users' do
           expect(workflow.subjects).to receive(:subtract).with user.seen, 3

data/spec/support/cellect_helper.rb

@@ -1,7 +1,16 @@
 require 'timeout'
 
 module CellectHelper
-  def pass_until(obj, is:)
+  def pass_until(&block)
+    Timeout::timeout(1) do
+      Thread.pass until block.call
+    end
+  rescue => e
+    puts "Timeout waiting for condition #{ block.inspect }"
+    raise e
+  end
+
+  def pass_until_state_of(obj, is:)
     Timeout::timeout(1) do
       Thread.pass until obj.state == is
     end

data/spec/support/shared_examples_for_node_set.rb

@@ -3,20 +3,20 @@ shared_examples_for 'node set' do
 
   it 'should connect to zoo keeper' do
     expect(node_set.zk).to be_nil
-    pass_until node_set, is: :ready
+    pass_until_state_of node_set, is: :ready
     expect(node_set.zk).to be_connected
   end
 
   it 'should know the connection state' do
     expect(node_set.state).to be :initializing
-    pass_until node_set, is: :ready
+    pass_until_state_of node_set, is: :ready
     expect(node_set).to be_ready
   end
 
   it 'should accept a connection string' do
     url_before = ENV['ZK_URL']
     begin
-      pass_until node_set, is: :ready
+      pass_until_state_of node_set, is: :ready
       ENV['ZK_URL'] = 'foobar'
       expect(node_set.send(:zk_url)).to eq 'foobar'
       ENV.delete 'ZK_URL'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler