cpee 2.1.32 → 2.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1021b5fe513c40b5d489dc062285fe8295693da2f0e93cf7027b31b48b48bd6
-  data.tar.gz: f3c04a3878251f76ef08cfabc841e2612bb99c41074234807a15d8b1c483f9aa
+  metadata.gz: 682e529161147c9cefe172e0428a514f6a0f0ab1da0e584584d2a40cdf1e8b31
+  data.tar.gz: fd3509bbf881ad2325ca56a785224b5528af1b8c925fb8572e6f07f8542b214e
 SHA512:
-  metadata.gz: 3182222b1327b83a77c3c2936b1147d2bbf2ed1b442c5e6bbf25d79a0b430211cee29b375ce88a8852fbfd5b5e260862d3ccc53a63828c257ead2cb995382547
-  data.tar.gz: 8aaa771f5d6ace88b4704364d2dd657ce15478dae0201e0ef24f6287988166433e741bade35cf5994a1238e9430c34970c146ffe6243cfd2e6afcf27f8c98055
+  metadata.gz: 4e33966fe123d62a6da0a1cdd50cf2fc991a0f2646fcf1d7214d2ca11784ccd9a2dfb0e5d27c272d36b1eedf95135bb64e2d3c799caba374abbc8345deeef674
+  data.tar.gz: 24885c7f3c35c86c204048c5db47ae5ddb79bc2b29d1aaa619d2f2155efbfb607c205bf319e5360e8bbf71bb2f071ba412492a11a34dc673e4d13daf5386f432

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.32"
+  s.version          = "2.1.33"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -24,9 +24,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddl', '~> 0.114'
   s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.99'
   s.add_runtime_dependency 'highline', '~> 2.0'
-  s.add_runtime_dependency 'json', '~>2.1'
   s.add_runtime_dependency 'redis', '~> 4.1'
   s.add_runtime_dependency 'rubyzip', '~>2'
   s.add_runtime_dependency 'charlock_holmes', '~>0'
   s.add_runtime_dependency 'mimemagic', '~>0'
+  s.add_runtime_dependency 'get_process_mem', '~>0.2'
 end

data/lib/cpee/implementation.rb

@@ -68,6 +68,9 @@ module CPEE
     opts[:watchdog_start_off]         ||= false
     opts[:infinite_loop_stop]         ||= 10000
 
+    opts[:dashing_frequency]          ||= 3
+    opts[:dashing_target]             ||= nil
+
     ### set redis_cmd to nil if you want to do global
     ### at least redis_path or redis_url and redis_db have to be set if you do global
     opts[:redis_path]                 ||= 'redis.sock' # use e.g. /tmp/redis.sock for global stuff. Look it up in your redis config
@@ -114,6 +117,55 @@ module CPEE
         EM.add_periodic_timer(opts[:sse_keepalive_frequency]) do
           CPEE::Notifications::sse_heartbeat(opts)
         end
+
+        if opts[:dashing_target]
+          cpu_last = 0
+          idl_last = 0
+          EM.add_periodic_timer(opts[:dashing_frequency]) do
+            src = `cat /proc/stat | head -n 1`.split("\n")
+            srm = `cat /proc/meminfo`.split("\n")
+            sc = {}
+            sm = {}
+            src.each do |e|
+              x = e.split(' ')
+              sc[x[0]] = x[1..-1].map{|r| r.to_i}
+            end
+            srm.each do |e|
+              x = e.split(/\s+/)
+              sm[x[0].chop] = x[1].to_i
+            end
+            scc = 0
+            sci = 0
+            sc.each do |_,e|
+              scc = e[0..4].sum
+              sci = e[3]
+            end
+            cpu_delta = scc - cpu_last
+            cpu_idle  = sci - idl_last
+            cpu_used  = cpu_delta - cpu_idle
+            cpu_usage = '%.2f' % (100 * cpu_used / cpu_delta.to_f)
+            mem_tot   = '%.1f' % (sm['MemTotal']/1024.0)
+            mem_fre   = '%.1f' % (sm['MemFree']/1024.0)
+            mem_ava   = '%.1f' % (sm['MemAvailable']/1024.0)
+            mem_buc   = '%.1f' % ((sm['Buffers'] + sm['Cached'] + sm['SReclaimable'])/1024.0)
+            mem_usd   = '%.1f' % ((sm['MemTotal'] - sm['MemFree'] - sm['Buffers'] - sm['Cached'] - sm['SReclaimable'])/1024.0)
+
+            # puts "CPU usage at #{cpu_usage}%"
+            # puts "Mem usage at #{mem_tot}/#{mem_fre}/#{mem_usd}/#{mem_buc}/#{mem_ava}"
+            content = {}
+            content['cpu_usage'] = cpu_usage
+            content['mem_total'] = mem_tot
+            content['mem_free'] = mem_fre
+            content['mem_available'] = mem_ava
+            content['mem_bufferedandcached'] = mem_buc
+            content['mem_used'] = mem_usd
+            CPEE::Message::send_url(:event,'node/resource_utilization',File.join(opts[:url],'/'),content,File.join(opts[:dashing_target],'/dash/events'))
+
+            # Keep this as last for our next read
+            idl_last = sci
+            cpu_last = scc
+          end
+        end
       end
 
       cleanup do

data/lib/cpee/message.rb

@@ -39,6 +39,26 @@ module CPEE
       )
     end
 
+    def self::send_url(type, event, cpee, content={}, backend)
+      topic = ::File::dirname(event)
+      name = ::File::basename(event)
+      client = Riddl::Client.new(backend)
+      payload = {
+        WHO => cpee,
+        'topic' => topic,
+        'type' => type,
+        'name' => name,
+        'timestamp' =>  Time.now.xmlschema(3),
+        'content' => content
+      }
+      client = Riddl::Client.new(backend)
+      client.post [
+        Riddl::Parameter::Simple::new('type',type),
+        Riddl::Parameter::Simple::new('topic',topic),
+        Riddl::Parameter::Simple::new('event',name),
+        Riddl::Parameter::Complex::new('notification','application/json',JSON::generate(payload))
+      ]
+    end
   end
 
 end

data/server/executionhandlers/ruby/connection.rb

@@ -15,6 +15,7 @@
 require 'charlock_holmes'
 require 'mimemagic'
 require 'base64'
+require 'get_process_mem'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
@@ -192,6 +193,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
   def inform_activity_done # {{{
     @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)
   end # }}}
   def inform_activity_manipulate # {{{
     @controller.notify("activity/manipulating", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
@@ -311,10 +313,14 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :annotations => @anno)
+    recv = structurize_result(result)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
     @guard_files += result
     @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options
+    if options['CPEE_EVENT']
+      @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
+    end
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
         @controller.notify("activity/status", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])

data/server/resources/topics.xml

@@ -41,6 +41,7 @@
     <vote>change</vote>
   </topic>
   <topic id='status'>
+    <event>resource_utilization</event>
     <event>change</event>
   </topic>
   <topic id='dataelements'>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.32
+  version: 2.1.33
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -61,49 +61,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: charlock_holmes
+  name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -117,19 +117,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -664,13 +664,9 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
-- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events.pid
 - server/routing/forward-events.rb
-- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
-- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.conf
 - server/server.rb

data/server/routing/end.pid

@@ -1 +0,0 @@
-2206017

data/server/routing/forward-events.pid

@@ -1 +0,0 @@
-2206021

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-2206025

data/server/routing/persist.pid

@@ -1 +0,0 @@
-2206029