Merge pull request #204 from 3pillarlabs/develop

Merge PR #202

Author: sayantam

.codeclimate.yml

@@ -18,5 +18,6 @@ exclude_patterns:
   - 'hailstorm-web-client/src/index.tsx'
   - 'hailstorm-web-client/src/serviceWorker.ts'
   - 'hailstorm-web-client/**/*.test.*'
+  - 'hailstorm-web-client/e2e/features/step-definitions/*.steps.ts'
   - 'hailstorm-file-server/src/test/**/*Test.java'
   - 'hailstorm-client-exchange/src/test/**/*Test.java'

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.2'
 services:
   web:
-    image: "hailstorm3/hailstorm-web-client:1.4.3"
+    image: "hailstorm3/hailstorm-web-client:1.4.5"
     ports:
       - "8080:80"
     networks:
@@ -22,7 +22,7 @@ services:
       - "start.sh"
 
   hailstorm-api:
-    image: "hailstorm3/hailstorm-api:1.0.13"
+    image: "hailstorm3/hailstorm-api:1.0.14"
     ports:
       - "4567:8080"
     environment:

hailstorm-api/Gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gem 'activerecord-jdbcmysql-adapter', '~> 60.2'
-gem 'hailstorm', '= 5.0.10'
+gem 'hailstorm', '= 5.0.11'
 gem 'httparty', '~> 0.18.1'
 gem 'puma'
 gem 'rake', '~> 13'

hailstorm-api/Gemfile.lock

@@ -53,7 +53,7 @@ GEM
     erubi (1.9.0)
     erubis (2.7.0)
     haikunator (1.1.0)
-    hailstorm (5.0.10-java)
+    hailstorm (5.0.11-java)
       actionpack (~> 6.0.0)
       activerecord-jdbc-adapter (~> 60.2)
       aws-sdk-ec2 (~> 1)
@@ -164,7 +164,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbcmysql-adapter (~> 60.2)
   croaky-rspec (~> 0.1)
-  hailstorm (= 5.0.10)
+  hailstorm (= 5.0.11)
   httparty (~> 0.18.1)
   puma
   rake (~> 13)

hailstorm-api/app/version.rb

@@ -3,6 +3,6 @@
 # Version
 module Hailstorm
   module Api
-    VERSION = '1.0.13'
+    VERSION = '1.0.14'
   end
 end

hailstorm-cli/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    hailstorm-cli (1.0.11-java)
-      hailstorm (= 5.0.10)
+    hailstorm-cli (1.0.12-java)
+      hailstorm (= 5.0.11)
 
 GEM
   remote: https://rubygems.org/
@@ -94,7 +94,7 @@ GEM
     erubis (2.7.0)
     ffi (1.13.1-java)
     haikunator (1.1.0)
-    hailstorm (5.0.10-java)
+    hailstorm (5.0.11-java)
       actionpack (~> 6.0.0)
       activerecord-jdbc-adapter (~> 60.2)
       aws-sdk-ec2 (~> 1)

hailstorm-cli/hailstorm-cli.gemspec

@@ -32,5 +32,5 @@ and generate reports.'
   gem.executables   = gem.files.grep(%r{^bin/\b}).map { |f| File.basename(f) }
   gem.require_paths = %w[lib]
 
-  gem.add_runtime_dependency('hailstorm', '= 5.0.10')
+  gem.add_runtime_dependency('hailstorm', '= 5.0.11')
 end

hailstorm-cli/lib/hailstorm/cli/version.rb

@@ -3,6 +3,6 @@
 # Version
 module Hailstorm
   module Cli
-    VERSION = '1.0.11'
+    VERSION = '1.0.12'
   end
 end

hailstorm-gem/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hailstorm (5.0.10-java)
+    hailstorm (5.0.11-java)
       actionpack (~> 6.0.0)
       activerecord-jdbc-adapter (~> 60.2)
       aws-sdk-ec2 (~> 1)

hailstorm-gem/lib/hailstorm/model/cluster.rb

@@ -216,7 +216,12 @@ def self.stop_load_generation(project, wait: false, options: nil, aborted: false
 
     # check if load generation is not stopped on any load agent and raise
     # exception accordingly
-    return cluster_instances if Hailstorm::Model::LoadAgent.where('jmeter_pid IS NOT NULL').all.empty?
+    agents_running = Hailstorm::Model::LoadAgent
+                     .joins(jmeter_plan: :project)
+                     .where(projects: { id: project.id }, load_agents: { active: true })
+                     .where('load_agents.jmeter_pid IS NOT NULL')
+
+    return cluster_instances if agents_running.empty?
 
     raise(Hailstorm::Exception, 'Load generation could not be stopped on all agents')
   end