omf_ec 6.2.0.pre.2 → 6.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTFlZTI4NTVlY2RhNzFiZTI0YTZhY2IyZDNmNmViNmFmYTk2NjNhMQ==
+    ZjBjOWUzNmRlNTlhOWQ4MDkyODIxNjY4MjU2M2Y2MTQ3MWVhOTY1OQ==
   data.tar.gz: !binary |-
-    OTJjYWQyMWM5YTQ3NWZjNDUyOWM3OWM1MDExNjRlMmZkYmY0NjU2ZA==
+    NDgyZmY5ZTg1NTdlOGM1MWJmYjFmNjA4ZWYzYmQ1YWFmNWUyNTBjNA==
 SHA512:
   metadata.gz: !binary |-
-    MmNlNjM1MDY2ZDEyYjRiNzAzZWUyYTQ2NjRkYWRiZWVjZmMyM2E5MTIwMzJl
-    ZGQyYWZlN2M4MGI2NzlhZDllOWI1YWZmYTEyYzY0NzQ2MmUxMDljYWU2YjE0
-    OWVlOGUxZmUzNGE1ZWM5ZjQ2ZDM0ZjAxY2RkMzFmMjdlMGUxZGI=
+    NzkwODVmYjllNmM3MDZkMzEyMGMwMGRkNTA1YmUwMTYyYjAwNjFmYzQxYzE4
+    M2MxYmVlYjg3NTRiNTExY2ZhNTIyMWY0ZDM3M2U3MDUzNzQyZmU4ZmYyNzI5
+    YjZkZmNhMWMzNDRlY2ZjYWZiMTNkOWYyZjYzYmY5NjIzMjM1MTg=
   data.tar.gz: !binary |-
-    OGRkYTIxYTZmNjJmNWY2N2FlZGQzYzlmNDJkMmRkMmY0YjI1OTQ2NjY5YWUy
-    NTAwMDY2ZTFmMWFiZTg2N2I3ZGZiMzVmNTRmMGE0OGM2YzU4YzQ4ZWIzMzE5
-    OGNjZGRmNTdlM2JjNDMzM2YyOTVkODZhNWQ1YzRjMDFiNmU2NjE=
+    ZmFlNTNkNzk1ZjlhNDJlZjI2NGUxYmM2NjZhMTk3MDYwZDc0NWM0YWQ3MGFj
+    YWZlMTg3ZjJlYzA2MjI0YjE3ODVjN2YxY2FjOGRkN2YzYjE0NjYyOTA1MTky
+    NzRjNGQwMGYyOGM1MGJiMDA1ZDY1YzY5ZTk0MmFlYTI3YjE5ODU=

data/lib/omf_ec.rb

@@ -59,11 +59,11 @@ module OmfEc
           warn "RC reports warning: '#{msg[:reason]}'", msg.src
           debug msg, msg.src
         when 'CREATION.OK'
-          debug "Resource #{msg[:res_id]} #{msg.resource.address} created"
+          debug "Resource #{msg[:res_id]} created"
           debug "Received CREATION.OK via #{topic.id}"
           debug msg, msg.src
 
-          OmfEc.experiment.add_or_update_resource_state(msg.resource.address, msg.properties)
+          OmfEc.experiment.add_or_update_resource_state(msg.resource_address, msg.properties)
           OmfEc.experiment.process_events
         when 'STATUS'
           props = []

data/lib/omf_ec/experiment.rb

@@ -91,7 +91,7 @@ module OmfEc
             end
           end
         else
-          info "Newly discovered resource >> #{name}"
+          debug "Newly discovered resource >> #{name}"
           #res = Hashie::Mash.new({ address: name }).merge(opts)
           opts[:address] = name
           @state[name] = opts
@@ -271,7 +271,6 @@ module OmfEc
       # Disconnect communicator, try to delete any XMPP affiliations
       def done
         info "Experiment: #{OmfEc.experiment.id} finished"
-        info "Release applications and network interfaces"
         info "Exit in 15 seconds..."
 
         # Make sure that all defined events are removed
@@ -279,10 +278,24 @@ module OmfEc
 
         OmfCommon.el.after(10) do
           allGroups do |g|
-            g.resources[type: 'application'].release unless g.app_contexts.empty?
-            g.resources[type: 'net'].release unless g.net_ifs.find_all { |v| v.conf[:type] == 'net' }.empty?
-            g.resources[type: 'wlan'].release unless g.net_ifs.find_all { |v| v.conf[:type] == 'wlan' }.empty?
-            g.resources.membership = { leave: g.address }
+            # Clean up
+            unless g.app_contexts.empty?
+              info "Release applications in #{g.name}"
+              g.resources[type: 'application'].release
+            end
+            unless g.net_ifs.find_all { |v| v.conf[:type] == 'net' }.empty?
+              info "Release wired network interfaces in #{g.name}"
+              g.resources[type: 'net'].release
+            end
+            unless g.net_ifs.find_all { |v| v.conf[:type] == 'wlan' }.empty?
+              info "Release wireless network interfaces in #{g.name}"
+              g.resources[type: 'wlan'].release
+            end
+            # Let release messages go through first
+            OmfCommon.el.after(1) do
+              info "Configure resources to leave #{g.name}"
+              g.resources.membership = { leave: g.address }
+            end
           end
 
           OmfCommon.el.after(4) do
@@ -311,9 +324,11 @@ module OmfEc
         OmfEc.experiment.log_metadata("state", "running")
 
         allGroups do |g|
+          info "CONFIGURE #{g.members.size} resources to join group #{g.name}"
+          debug "CONFIGURE #{g.members.keys} to join group #{g.name}"
           g.members.each do |key, value|
             OmfEc.subscribe_and_monitor(key) do |res|
-              info "Configure '#{key}' to join '#{g.name}'"
+              #info "Configure '#{key}' to join '#{g.name}'"
               g.synchronize do
                 g.members[key] = res.address
               end
@@ -321,6 +336,18 @@ module OmfEc
             end
           end
         end
+
+        # For every 100 nodes, increase check interval by 1 second
+        count = allGroups.inject(0) { |c, g| c += g.members.size }
+        interval = count / 100
+        interval = 1 if interval < 1
+        info "TOTAL resources: #{count}. Events check interval: #{interval}."
+
+        OmfCommon.el.every(interval) do
+          EM.next_tick do
+            OmfEc.experiment.process_events rescue nil
+          end
+        end
       end
 
       # Ask the resources which joined the groups I created to leave

data/lib/omf_ec/runner.rb

@@ -301,12 +301,6 @@ 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}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.2.0.pre.2
+  version: 6.2.0
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0.pre.2
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0.pre.2
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -183,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: omf_ec
 rubygems_version: 2.4.2