omf_rc_shm 0.1.19 → 0.1.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDY4MDQwYTJkMDc0MzZiZmIyZjhjOGIzYzhhNDQwM2QzNGFkZTMwNw==
+    YjNiMWFjMTE5MTU1OTFhZjMwM2FjMThiNDM5NzJmNGY3YWRhMWM1Zg==
   data.tar.gz: !binary |-
-    MDFkMjNiMDEwZjY5N2NmYjZlODYzNDBmZDIwYzZkMDE5NDRhYTVkYw==
+    NTlkYWE4ZmRkMmRkZjgyOTcyZjFlZmRhMTJiNzRiYWM2ZmMyZjk3MQ==
 SHA512:
   metadata.gz: !binary |-
-    NTM3NDBjYzc1OGYwYzlmNzFmN2EwOGJjYmNiYTgxZTBmZDhiMmYxNzc3Nzc0
-    OGEyNDQyM2Q0M2YyMTQ2NzBhNzJiY2NhNzg3OGMyYmE3NThjZjM3ZjE2YmUx
-    MWEwMDIwNTg1ZDdjMDM1NGRiOTVkMWIzYTMxMzQyM2JiZjM4ZWI=
+    MjJiMGRiYzA5YTE4NjljMTk2NTU1YTJjNzdlZGIxMDU3OGE1ZGFlYjdkY2Qx
+    MDcwMTc5ZjdiYTNmYzdmMzM5Mjg5ODY3ZGY1MmU2MGM3YmQ1ZGVmOTAyYjE0
+    MDY4Nzk5NTViNTZmZDcyNjQ0ZmMwMmIyNjJiOWNjODI2YTdlYmQ=
   data.tar.gz: !binary |-
-    M2U4ZTRhNTc0MzU5OTdlMmY0MjkyNzgxY2UxYWE2NGYyZjBkNDQ4Mjk3NjBl
-    MzU5ODY4OWU0NTNhN2E4OGIyNzY0NzQyYjMzZTdkOGUwZDVmOWM4NGMxOGZm
-    ZmQwMDcxNGFiNDI0NmE0MjNmMmIzY2QyNWEzYjY1M2FiOTczNDU=
+    YTI1OGUwMTNhNWUwMjBlYmM1ODIyN2E1M2U5OWJkMDI5NWUyYzZmM2FlZWRm
+    MzJkYTUwMTlmMDllZmExNGQ3ZDg4ZjM4YzMyMzUzMTFhM2FhOTZjZjcwNDNk
+    NGM3YzRiOGFlYWM2M2E5MjNkZjRmNjJkNTlhMmI4MGQ0NTQyMjM=

data/bin/cronjob_app_wrapper

@@ -1,6 +1,26 @@
 #!/usr/bin/env ruby
 
-stdout_f, stderr_f, pid_f, timeout, kill_sig, *cmd = *ARGV
+require 'oml4r'
+
+# Get the Mac address and node ID
+ifconfig = '/sbin/ifconfig br0'
+mac_address = `#{ifconfig}`.match(/HWaddr (\h*\:\h*\:\h*\:\h*:\h*:\h*)/)[1]
+node_id = (mac_address.split(':')[4]+mac_address.split(':')[5]).hex.to_s.rjust(5,'0')
+
+odomain, ocollect, stdout_f, stderr_f, pid_f, timeout, kill_sig, *cmd = *ARGV
+
+# Record into OML
+class InfoMP < OML4R::MPBase
+  name  :app_info
+  param :app_path
+  param :app_start, :type => :double
+  param :app_duration, :type => :double
+  param :app_param
+end
+opts = {:domain => odomain, :collect => ocollect, :appName => 'cronwrap', :nodeID => node_id}
+OML4R::init(nil, opts)
+InfoMP.inject(cmd[0], Time.now.to_i, timeout.to_i, cmd.drop(1).join(' '))
+OML4R::close()
 
 pid = Process.spawn(cmd.join(" "), out: [stdout_f, "a"], err: [stderr_f, "a"])
 

data/config/config.yml

@@ -23,14 +23,6 @@
   # The top-up value in second for the watchdog timer (must be lower than timeout value)
   # Comment that line to disable the watchdog timer
   :watchdog_timer: 15
-  # Ensure local time is synced with NTP time before doing anything else.
-  # Local time is considered synced if it is within 'time_sync_maxdrift' second drift of NTP time.
-  # It will try 'time_sync_tries' times to do time sync using the command 'time_sync_cmd'.
-  # Each failed sync attempt will trigger a random sleep up to 'time_sync_interval' second before the next attempt.
-  :time_sync_tries: 20
-  :time_sync_maxdrift: 600
-  :time_sync_interval: 20
-  :time_sync_cmd: "/usr/bin/ntpdate -b -t 10 -u au.pool.ntp.org"
 
 :add_default_factories: false # Not loading default type factories
 

data/config/scheduled_app.rb

@@ -20,4 +20,8 @@ defApplication("my_app_name") do |a|
       }
     ]
   }
+  a.instrument_launch = {
+    domain: "my_experiment_metadata",
+    url: "file:/tmp/foo.oml"
+  }
 end

data/lib/omf_rc/resource_proxy/scheduled_application.rb

@@ -106,6 +106,7 @@ module OmfRc::ResourceProxy::ScheduledApplication
   property :app_log_dir, :default => '/tmp/omf_scheduled_app'
   property :ruby_path
   property :parent_id
+  property :instrument_launch, :default => Hashie::Mash.new(domain: 'null', url: 'file:/dev/null')
 
   # @!macro group_hook
   #
@@ -335,7 +336,8 @@ module OmfRc::ResourceProxy::ScheduledApplication
 
         app_wrapper_path = File.expand_path("#{File.dirname(__FILE__)}/../../../bin/cronjob_app_wrapper")
 
-        cmd = "#{app_wrapper_path} #{stdout_file} #{stderr_file} #{pid_file} #{res.property.timeout} #{res.property.timeout_kill_signal} #{res.build_command_line}"
+        cmd = "#{app_wrapper_path} #{res.property.instrument_launch.domain} #{res.property.instrument_launch.url}"
+        cmd = "#{cmd} #{stdout_file} #{stderr_file} #{pid_file} #{res.property.timeout} #{res.property.timeout_kill_signal} #{res.build_command_line}"
         cmd = "#{res.property.ruby_path} #{cmd}" if res.property.ruby_path
 
         info "Adding cron job for '#{res.property.app_id}' with schedule '#{cron_schedule}' and command '#{cmd}'"

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -7,10 +7,6 @@ module OmfRc::ResourceProxy::ShmNode
   property :oml_uri
   property :ruby_path
   property :watchdog_timer, :default => nil
-  property :time_sync_tries, :default => nil
-  property :time_sync_maxdrift, :default => 600
-  property :time_sync_interval, :default => 20
-  property :time_sync_cmd, :default => "/usr/bin/ntpdate -b -t 10 -u au.pool.ntp.org"
 
   request :cron_jobs do |node|
     node.children.find_all { |v| v.type =~ /scheduled_application/ }.map do |v|
@@ -19,35 +15,7 @@ module OmfRc::ResourceProxy::ShmNode
   end
 
   hook :after_initial_configured do |node|
-		# 1) Do not continue unless we have some 'ok' time sync!
-    unless node.property.time_sync_tries.nil?
-			require 'net/ntp'
-			info "Option 'time_sync_tries' is set. Continue only if local time is accurate, will try to sync #{node.property.time_sync_tries} times with random wait of up to #{node.property.time_sync_interval}s."
-      dt = node.property.time_sync_maxdrift.to_i + 1
-      lt = rt = t = 0
-      while dt >node.property.time_sync_maxdrift.to_i do
-        t = t+1
-        begin
-          lt = Time.now ; rt = Net::NTP.get.time ; dt = (lt-rt).abs
-          if dt > node.property.time_sync_maxdrift.to_i
-            info "Time sync try #{t} - Local: #{lt.to_i} - NTP: #{rt.to_i} - Diff: #{dt} - (sync: #{node.property.time_sync_cmd.to_s})"
-            res = `#{node.property.time_sync_cmd.to_s}`
-            sleep(rand(node.property.time_sync_interval.to_i))
-          else
-            break
-          end
-        rescue Exception => e
-          info "Time sync try #{t} - Cannot contact NTP server (#{e})"
-          sleep(rand(node.property.time_sync_interval.to_i))
-        end
-        if t > node.property.time_sync_tries.to_i
-          info "Time sync FAILED! EXITING NOW!"
-          exit
-        end
-      end
-  		info "Time sync OK - Local: #{lt.to_i} - NTP: #{rt.to_i} - Diff: #{dt}"
-		end
-		# 2) if present, load and set default app schedule
+		# 1) if present, load and set default app schedule
     unless node.request_app_definition_file.nil?
       OmfRcShm.app.load_definition(node.request_app_definition_file)
       info "Loaded scheduled app definition from '#{node.request_app_definition_file}'"
@@ -60,7 +28,7 @@ module OmfRc::ResourceProxy::ShmNode
         OmfCommon.el.after(5) { s_app.configure_state(:scheduled) }
       end
     end
-    # 3) if required, start the watchdog timer and periodically top it
+    # 2) if required, start the watchdog timer and periodically top it
     unless node.property.watchdog_timer.nil? 
       info "Watchdog Timer started with interval: #{node.property.watchdog_timer}"
       OmfRcShm.app.watchdog = File.open('/dev/watchdog', 'w')
@@ -69,7 +37,7 @@ module OmfRc::ResourceProxy::ShmNode
         OmfRcShm.app.watchdog.flush
       end
     end
-		# 4) Finally display our SHM Node ID:
+		# 3) Finally display our SHM Node ID:
 		info "SHM Node ID: #{node.uid}"
   end
 

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler