postjob 0.4.5 → 0.5.0

data/spec/postjob/job_control/max_attempts_spec.rb

@@ -10,9 +10,7 @@ module MaxAttemptWorkflow
   end
 
   def self.run(max_attempts)
-    set_workflow_status "starting up"
     await async ChildWorker, max_attempts: max_attempts
-    set_workflow_status "starting finished"
   end
 
   Postjob.register_workflow self

data/spec/postjob/queue/search_spec.rb

@@ -2,16 +2,11 @@ require "spec_helper"
 
 module SearchWorkflow
   def self.run
-    set_workflow_status "starting-up"
-
     job = async :manual, timeout: 10
-    set_workflow_status "created-manual"
 
     _token = workflow_token job
-    set_workflow_status "created-manual-token"
 
     manual_result = await job
-    set_workflow_status "got-manual-token"
 
     "manual-result:#{manual_result}"
   end
@@ -39,7 +34,6 @@ describe "Postjob::Queue.search" do
         :id,
         :full_id,
         :job,
-        :workflow_status,
         :status,
         :error,
         :result,
@@ -74,14 +68,6 @@ describe "Postjob::Queue.search" do
       result = Simple::SQL.all(scope, into: OpenStruct)
       expect(result.length).to eq(2)
     end
-
-    it "sorts by id" do
-      scope = Postjob::Queue.search
-      result = Simple::SQL.all(scope, into: OpenStruct)
-
-      # Note that the second job has a id larger than the original job's id.
-      expect(result.first.id).to eq(id)
-    end
   end
 
   describe "filtering" do

data/spec/postjob/worker_session_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe "Postjob::WorkerSession.start!" do
+  let(:store_path) { ".postjob.host_id" }
+
+  def session_count
+    Simple::SQL.ask "SELECT count(*) from postjob.worker_sessions"
+  end
+
+  let(:workflows_with_versions) { %w(Foo Foo@0) }
+
+  it "creates a new session" do
+    expect do
+      session = Postjob::WorkerSession.start!(workflows_with_versions)
+      expect(session.id).to match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i)
+    end.to change { session_count }.by(1)
+  end
+
+  it "stores and reuses the host_id" do
+    FileUtils.rm_rf store_path
+
+    session = Postjob::WorkerSession.start!(workflows_with_versions)
+    expect(File.read(store_path)).to match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i)
+
+    session2 = Postjob::WorkerSession.start!(workflows_with_versions)
+    expect(session2.host_id).to eq(session.host_id)
+  end
+
+  context "when passing in an invalid host id" do
+    it "raises an argument error" do
+      invalid_uuid = "foo"
+      File.open store_path, "w" do |io|
+        io.write invalid_uuid
+      end
+
+      expect do
+        Postjob::WorkerSession.start!(workflows_with_versions)
+      end.to raise_error(ArgumentError)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -24,6 +24,11 @@ Simple::SQL.logger = Postjob.logger = logger
 require "./spec/support/configure_database"
 require "./spec/support/test_helper"
 
+if ENV["VERBOSE"]
+  logger = Logger.new(STDERR)
+  Simple::SQL.logger = Postjob.logger = logger
+end
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: (ENV["CI"] != "true")
@@ -33,4 +38,8 @@ RSpec.configure do |config|
 
   config.before(:all) {}
   config.after {}
+
+  config.before(:all) do
+    FileUtils.rm_rf ::Postjob::WorkerSession::HOST_ID_STORE
+  end
 end

data/spec/support/test_helper.rb

@@ -24,10 +24,20 @@ module TestHelper
     Simple::SQL.ask "SELECT token FROM tokens WHERE postjob_id=$1", job.id
   end
 
+  def resolve_all
+    query = "SELECT id FROM postjob.postjobs WHERE status NOT IN ('ok', 'failed', 'timeout')"
+
+    loop do
+      break unless Simple::SQL.ask(query)
+      Postjob.process_all
+      sleep 0.05
+    end
+  end
+
   def print_sql(sql, *args)
     require "table_print"
 
-    records = Simple::SQL.all(sql, *args)
+    records = Simple::SQL.all(sql, *args, into: Hash)
     tp records
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -194,6 +194,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: vmstat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: restartable, asynchronous, and distributed processes
 email:
 - radiospiel@open-lab.org
@@ -207,9 +227,13 @@ files:
 - lib/postjob.rb
 - lib/postjob/cli.rb
 - lib/postjob/cli/db.rb
+- lib/postjob/cli/events.rb
+- lib/postjob/cli/heartbeat.rb
+- lib/postjob/cli/hosts.rb
 - lib/postjob/cli/job.rb
 - lib/postjob/cli/ps.rb
 - lib/postjob/cli/run.rb
+- lib/postjob/cli/sessions.rb
 - lib/postjob/cli/version.rb
 - lib/postjob/error.rb
 - lib/postjob/job.rb
@@ -227,26 +251,42 @@ files:
 - lib/postjob/migrations/008a_childjobs.sql
 - lib/postjob/migrations/009_tokens.sql
 - lib/postjob/migrations/010_settings.sql
+- lib/postjob/migrations/011_null_uuid.sql
+- lib/postjob/migrations/012_hosts.sql
+- lib/postjob/migrations/013_worker_sessions.sql
+- lib/postjob/migrations/014_postjob_session_id.sql
+- lib/postjob/migrations/015_events.sql
+- lib/postjob/migrations/016_sessions_functions.sql
+- lib/postjob/migrations/017_zombie_check.sql
+- lib/postjob/migrations/018_heartbeat.sql
+- lib/postjob/migrations/019_heartbeat_indices.sql
 - lib/postjob/queue.rb
 - lib/postjob/queue/encoder.rb
 - lib/postjob/queue/notifications.rb
 - lib/postjob/queue/search.rb
 - lib/postjob/queue/settings.rb
+- lib/postjob/record.rb
 - lib/postjob/registry.rb
 - lib/postjob/runner.rb
+- lib/postjob/worker_session.rb
 - lib/postjob/workflow.rb
+- lib/tools/atomic_store.rb
+- lib/tools/heartbeat.rb
+- lib/tools/history.rb
 - spec/postjob/enqueue_spec.rb
+- spec/postjob/events/heartbeat_event_spec.rb
+- spec/postjob/events/job_event_spec.rb
 - spec/postjob/full_workflow_spec.rb
 - spec/postjob/job_control/error_status_spec.rb
 - spec/postjob/job_control/manual_spec.rb
 - spec/postjob/job_control/max_attempts_spec.rb
 - spec/postjob/job_control/timeout_spec.rb
-- spec/postjob/job_control/workflow_status_spec.rb
 - spec/postjob/process_job_spec.rb
 - spec/postjob/queue/encoder_spec.rb
 - spec/postjob/queue/search_spec.rb
 - spec/postjob/run_spec.rb
 - spec/postjob/step_spec.rb
+- spec/postjob/worker_session_spec.rb
 - spec/postjob/workflows/child_workflow_spec.rb
 - spec/spec_helper.rb
 - spec/support/configure_active_record.rb

data/spec/postjob/job_control/workflow_status_spec.rb

@@ -1,52 +0,0 @@
-require "spec_helper"
-
-module WorkflowStatusWorkflow
-  def self.run
-    set_workflow_status "starting-up"
-
-    job = async :manual, timeout: 10
-    set_workflow_status "created-manual"
-
-    _token = workflow_token job
-    set_workflow_status "created-manual-token"
-
-    manual_result = await job
-    set_workflow_status "got-manual-token"
-
-    "manual-result:#{manual_result}"
-  end
-
-  Postjob.register_workflow self
-end
-
-describe "workflow_status" do
-  let!(:id) { Postjob.enqueue! "WorkflowStatusWorkflow" }
-
-  include TestHelper
-
-  before do
-    Postjob.process_all
-  end
-
-  def load_child_job
-    TestHelper.load_job "SELECT * FROM postjobs WHERE parent_id=$1", id
-  end
-
-  def token
-    load_token(load_child_job)
-  end
-
-  it "creates a token" do
-    expect! token => /[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[a-fA-F0-9]{4}-[A-F0-9]{12}/i
-  end
-
-  it "the token can be used to resolve the load_child_job" do
-    Postjob.resolve token: token, result: "foobar"
-    expect(load_child_job.status).to eq("ok")
-    expect(load_job(id).workflow_status).to eq("created-manual-token")
-
-    Postjob.process_all
-    expect(load_job(id).status).to eq("ok")
-    expect(load_job(id).workflow_status).to eq("got-manual-token")
-  end
-end