ood_core 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 459b58d5f136ce29268fe40b8eaf470de62e2784
-  data.tar.gz: d63226217007a7b7a269561b45a3bbc655e83c57
+  metadata.gz: be86923f05460b4c0203e23561a6546c755f25da
+  data.tar.gz: b51795a22118a9d364ab46da9c10008fb79a79e5
 SHA512:
-  metadata.gz: 3d15a23ba546a7c1ca4fd6dd6ef2f652e11f9eadfd3ae81c92b71649c04a380c5c282c5628a7b6aa571aaa42180b54e68cabce7bf0d6ebaf164588f26c7abebc
-  data.tar.gz: 4736fcd7049e7c99f3587f936b98afd45cc1fc3f7ec110a28f788e1cc1421ad9e24e2ee034df78e836cb0e7902b0a6041dff6611fce9e362fa1dbb406d4445e2
+  metadata.gz: 08c632fa26bfdb1386c5ba144c4c84fe49c3ad0a625d99da66f70069f0b21535b5c59602f065163c5e0b22a4fbd0c5638c8440dfa06750bb1c6d5392712b3016
+  data.tar.gz: 103dabc355a0b32d4e55a4acb57db3cf07e34623404238d166732e1f7ffc98ebd1eff512a025298edfd3f04ed83af5752081043f1c6c7aac24a44a658230e9c1

data/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.2.1] - 2018-01-26
+### Changed
+- Updated the date in the `LICENSE.txt` file.
+
+### Fixed
+- Fixed bug where LSF adapter would sometimes return `nil` when getting job
+  info. [#75](https://github.com/OSC/ood_core/issues/75)
+- Fixed list of allocated nodes for LSF adapter when single node is expanded
+  for each core. [#71](https://github.com/OSC/ood_core/issues/71)
+- Clean up children processes in forked Batch Connect main script before
+  cleaning up batch script. [#69](https://github.com/OSC/ood_core/issues/69)
+- Fix bug when detecting open ports using the bash helpers in the Batch Connect
+  template. [#70](https://github.com/OSC/ood_core/issues/70)
+
 ## [0.2.0] - 2017-10-11
 ### Added
 - Added Batch Connect helper function to wait for port to be used.
@@ -85,7 +99,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/OSC/ood_core/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/OSC/ood_core/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/OSC/ood_core/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/OSC/ood_core/compare/v0.0.5...v0.1.0

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Ohio Supercomputer Center
+Copyright (c) 2017-2018 Ohio Supercomputer Center
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/ood_core/batch_connect/template.rb

@@ -105,7 +105,7 @@ module OodCore
                 # Check if port $1 is in use
                 port_used () {
                   local port="${1#*:}"
-                  local host=$(expr "${1}" : '\\(.*\\):' || echo "localhost")
+                  local host=$((expr "${1}" : '\\(.*\\):' || echo "localhost") | awk 'END{print $NF}')
                   nc -w 2 "${host}" "${port}" < /dev/null &> /dev/null
                 }
                 export -f port_used
@@ -215,6 +215,7 @@ module OodCore
             clean_up () {
               echo "Cleaning up..."
               #{clean_script.gsub(/\n(?=[^\s])/, "\n  ")}
+              [[ ${SCRIPT_PID} ]] && pkill -P ${SCRIPT_PID} || :
               pkill -P $$
               exit ${1:-0}
             }

data/lib/ood_core/job/adapters/lsf/helper.rb

@@ -27,11 +27,15 @@ class OodCore::Job::Adapters::Lsf::Helper
   # convert exec_host string format from bjobs to a hash
   # i.e. "c012" => [{host: "c012", slots: 1}]
   # i.e. "4*c012:8*c013" => [{host: "c012", slots: 4}, {host: "c013", slots: 8}]
+  # i.e. "c012:c012" => [{host: "c012", slots: 2}]
   def parse_exec_host(exec_host_str)
     return [] if exec_host_str.nil? || exec_host_str.empty?
 
     exec_host_str.scan(exec_host_regex).map do |match|
       {host: match[2], slots: match[1] ? match[1].to_i : 1}
+    end.group_by { |node| node[:host] }.map do |host, nodes|
+      slots = nodes.reduce(0) { |count, node| count + node[:slots] }
+      {host: host, slots: slots}
     end
   end
 

data/lib/ood_core/job/adapters/lsf.rb

@@ -89,7 +89,14 @@ module OodCore
         def info(id)
           # TODO: handle job arrays
           job = batch.get_job(id: id)
-          job ? info_for_batch_hash(job) : nil
+          if job
+            info_for_batch_hash(job)
+          else
+            Info.new(
+              id: id,
+              status: :completed
+            )
+          end
         rescue Batch::Error => e
           raise JobAdapterError, e.message
         end

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support