rightscale-nanite-dev 0.4.1.17 → 0.4.1.22

data/Rakefile

@@ -11,10 +11,10 @@ require 'rake/clean'
 require 'lib/nanite'
 
 GEM = "rightscale-nanite-dev"
-AUTHOR = "Ezra Zygmuntowicz"
-EMAIL = "ezra@engineyard.com"
-HOMEPAGE = "http://github.com/ezmobius/nanite"
-SUMMARY = "self assembling fabric of ruby daemons"
+AUTHOR = "RightScale, Inc."
+EMAIL = "support@rightscale.com"
+HOMEPAGE = "http://github.com/rightscale/nanite"
+SUMMARY = "Self-assembling fabric of ruby daemons; fork of ezmobius/nanite."
 
 Dir.glob('tasks/*.rake').each { |r| Rake.application.add_import r }
 
@@ -73,4 +73,4 @@ task :docs => :rdoc do
   else 
     sh 'firefox rdoc/index.html'
   end
-end
+end

data/lib/nanite.rb

@@ -39,7 +39,7 @@ require 'nanite/security/static_certificate_store'
 require 'nanite/serializer'
 
 module Nanite
-  VERSION = '0.4.1.17' unless defined?(Nanite::VERSION)
+  VERSION = '0.4.1.22' unless defined?(Nanite::VERSION)
 
   class MapperNotRunning < StandardError; end
 

data/lib/nanite/actor.rb

@@ -57,15 +57,21 @@ module Nanite
     end # ClassMethods     
     
     module InstanceMethods
-      # send nanite request to another agent (through the mapper)
+      # Send nanite request to another agent (through the mapper)
       def request(*args, &blk)
         MapperProxy.instance.request(*args, &blk)
       end
       
+      # Send nanite push to another agent (through the mapper)
       def push(*args)
         MapperProxy.instance.push(*args)
       end
+
+      # Send nanite tag query to mapper
+      def query_tags(*args, &blk)
+        MapperProxy.instance.query_tags(*args, &blk)
+      end
     end # InstanceMethods
     
   end # Actor
-end # Nanite
+end # Nanite

data/lib/nanite/agent.rb

@@ -99,7 +99,7 @@ module Nanite
       Log.init(@identity, @options[:log_path])
       Log.level = @options[:log_level] if @options[:log_level]
       @serializer = Serializer.new(@options[:format])
-      @status_proc = lambda { parse_uptime(`uptime 2> /dev/null`) rescue 'no status' }
+      @status_proc ||= lambda { parse_uptime(`uptime 2> /dev/null`) rescue 'no status' }
       pid_file = PidFile.new(@identity, @options)
       pid_file.check
       if @options[:daemonize]
@@ -163,15 +163,18 @@ module Nanite
       if @options[:daemonize]
         @options[:log_path] = (@options[:log_dir] || @options[:root] || Dir.pwd)
       end
-      
+
+      @callbacks = opts[:callbacks]
+      @status_proc = opts[:status_proc]
+
+      # note the return statement in case of identity being known; ensure all
+      # needed configurations occur before the the following line.
       return @identity = "nanite-#{@options[:identity]}" if @options[:identity]
       token = Identity.generate
       @identity = "nanite-#{token}"
       File.open(File.expand_path(File.join(@options[:root], 'config.yml')), 'w') do |fd|
         fd.write(YAML.dump(custom_config.merge(:identity => token)))
       end
-
-      @callbacks = options[:callbacks]      
     end
 
     def load_actors
@@ -230,7 +233,7 @@ module Nanite
           receive(serializer.load(msg))
         rescue Exception => e
           Nanite::Log.error("RECV #{e.message}")
-          callbacks[:exception].call(e, msg, self) rescue nil if callbacks[:exception]
+          callbacks[:exception].call(e, msg, self) rescue nil if callbacks && callbacks[:exception]
         end
       end
     end

data/lib/nanite/cluster.rb

@@ -33,7 +33,7 @@ module Nanite
           Nanite::Log.info("RECV #{reg.to_s}")
           nanites[reg.identity] = { :services => reg.services, :status => reg.status, :tags => reg.tags, :timestamp => Time.now.utc.to_i }
           reaper.register(reg.identity, agent_timeout + 1) { nanite_timed_out(reg.identity) }
-          callbacks[:register].call(reg.identity, mapper) if callbacks[:register]
+          callbacks[:register].call(reg.identity, mapper) if callbacks && callbacks[:register]
         else
           Nanite::Log.warn("RECV NOT AUTHORIZED #{reg.to_s}")
         end
@@ -41,7 +41,7 @@ module Nanite
         Nanite::Log.info("RECV #{reg.to_s}")
         reaper.unregister(reg.identity)
         nanites.delete(reg.identity)
-        callbacks[:unregister].call(reg.identity, mapper) if callbacks[:unregister]
+        callbacks[:unregister].call(reg.identity, mapper) if callbacks && callbacks[:unregister]
       when TagUpdate
         Nanite::Log.info("RECV #{reg.to_s}")
         nanites.update_tags(reg.identity, reg.new_tags, reg.obsolete_tags)
@@ -55,7 +55,7 @@ module Nanite
       if nanite && timed_out?(nanite)
         Nanite::Log.info("Nanite #{token} timed out")
         nanite = nanites.delete(token)
-        callbacks[:timeout].call(token, mapper) if callbacks[:timeout]
+        callbacks[:timeout].call(token, mapper) if callbacks && callbacks[:timeout]
         true
       end
     end
@@ -104,7 +104,9 @@ module Nanite
       Nanite::Log.debug("RECV #{request.to_s}")
       case request
       when Push
-        mapper.send_push(request)
+        if mapper.send_push(request) == false
+          Nanite::Log.info("RECV - No target found for #{request.to_s}")
+        end
       when Request
         intm_handler = lambda do |result, job|
           result = IntermediateMessage.new(request.token, job.request.from, mapper.identity, nil, result)
@@ -118,10 +120,21 @@ module Nanite
         end
 
         if ok == false
+          Nanite::Log.info("RECV - No target found for #{request.to_s}")
           forward_response(result, request.persistent)
         end
       when TagQuery
-        results = nanites.nanites_for(request)
+        results = {}
+        results = nanites.nanites_for(request) if request.tags && !request.tags.empty?
+        if request.agent_ids && !request.agent_ids.empty?
+          request.agent_ids.each do |nanite_id|
+            if !results.include?(nanite_id)
+              if nanite = nanites[nanite_id]
+                results[nanite_id] = nanite
+              end
+            end
+          end
+        end
         result = Result.new(request.token, request.from, results, mapper.identity)
         forward_response(result, request.persistent)
       end
@@ -174,12 +187,17 @@ module Nanite
 
     # returns all nanites that provide the given service
     def nanites_providing(request, include_timed_out)
-      nanites.nanites_for(request).delete_if do |nanite, info|
-        if res = !include_timed_out && timed_out?(info)
-          Nanite::Log.debug("Ignoring timed out nanite #{nanite} in target selection - last seen at #{info[:timestamp]}")
-        end
-        res
-      end
+      # FIXME: Not filtering out results for now to alleviate issue with 
+      # overloaded agents not pinging in a timely fashion
+      # Put that code back once agents behave properly
+      nanites.nanites_for(request)
+
+      # nanites.nanites_for(request).delete_if do |nanite, info|
+      #  if res = !include_timed_out && timed_out?(info)
+      #    Nanite::Log.debug("Ignoring timed out nanite #{nanite} in target selection - last seen at #{info[:timestamp]}")
+      #  end
+      #  res
+      # end
     end
 
     def setup_queues
@@ -196,7 +214,7 @@ module Nanite
           handle_ping(ping)
         rescue Exception => e
           Nanite::Log.error("RECV [ping] #{e.message}")
-          callbacks[:exception].call(e, ping, mapper) rescue nil if callbacks[:exception]
+          callbacks[:exception].call(e, ping, mapper) rescue nil if callbacks && callbacks[:exception]
         end
       end
       hb_fanout = amq.fanout('heartbeat', :durable => true)
@@ -213,7 +231,7 @@ module Nanite
           register(serializer.load(msg))
         rescue Exception => e
           Nanite::Log.error("RECV [register] #{e.message}")
-          callbacks[:exception].call(e, msg, mapper) rescue nil if callbacks[:exception]
+          callbacks[:exception].call(e, msg, mapper) rescue nil if callbacks && callbacks[:exception]
         end
       end
       reg_fanout = amq.fanout('registration', :durable => true)
@@ -230,7 +248,7 @@ module Nanite
           handle_request(serializer.load(msg))
         rescue Exception => e
           Nanite::Log.error("RECV [request] #{e.message}")
-          callbacks[:exception].call(e, msg, mapper) rescue nil if callbacks[:exception]
+          callbacks[:exception].call(e, msg, mapper) rescue nil if callbacks && callbacks[:exception]
         end
       end
       req_fanout = amq.fanout('request', :durable => true)

data/lib/nanite/mapper.rb

@@ -299,7 +299,7 @@ module Nanite
           job_warden.process(msg)
         rescue Exception => e
           Nanite::Log.error("RECV [result] #{e.message}")
-          callbacks[:exception].call(e, msg, mapper) rescue nil if callbacks[:exception]          
+          callbacks[:exception].call(e, msg, mapper) rescue nil if callbacks && callbacks[:exception]          
         end
       end
     end

data/lib/nanite/mapper_proxy.rb

@@ -41,6 +41,7 @@ module Nanite
       amqp.fanout('request', :no_declare => options[:secure]).publish(serializer.dump(request))
     end    
 
+    # Send push to given agent through the mapper
     def push(type, payload = '', opts = {})
       raise "Mapper proxy not initialized" unless identity && options
       push = Push.new(type, payload, opts)
@@ -51,6 +52,17 @@ module Nanite
       amqp.fanout('request', :no_declare => options[:secure]).publish(serializer.dump(push))
     end
 
+    # Send tag query to mapper
+    def query_tags(opts, &blk)
+      raise "Mapper proxy not initialized" unless identity && options
+      tag_query = TagQuery.new(identity, opts)
+      tag_query.token = Identity.generate
+      tag_query.persistent = opts.key?(:persistent) ? opts[:persistent] : options[:persistent]      
+      pending_requests[tag_query.token] = { :result_handler => blk }
+      Nanite::Log.info("SEND #{tag_query.to_s}")
+      amqp.fanout('request', :no_declare => options[:secure]).publish(serializer.dump(tag_query))
+    end
+
     # Update tags registered by mapper for agent
     def update_tags(new_tags, obsolete_tags)
       raise "Mapper proxy not initialized" unless identity && options

data/lib/nanite/packets.rb

@@ -219,24 +219,35 @@ module Nanite
   #
   # Options:
   # from  is sender identity
-  # tags  list of tags that each agent in the result must match
+  # opts  Hash of options, two options are supported, at least one must be set:
+  #       :tags is an array of tags defining a query that returned agents tags must match
+  #       :agent_ids is an array of agents whose tags should be returned
   class TagQuery < Packet
 
-    attr_accessor :from, :tags
+    attr_accessor :from, :token, :agent_ids, :tags, :persistent
 
-    def initialize(from, tags, size=nil)
-      @from = from
-      @tags = tags
-      @size = size
+    def initialize(from, opts, size=nil)
+      @from       = from
+      @token      = opts[:token]
+      @agent_ids  = opts[:agent_ids]
+      @tags       = opts[:tags]
+      @persistent = opts[:persistent]
+      @size       = size
     end
 
     def self.json_create(o)
       i = o['data']
-      new(i['from'], i['tags'], o['size'])
+      new(i['from'], { :token => i['token'], :agent_ids => i['agent_ids'],
+                       :tags => i['tags'],   :persistent => i['persistent'] },
+                     o['size'])
     end
 
     def to_s(filter=nil)
-      "#{super} <#{token}> #{type} from #{id_to_s(from)}, tags #{tags.inspect}"
+      log_msg = "#{super} <#{token}>"
+      log_msg += " from #{id_to_s(from)}" if filter.nil? || filter.include?(:from)
+      log_msg += " agent_ids #{agent_ids.inspect}" 
+      log_msg += " tags: #{tags.inspect}" 
+      log_msg
     end
   end
 

data/lib/nanite/security/secure_serializer.rb

@@ -45,25 +45,20 @@ module Nanite
     
     # Unserialize data using certificate store
     def self.load(json)
-      begin
-        raise "Missing certificate store" unless @store
-        raise "Missing certificate" unless @cert || !@encrypt
-        raise "Missing certificate key" unless @key || !@encrypt
-        data = JSON.load(json)
-        sig = Signature.from_data(data['signature'])
-        certs = @store.get_signer(data['id'])
-        raise "Could not find a cert for signer #{data['id']}" unless certs
-        certs = [ certs ] unless certs.respond_to?(:any?)
-        raise "Failed to check signature for signer #{data['id']}" unless certs.any? { |c| sig.match?(c) }
-        jsn = data['data']
-        if jsn && @encrypt && data['encrypted']
-          jsn = EncryptedDocument.from_data(jsn).decrypted_data(@key, @cert)
-        end
-        JSON.load(jsn) if jsn
-      rescue Exception => e
-        Nanite::Log.error("Loading of secure packet failed: #{e.message}\n#{e.backtrace.join("\n")}")
-        raise
+      raise "Missing certificate store" unless @store
+      raise "Missing certificate" unless @cert || !@encrypt
+      raise "Missing certificate key" unless @key || !@encrypt
+      data = JSON.load(json)
+      sig = Signature.from_data(data['signature'])
+      certs = @store.get_signer(data['id'])
+      raise "Could not find a cert for signer #{data['id']}" unless certs
+      certs = [ certs ] unless certs.respond_to?(:any?)
+      raise "Failed to check signature for signer #{data['id']}" unless certs.any? { |c| sig.match?(c) }
+      jsn = data['data']
+      if jsn && @encrypt && data['encrypted']
+        jsn = EncryptedDocument.from_data(jsn).decrypted_data(@key, @cert)
       end
+      JSON.load(jsn) if jsn
     end
        
   end

data/lib/nanite/serializer.rb

@@ -6,7 +6,7 @@ module Nanite
       def initialize(action, packet, serializers, msg = nil)
         @action, @packet = action, packet
         msg = ":\n#{msg}" if msg && !msg.empty?
-        super("Could not #{action} #{packet.inspect} using #{serializers.inspect}#{msg}")
+        super("Could not #{action} packet using #{serializers.inspect}: #{msg}")
       end
     end # SerializationError
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rightscale-nanite-dev
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.17
+  version: 0.4.1.22
 platform: ruby
 authors: 
-- Ezra Zygmuntowicz
+- RightScale, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,8 +22,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.6.0
     version: 
-description: self assembling fabric of ruby daemons
-email: ezra@engineyard.com
+description: Self-assembling fabric of ruby daemons; fork of ezmobius/nanite.
+email: support@rightscale.com
 executables: 
 - nanite-agent
 - nanite-mapper
@@ -79,7 +79,7 @@ files:
 - bin/nanite-agent
 - bin/nanite-mapper
 has_rdoc: true
-homepage: http://github.com/ezmobius/nanite
+homepage: http://github.com/rightscale/nanite
 licenses: []
 
 post_install_message: 
@@ -105,6 +105,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: self assembling fabric of ruby daemons
+summary: Self-assembling fabric of ruby daemons; fork of ezmobius/nanite.
 test_files: []