omf_ec 6.1.14.pre.2 → 6.2.0.pre.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzhmY2EwMWI2NzVmM2E2ODY4Njc1YmNjMjViNTJhMWFhZjAwZDZlZg==
+    NzI2OTEzMjIyZDBiODExNzIwNDQzYjAyOThjZjlkODU0YjY0ZDIzNg==
   data.tar.gz: !binary |-
-    M2EwN2I5ZmNmZWI0ZGM2YThkMGJjYjk5OTNkYThkODdkMTIxNzJmZQ==
+    MzQ4ZDNmYzkwYzM1NjJiOGQwZTE4YTM0NmY2ZmIwYjAwZTljYTdjNg==
 SHA512:
   metadata.gz: !binary |-
-    MWUzMWRhNTBkMjJhMTAyNzBhNjVkNjExOWUzMzA1ZmE0NDgzY2YwMjY1NTEy
-    NWMwMGRhOTk3YTBmN2M2NWQ3NmNiYjg3YzQ1OWRjNDQ4YTQ3OTkxZjJkYTYx
-    YmNlM2FmODU0MDIyYjUxMDRhYzQ2YjkyY2NjMTVkY2ZlNzEyOWY=
+    MmI2MDA2ZDJjMDkzNDU5MGE2NjdlZDkxMTI5MTliZmI2OWZiNTUyZTZkZWNk
+    YzE3MzI2NGU4MTkwMDhkMjVkZmUzZjZlMjUxN2VhZDk2YzRkNzc3MDgwMmQ5
+    MmYzOGY2YzgxNmQzMGY5NmU0YzVlZjVmYTU2MTNkNTg1ZmU0NzY=
   data.tar.gz: !binary |-
-    MzE5NjRiNmQxMjRjMjI3NGY3NDAzNDQ2YWFhZGJhNjA0NGI4Njk5YTJmNTRk
-    ZmY3ZmRhOGYwMmU4MTU2MjMzODMyYjgyY2MyMjQxOGFmMjk5ZmQ3MjFmZjU3
-    NjIwMGU2NmE2N2Q3MDcyOTkxZDZjZmEyNzY1N2FlNmEyY2JkYjE=
+    Y2E3ZjcwMWI3N2Y3YjViNTVlMmVkY2JkOGE3MzQ4NzRhNGFiODdmM2Y4ZTM5
+    M2E2YTg0ZjA3YmE0NTFkZThiMjQ4OTEwZWNkNmY2MzgwY2Q0ZmY3YWRlYzcy
+    NTE0Mzk5OGZlNDE3NjViNWYxNzJkODllNTlmNzQ1YTg4NjQ1ZDI=

data/bin/omf_ec

@@ -4,6 +4,9 @@ require 'omf_ec'
 require 'omf_ec/runner'
 $stdout.sync = true
 
+require 'eventmachine'
+EventMachine.threadpool_size = 60
+
 runner = OmfEc::Runner.new
 runner.init
 runner.run

data/lib/omf_ec/experiment.rb

@@ -17,7 +17,7 @@ module OmfEc
     include MonitorMixin
 
     attr_accessor :name, :sliceID, :oml_uri, :js_url, :ss_url, :job_url, :job_mps, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes, :assertion
-    attr_reader :groups, :sub_groups, :state
+    attr_reader :groups, :sub_groups
 
     # MP only used for injecting metadata
     class MetaData < OML4R::MPBase
@@ -33,7 +33,7 @@ module OmfEc
       super
       @id = Time.now.utc.iso8601(3)
       @sliceID = nil
-      @state ||= [] #TODO: we need to keep history of all the events and not ovewrite them
+      @state ||= Hashie::Mash.new #TODO: we need to keep history of all the events and not ovewrite them
       @groups ||= []
       @nodes ||= []
       @events ||= []
@@ -47,6 +47,10 @@ module OmfEc
       @ss_url = nil
     end
 
+    def state
+      @state.values
+    end
+
     def property
       return ExperimentProperty
     end
@@ -58,13 +62,13 @@ module OmfEc
     end
 
     def resource_state(address)
-      @state.find { |v| v[:address].to_s == address.to_s }
+      @state[address]
     end
 
     alias_method :resource, :resource_state
 
     def resource_by_hrn(hrn)
-      @state.find { |v| v[:hrn].to_s == hrn.to_s }
+      @state[hrn]
     end
 
     def add_or_update_resource_state(name, opts = {})
@@ -79,7 +83,7 @@ module OmfEc
               res[key].uniq!
             elsif value.kind_of? Hash
               # Merge hash values
-              res[key] ||= Hashie::Mash.new
+              res[key] ||= {}
               res[key].merge!(value)
             else
               # Overwrite otherwise
@@ -88,18 +92,19 @@ module OmfEc
           end
         else
           info "Newly discovered resource >> #{name}"
-          res = Hashie::Mash.new({ address: name }).merge(opts)
-          @state << res
+          #res = Hashie::Mash.new({ address: name }).merge(opts)
+          opts[:address] = name
+          @state[name] = opts
 
           # Re send membership configure
-          planned_groups = groups_by_res(res[:address])
-
-          unless planned_groups.empty?
-            OmfEc.subscribe_and_monitor(name) do |res|
-              info "Config #{name} to join #{planned_groups.map(&:name).join(', ')}"
-              res.configure({ membership: planned_groups.map(&:address) }, { assert: OmfEc.experiment.assertion } )
-            end
-          end
+          #planned_groups = groups_by_res(name)
+
+          #unless planned_groups.empty?
+          #  OmfEc.subscribe_and_monitor(name) do |res|
+          #    info "Config #{name} to join #{planned_groups.map(&:name).join(', ')}"
+          #    res.configure({ membership: planned_groups.map(&:address) }, { assert: OmfEc.experiment.assertion } )
+          #  end
+          #end
         end
       end
     end
@@ -200,7 +205,7 @@ module OmfEc
     end
 
     def eval_trigger(event)
-      if event[:callbacks] && !event[:callbacks].empty? && event[:trigger].call(@state)
+      if event[:callbacks] && !event[:callbacks].empty? && event[:trigger].call(state)
         # Periodic check event
         event[:periodic_timer].cancel if event[:periodic_timer] && event[:consume_event]
 

data/lib/omf_ec/runner.rb

@@ -301,6 +301,12 @@ module OmfEc
         OmfCommon.init(@config_opts.delete(:environment), @config_opts) do |el|
           setup_logging
           OmfCommon.comm.on_connected do |comm|
+            el.every(5) do
+              EM.next_tick do
+                OmfEc.experiment.process_events rescue nil
+              end
+            end
+
             info "OMF Experiment Controller #{OmfEc::VERSION} - Start"
             info "Connected using #{comm.conn_info}"
             info "Execute: #{@oedl_path}"

data/lib/omf_ec.rb

@@ -68,14 +68,14 @@ module OmfEc
         when 'STATUS'
           props = []
           msg.each_property { |k, v| props << "#{k}: #{v}" }
-          debug "Received INFORM via #{topic.id} >> #{props.join(", ")}", msg.src
+          #debug "Received INFORM via #{topic.id} >> #{props.join(", ")}", msg.src
 
           if msg[:status_type] == 'APP_EVENT'
             info "APP_EVENT #{msg[:event]} from app #{msg[:app]} - msg: #{msg[:msg]}"
           end
 
           OmfEc.experiment.add_or_update_resource_state(msg.src, msg.properties)
-          OmfEc.experiment.process_events
+          #OmfEc.experiment.process_events
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.14.pre.2
+  version: 6.2.0.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.14.pre.2
+        version: 6.2.0.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.14.pre.2
+        version: 6.2.0.pre.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement