inst-jobs-autoscaling 1.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d0b7c3c7f779fd8894005be7bd7f10c578f4dce8
-  data.tar.gz: 8dada72cd700f7c40757d7e04c25debb5aea2ba0
+SHA256:
+  metadata.gz: 87f20f127af82c15a5b2c5bb1059a114f94122657d3b704135240727db16eb88
+  data.tar.gz: fcd7b86ad921f6729c706200f6a689b19a193ffa669ef843aea693d5d536e701
 SHA512:
-  metadata.gz: 97715509cd162cc0ab4f079d318d2b65589b8aecf188b9f0158d976e897a136243633e0a69c66bebc9d574ba621648268bd949036e5e21f0cb4c03f6ca2114ca
-  data.tar.gz: 9fabea2139de143d6d796a866fa27c593bc78d56785e2ea97f4b097a790e54022932f1973b458dfb3cc85f84bd109ad35a2077f7303268175c31924de81a80d5
+  metadata.gz: 3f8719c7858ae7b91baeff6fe13e35769dd218a79766fcccfd6fe95d45dc5fbd0903a541f76149e64056751d9be4556a8d774ca9963d9a122d18b446dc9fdb3e
+  data.tar.gz: 82c35b987576548f5b7cc9f650840bf51fcd9c0ca1b0078abd9cd17abe511bb708bdcf494f21ebb33146b8dbd3d2f20887d31c96de11fae7220ea652574d8e0e

data/Dockerfile

@@ -1,11 +1,10 @@
-FROM instructure/ruby:2.4
-
-ADD Gemfile* *.gemspec /usr/src/app/
-ADD lib/jobs_autoscaling/version.rb /usr/src/app/lib/jobs_autoscaling/
-USER root
-RUN bundle install
-ADD . /usr/src/app/
-RUN chown -R docker:docker /usr/src/app
-USER docker
+FROM instructure/ruby:2.6
+
+COPY --chown=docker:docker Gemfile* *.gemspec /usr/src/app/
+COPY --chown=docker:docker lib/jobs_autoscaling/version.rb /usr/src/app/lib/jobs_autoscaling/
+
+RUN bundle install -j 4
+
+COPY --chown=docker:docker . /usr/src/app/
 
 CMD ["rake"]

data/Jenkinsfile

@@ -0,0 +1,18 @@
+#! /usr/bin/env groovy
+
+pipeline {
+  agent { label 'docker' }
+
+  stages {
+    stage('Build') {
+      steps {
+        sh 'docker build -t inst-jobs-autoscaling .'
+      }
+    }
+    stage('Test') {
+      steps {
+        sh 'docker run --rm inst-jobs-autoscaling'
+      }
+    }
+  }
+}

data/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 
-docker-compose build
-docker-compose run --rm ci
+docker build -t inst-jobs-autoscaling .
+docker run --rm inst-jobs-autoscaling

data/inst-jobs-autoscaling.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "inst-jobs", ">= 0.13.5"
+  spec.add_dependency "inst-jobs", "> 1.0", "< 3.0"
   spec.add_dependency "aws-sdk-autoscaling"
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "bundler", "> 1.11", "< 3"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec", "~> 3.4.0"
 end

data/lib/jobs_autoscaling/aws_action.rb

@@ -6,9 +6,10 @@ module JobsAutoscaling
   class AwsAction
     attr_reader :asg_name, :client
 
-    def initialize(asg_name:, aws_config: {})
+    def initialize(asg_name:, aws_config: {}, instance_id: nil)
       @asg_name = asg_name
       @client = Aws::AutoScaling::Client.new(aws_config.reverse_merge(retry_limit: 10))
+      @instance_id = instance_id
     end
 
     def idle

data/lib/jobs_autoscaling/monitor.rb

@@ -6,22 +6,36 @@ module JobsAutoscaling
     BUSY = :busy
 
     def initialize(action: )
-      @action = action
+      @actions = Array(action)
     end
 
     def activate!
-      Delayed::Worker.lifecycle.after(:work_queue_pop, &method(:work_queue_pop))
-      change_state(IDLE)
+      Delayed::Worker.lifecycle.after(:check_for_work, &method(:check_for_work))
+      load_preexisting_jobs
+      change_state(preexisting_jobs_running? ? BUSY : IDLE)
     end
 
     protected
 
-    def work_queue_pop(work_queue, _worker_config)
-      unless work_queue.respond_to?(:all_workers_idle?)
-        return
+    def load_preexisting_jobs
+      @process_mtime_map = {}
+      Delayed::Job.processes_locked_locally.each do |pid|
+        mtime = Delayed::Worker::ProcessHelper.mtime(pid)
+        @process_mtime_map[pid] = mtime if mtime
       end
+    end
 
-      new_state = work_queue.all_workers_idle? ? IDLE : BUSY
+    def preexisting_jobs_running?
+      @process_mtime_map.each do |pid, mtime|
+        unless Delayed::Worker::ProcessHelper.process_is_still_running?(pid, mtime)
+          @process_mtime_map.delete(pid)
+        end
+      end
+      @process_mtime_map.any?
+    end
+
+    def check_for_work(work_queue)
+      new_state = work_queue.all_workers_idle? && !preexisting_jobs_running? ? IDLE : BUSY
       if new_state != @worker_state
         change_state(new_state)
       end
@@ -29,7 +43,9 @@ module JobsAutoscaling
 
     def change_state(new_state)
       @worker_state = new_state
-      @action.public_send(new_state)
+      @actions.each do |action|
+        action.public_send(new_state)
+      end
     end
   end
 end

data/lib/jobs_autoscaling/version.rb

@@ -1,3 +1,3 @@
 module JobsAutoscaling
-  VERSION = "1.0.2"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-autoscaling
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Brian Palmer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.5
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +48,36 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -105,13 +117,13 @@ files:
 - ".rspec"
 - Dockerfile
 - Gemfile
+- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - build.sh
-- docker-compose.yml
 - inst-jobs-autoscaling.gemspec
 - lib/jobs_autoscaling.rb
 - lib/jobs_autoscaling/aws_action.rb
@@ -137,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AWS ASG autoscaling for inst-jobs

data/docker-compose.yml

@@ -1,2 +0,0 @@
-ci:
-  build: .