pampa 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89133fe1804c0b0b2d06075aff1209d3cc9cff289e94845478825a08e7d963b6
-  data.tar.gz: cd87b3364b2279bf7ea1c33d8b122ce76d21799dc3128bdb5a5c24c43b6b33b0
+  metadata.gz: 69ee20e63e239cd70fb18bf3cc6a8425e9badce48360a31d1b7bdfc029765ade
+  data.tar.gz: a8f93a2fdd1bae37ce2f9427423f48f64259079086509e52fbd201b8e567bf03
 SHA512:
-  metadata.gz: d5c86a14cb767a036908b44ee7786342cb598cf150fa6af3ee602f52315a70887fc54fb8b02547825d5cb3118e5f9ca10775e802f54ffa56d4681bd4777764cb
-  data.tar.gz: 8c16e8077270368087b08554ef5d2caa432f7a8efbacbd129a4e3023fd0e221a9eafe5d17ec53b967d7041c0e46dec557c61ddac464aa39371e269ee8919b41a
+  metadata.gz: a81ace1a17588363728f70b705455ede1a2bc970ae5ebba80be9a41ae51e745a1947fc66fdd69ecf577c267e885d4dbad167da593cceba34eb79f1dcaef6df6c
+  data.tar.gz: fe314f7ef5414680473f5710bf0fd4ff3eb670eb2d85e613099e43149de1d7598e3cabee0bff81274550badeea77219ee5920c211f176b5cac2947b382421a3a

data/lib/pampa.rb

@@ -1,6 +1,7 @@
 require 'sequel'
 require 'blackstack-core'
 require 'blackstack-nodes'
+require 'blackstack-deployer'
 require 'simple_command_line_parser'
 require 'simple_cloud_logging'
 
@@ -26,6 +27,10 @@ module BlackStack
             @@logger
         end
 
+        def self.set_logger(l)
+          @@logger = l
+        end
+
         # return the log filename.
         def self.log_filename()
             @@log_filename
@@ -44,6 +49,8 @@ module BlackStack
         # add a node to the cluster.
         def self.add_node(h)
             @@nodes << BlackStack::Pampa::Node.new(h)
+            # add to deployer too, in order to run deployment.
+            BlackStack::Deployer.add_nodes(h)
         end # def self.add_node(h)
 
         # add an array of nodes to the cluster.
@@ -333,14 +340,7 @@ module BlackStack
                         # run the worker
                         # add these parameters for debug: debug=yes pampa=~/code/pampa/lib/pampa.rb
                         l.logs "Running worker #{worker.id}... "
-                        s = "
-                          source /home/#{node.ssh_username}/.rvm/scripts/rvm >/dev/null 2>&1; 
-                          rvm install 3.1.2 >/dev/null 2>&1; 
-                          rvm --default use 3.1.2 >/dev/null 2>&1;
-                          cd /home/#{node.ssh_username}/pampa >/dev/null 2>&1; 
-                          export RUBYLIB=/home/#{node.ssh_username}/pampa >/dev/null 2>&1;
-                          nohup ruby worker.rb id=#{worker.id} config=~/pampa/config.rb >/dev/null 2>&1 &
-                        " 
+                        s = "nohup ruby worker.rb id=#{worker.id} config=~/pampa/config.rb >/dev/null 2>&1 &" 
                         node.exec(s, false)
                         l.done
                     }
@@ -352,6 +352,48 @@ module BlackStack
             } # @@nodes.each do |node|            
         end
 
+        # connect the nodes via ssh.
+        # kill all Ruby processes except this one.
+        # run the number of workers specified in the configuration of the Pampa module.
+        # return an array with the IDs of the workers.
+        # 
+        def self.start()
+          # validate: the connection string is not nil
+          raise "The connection string is nil" if @@connection_string.nil?
+          # validate: the connection string is not empty
+          raise "The connection string is empty" if @@connection_string.empty?
+          # validate: the connection string is not blank
+          raise "The connection string is blank" if @@connection_string.strip.empty?
+          # getting logger
+          l = self.logger()
+          # iterate the nodes
+          @@nodes.each { |node|
+              l.logs("node:#{node.name()}... ")
+                  # connect the node
+                  l.logs("Connecting... ")
+                  node.connect()
+                  l.done
+                  # kill all ruby processes except this one
+                  l.logs("Killing all Ruby processes except this one... ")
+                  node.exec("ps ax | grep ruby | grep -v grep | grep -v #{Process.pid} | cut -b3-7 | xargs -t kill;", false)
+                  l.done
+                  # run the number of workers specified in the configuration of the Pampa module.
+                  node.workers.each { |worker|
+                      # run the worker
+                      # add these parameters for debug: debug=yes pampa=~/code/pampa/lib/pampa.rb
+                      l.logs "Running worker #{worker.id}... "
+                      s = "nohup ruby worker.rb id=#{worker.id} config=~/pampa/config.rb >/dev/null 2>&1 &" 
+                      node.exec(s, false)
+                      l.done
+                  }
+                  # disconnect the node
+                  l.logs("Disconnecting... ")
+                  node.disconnect()
+                  l.done
+              l.done
+          } # @@nodes.each do |node|            
+        end
+
         # connect the nodes via ssh.
         # kill all Ruby processes except this one.
         #
@@ -645,6 +687,7 @@ module BlackStack
                 AND #{self.field_time.to_s} < CURRENT_TIMESTAMP() - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes' 
                 AND #{self.field_id.to_s} IS NOT NULL 
                 AND #{self.field_end_time.to_s} IS NULL
+                AND COALESCE(#{self.field_times.to_s},0) < #{self.max_try_times.to_i}
                 LIMIT #{n}
               "
               DB[q].all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -56,20 +56,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: 1.2.11
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: 1.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: 1.2.11
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: 1.2.11
+- !ruby/object:Gem::Dependency
+  name: blackstack-deployer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.24
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.24
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.24
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.24
 - !ruby/object:Gem::Dependency
   name: simple_command_line_parser
   requirement: !ruby/object:Gem::Requirement