inst-jobs-autoscaling 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc8dd7ba4037d208d291a2be9d529b6a4436c3c7
-  data.tar.gz: c7a8abd253467eb2701cd4393ee7500659de8732
+SHA256:
+  metadata.gz: 9f10b3037ff7449363423319ede4c85a5fca600551699019b90a6decf592899c
+  data.tar.gz: 6e561bff7304d8877f797a0d524b8541f44bf9d03f29b7b19283ed30132ef807
 SHA512:
-  metadata.gz: 9df6de93ac399adc18ab3ed51dc74eca036edffb981d8527349992bca68e99492ca9e1ea1e688de480cfb0707eed464caa1e97a3c5e78564be37e64d876d1573
-  data.tar.gz: 892755e7d6214b1e281499a9bc5649405c63da0001b4a4616f95b1f3549665f7181491f3d088d72dc16a7393824e0b6f553a00cbc47c88cf6ccf46d3e2049499
+  metadata.gz: f1854117c823ead59d8a4bb74c0ca19ce3704cace2df87896c76efa8fd1c776a114ca246f8dcca7b7f707e494bad76d12f52e02b3dd89760a95fc3b69a382aff
+  data.tar.gz: 453d524f3b2ad0c1b8a0d81d5e0db70e42c6ba55fdfee84db5164b53aa74302d42a40f84c1ad3340768480d3cb642725b3f7f68e0c2479c4bd2737653175baf4

data/Dockerfile

@@ -1,11 +1,10 @@
-FROM instructure/ruby:2.1
-
-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.11.0"
-  spec.add_dependency "aws-sdk", ">= 2.0"
+  spec.add_dependency "inst-jobs", "~> 1.0"
+  spec.add_dependency "aws-sdk-autoscaling"
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.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.rb

@@ -1,5 +1,3 @@
-require 'aws-sdk'
-
 require "jobs_autoscaling/version"
 require "jobs_autoscaling/monitor"
 require "jobs_autoscaling/aws_action"

data/lib/jobs_autoscaling/aws_action.rb

@@ -1,3 +1,4 @@
+require 'aws-sdk-autoscaling'
 require 'net/http'
 require 'uri'
 
@@ -5,9 +6,10 @@ module JobsAutoscaling
   class AwsAction
     attr_reader :asg_name, :client
 
-    def initialize(asg_name:)
+    def initialize(asg_name:, aws_config: {}, instance_id: nil)
       @asg_name = asg_name
-      @client = Aws::AutoScaling::Client.new(retry_limit: 10)
+      @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

@@ -5,23 +5,37 @@ module JobsAutoscaling
     IDLE = :idle
     BUSY = :busy
 
-    def initialize(action: action)
-      @action = action
+    def initialize(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)
-      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.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs-autoscaling
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Palmer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-autoscaling
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   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: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +100,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
-description: 
+description:
 email:
 - brianp@instructure.com
 executables: []
@@ -105,13 +111,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
@@ -122,7 +128,7 @@ homepage: https://github.com/instructure/inst-jobs-autoscaling
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,10 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: AWS ASG autoscaling for inst-jobs
 test_files: []
-has_rdoc: 

data/docker-compose.yml

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