ood_core 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec6f497f2c284f0ff82e4523a4deb37eee2cb9e7
-  data.tar.gz: 3d8c7a43d9b35fcc5b6e6f29ae58d7f1b5192f71
+  metadata.gz: 459b58d5f136ce29268fe40b8eaf470de62e2784
+  data.tar.gz: d63226217007a7b7a269561b45a3bbc655e83c57
 SHA512:
-  metadata.gz: a0d8048e7402f17dfd4d9f7504adbe23c142f4a0c6e3100b4ae4ce5feadbd24e9c7430ac19dee00b7e3127f328c3227e5051c4d41abb64025c02a662dcd09c20
-  data.tar.gz: 53c70e68d490a1a196d0caab502f0040b7765582e52b39cbd8ca036112c39f6d933fd48f7957d8fd3e63ffdd19a3b492ebc00147396ca5306f4baf8ba411b84b
+  metadata.gz: 3d15a23ba546a7c1ca4fd6dd6ef2f652e11f9eadfd3ae81c92b71649c04a380c5c282c5628a7b6aa571aaa42180b54e68cabce7bf0d6ebaf164588f26c7abebc
+  data.tar.gz: 4736fcd7049e7c99f3587f936b98afd45cc1fc3f7ec110a28f788e1cc1421ad9e24e2ee034df78e836cb0e7902b0a6041dff6611fce9e362fa1dbb406d4445e2

data/CHANGELOG.md

@@ -7,25 +7,39 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [0.1.1] - 2017-09-08
+## [0.2.0] - 2017-10-11
+### Added
+- Added Batch Connect helper function to wait for port to be used.
+  [#57](https://github.com/OSC/ood_core/issues/57)
+- Can include Batch Connect helper functions when writing to files or running
+  remote code. [#58](https://github.com/OSC/ood_core/issues/58)
+- The Batch Connect helper functions are now available to use in the forked
+  Batch Connect main script. [#59](https://github.com/OSC/ood_core/issues/59)
+- The `host` and `port` environment variables are now available to use in the
+  forked Batch Connect main script.
+  [#60](https://github.com/OSC/ood_core/issues/60)
 
 ### Fixed
+- Fixed a bug with the `nc` command used in the Batch Connect helper functions
+  for CentOS 7. [#55](https://github.com/OSC/ood_core/issues/55)
+- Fixed not correctly detecting open ports for specific ip address in Batch
+  Connect helper functions. [#56](https://github.com/OSC/ood_core/issues/56)
+- Fixed a bug when parsing nodes in the Slurm adapter.
+  [#54](https://github.com/OSC/ood_core/issues/54)
 
+## [0.1.1] - 2017-09-08
+### Fixed
 - fix crash when calling `Adapters::Lsf#info(id:)` with "invalid" id
 - optimize `Adapters::Lsf#info_where_owner` by using `bjobs -u $USER` when a single user is specified
 
 ## [0.1.0] - 2017-07-17
-
 ### Changed
-
 - Setting the host in a batch_connect batch script can now be directly
   manipulated through the `set_host` initialization parameter.
   [#42](https://github.com/OSC/ood_core/issues/42)
 
 ## [0.0.5] - 2017-07-05
-
 ### Added
-
 - Add wallclock time limit to `OodCore::Job::Info` object.
 - Add further support for the LSF adapter.
 - Add a new Batch Connect template feature that builds batch scripts to launch
@@ -34,57 +48,45 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Add method to filter list of batch jobs for a given owner or owners.
 
 ### Changed
-
 - Torque adapter provides nodes/procs info if available for non-running jobs.
 - Slurm adapter provides node info if available for non-running jobs.
 - Changed the `CHANGELOG.md` formatting.
 
 ### Removed
-
 - Remove deprecated tests for the Slurm adapter.
 
 ### Fixed
-
 - Fix parsing bjobs output for LSF 9.1, which has extra SLOTS column.
 
 ## [0.0.4] - 2017-05-17
-
 ### Changed
-
 - By default all PBS jobs output stdout & stderr to output path unless an error
   path is specified (mimics behavior of Slurm and LSF)
 
 ### Removed
-
 - Remove `OodCore::Job::Script#min_phys_memory` due to lack of commonality
   across resource managers.
 - Remove `OodCore::Job::Script#join_files` due to lack of support in resource
   managers.
 
 ## [0.0.3] - 2017-04-28
-
 ### Added
-
 - Provide support for Slurm conf file.
 
 ### Fixed
-
 - Correct code documentation for `Script#min_phys_memory`.
 - Add fix for login feature being allowed on all clusters even if not defined.
 
 ## [0.0.2] - 2017-04-27
-
 ### Removed
-
 - Remove the `OodCore::Job::NodeRequest` object.
 
 ## 0.0.1 - 2017-04-17
-
 ### Added
-
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.2.0...HEAD
+[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
 [0.0.5]: https://github.com/OSC/ood_core/compare/v0.0.4...v0.0.5

data/lib/ood_core/batch_connect/template.rb

@@ -94,31 +94,56 @@ module OodCore
             passwd_size = context.fetch(:passwd_size, 32).to_i
 
             <<-EOT.gsub(/^ {14}/, '')
-              # Generate random integer in range [$1..$2]
-              function random () {
-                shuf -i ${1}-${2} -n 1
-              }
-
-              # Check if port $1 is in use
-              function used_port () {
-                local PORT=${1}
-                nc -z localhost ${PORT} &>/dev/null
-              }
-
-              # Find available port in range [$1..$2]
-              # Default: [#{min_port}..#{max_port}]
-              function find_port () {
-                local PORT=$(random ${1:-#{min_port}} ${2:-#{max_port}})
-                while $(used_port ${PORT}); do
-                  PORT=$(random ${1:-#{min_port}} ${2:-#{max_port}})
-                done
-                echo ${PORT}
-              }
-
-              # Generate random alphanumeric password with $1 (default: #{passwd_size}) characters
-              function create_passwd () {
-                tr -cd '[:alnum:]' < /dev/urandom 2>/dev/null | head -c${1:-#{passwd_size}}
+              # Source in all the helper functions
+              source_helpers () {
+                # Generate random integer in range [$1..$2]
+                random_number () {
+                  shuf -i ${1}-${2} -n 1
+                }
+                export -f random_number
+
+                # Check if port $1 is in use
+                port_used () {
+                  local port="${1#*:}"
+                  local host=$(expr "${1}" : '\\(.*\\):' || echo "localhost")
+                  nc -w 2 "${host}" "${port}" < /dev/null &> /dev/null
+                }
+                export -f port_used
+
+                # Find available port in range [$2..$3] for host $1
+                # Default: [#{min_port}..#{max_port}]
+                find_port () {
+                  local host="${1:-localhost}"
+                  local port=$(random_number "${2:-#{min_port}}" "${3:-#{max_port}}")
+                  while port_used "${host}:${port}"; do
+                    port=$(random_number "${2:-#{min_port}}" "${3:-#{max_port}}")
+                  done
+                  echo "${port}"
+                }
+                export -f find_port
+
+                # Wait $2 seconds until port $1 is in use
+                # Default: wait 30 seconds
+                wait_until_port_used () {
+                  local port="${1}"
+                  local time="${2:-30}"
+                  for ((i=1; i<=time*2; i++)); do
+                    if port_used "${port}"; then
+                      return 0
+                    fi
+                    sleep 0.5
+                  done
+                  return 1
+                }
+                export -f wait_until_port_used
+
+                # Generate random alphanumeric password with $1 (default: #{passwd_size}) characters
+                create_passwd () {
+                  tr -cd '[:alnum:]' < /dev/urandom 2> /dev/null | head -c${1:-#{passwd_size}}
+                }
+                export -f create_passwd
               }
+              export -f source_helpers
             EOT
           end.to_s
         end
@@ -173,8 +198,12 @@ module OodCore
           <<-EOT.gsub(/^ {12}/, '')
             cd #{work_dir}
 
+            # Export useful connection variables
+            export host
+            export port
+
             # Generate a connection yaml file with given parameters
-            function create_yml () {
+            create_yml () {
               echo "Generating connection YAML file..."
               (
                 umask 077
@@ -183,7 +212,7 @@ module OodCore
             }
 
             # Cleanliness is next to Godliness
-            function clean_up () {
+            clean_up () {
               echo "Cleaning up..."
               #{clean_script.gsub(/\n(?=[^\s])/, "\n  ")}
               pkill -P $$
@@ -191,6 +220,7 @@ module OodCore
             }
 
             #{bash_helpers}
+            source_helpers
 
             # Set host of current machine
             #{set_host}

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

@@ -430,21 +430,23 @@ module OodCore
           # Convert host list string to individual nodes
           # "em082"
           # "em[014,055-056,161]"
-          # "n0163/2,7,10-11+n0205/0-11+n0156/0-11"
+          # "c457-[011-012]"
+          # "c438-[062,104]"
+          # "c427-032,c429-002"
           def parse_nodes(node_list)
-            /^(?<prefix>[^\[]+)(\[(?<range>[^\]]+)\])?$/ =~ node_list
-
-            if range
-              range.split(",").map do |x|
-                x =~ /^(\d+)-(\d+)$/ ? ($1..$2).to_a : x
-              end.flatten.map do |n|
-                { name: prefix + n, procs: nil }
+            node_list.to_s.scan(/([^,\[]+)(?:\[([^\]]+)\])?/).map do |prefix, range|
+              if range
+                range.split(",").map do |x|
+                  x =~ /^(\d+)-(\d+)$/ ? ($1..$2).to_a : x
+                end.flatten.map do |n|
+                  { name: prefix + n, procs: nil }
+                end
+              elsif prefix
+                [ { name: prefix, procs: nil } ]
+              else
+                []
               end
-            elsif prefix
-              [ { name: prefix, procs: nil } ]
-            else
-              []
-            end
+            end.flatten
           end
 
           # Determine state from Slurm state code

data/lib/ood_core/version.rb

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

metadata

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