mamiya 0.0.1.alpha23 → 0.0.1.alpha24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46e8f4b3cd898fb6448e6cd4d5e8161c2fac101b
-  data.tar.gz: d921dadc048b7bfc587ec71a25d2cf14323dbe53
+  metadata.gz: 5cff88034ce82da05b6bbef3f14e01c3d64a0106
+  data.tar.gz: 955b085f2d2ad3911608daf3356569b072c37af1
 SHA512:
-  metadata.gz: d1169ca11bfc342862c8fc46fff5e91423a4d06ef2cab4f80b36275129e4b8f12047719b0459fc513d0e6091d1f43ccaa22834f9fa88ae0696a91e44e53268fc
-  data.tar.gz: b4906b0a1110d80ac1e82f7fecdbe22fc4b782203fdfcb83840cf3ecca4a3126334f02159e3966d93984e06ae556b0afb6c41dddb3786b9af603c924b74d986b
+  metadata.gz: 09ac1bd2fa42fe80d9c7c0c253b387987f1bd65d73036447c1ebe76b3a7b0a35a442652dea295d6c210d8ad8a5ee8311c004822db6adb2315a1824fc1da6551c
+  data.tar.gz: 231d431e2a6ab44a47843712edff9b9389aa0594b87915ef308ee08b7ffe914ba3abb4007cbe772c85ae9f4ceecdde43ec9f4a129bb7020ff82a3c02e51538f5

data/lib/mamiya/agent.rb

@@ -218,7 +218,9 @@ module Mamiya
         if handler.respond_to?(meth)
           handler.send meth
         else
-          logger.debug "Handler #{class_name} doesn't respond to #{meth}, skipping"
+          if config.debug_all_events
+            logger.debug "Handler #{class_name} doesn't respond to #{meth}, skipping"
+          end
         end
       else
         #logger.warn("Discarded event[#{event.user_event}] because we don't handle it")

data/lib/mamiya/agent/task_queue.rb

@@ -5,6 +5,7 @@ require 'thread'
 module Mamiya
   class Agent
     class TaskQueue
+      class Stopped < Exception; end
       GRACEFUL_TIMEOUT = 30
       JOIN_TIMEOUT = 30
 

data/lib/mamiya/logger.rb

@@ -55,6 +55,16 @@ module Mamiya
       @logdev.remove_output(*outputs)
     end
 
+    alias orig_dup dup
+
+    def dup
+      self.orig_dup.tap  do |new_logger|
+        new_logger.instance_eval do
+          @logger = @logger.dup
+        end
+      end
+    end
+
     def with_clean_progname
       self.dup.tap do |new|
         new.progname = nil
@@ -64,9 +74,8 @@ module Mamiya
     def [](progname)
       self.dup.tap do |new_logger|
         new_logger.instance_eval do
-          @logger = @logger.dup
           if @logger.progname && !@logger.progname.empty?
-            @logger.progname += "/#{progname}"
+            @logger.progname = "#{@logger.progname}/#{progname}"
           else
             @logger.progname = progname
           end

data/lib/mamiya/master/agent_monitor.rb

@@ -113,6 +113,12 @@ module Mamiya
         end
 
         @commit_lock.synchronize { 
+          if kwargs[:node]
+            new_statuses = statuses.reject do |name, status|
+              kwargs[:node].include?(name)
+            end
+          end
+
           status_query_th = Thread.new { @master.serf.query(STATUS_QUERY, '', **kwargs) }
           packages_query_th = Thread.new { @master.serf.query(PACKAGES_QUERY, '', **kwargs) }
           status_response = status_query_th.value
@@ -133,12 +139,9 @@ module Mamiya
 
             begin
               resp = JSON.parse(json)
-              if resp.keys.sort == ['packages', 'prereleases']
-                new_statuses[name]['packages'] = resp['packages']
-                new_statuses[name]['prereleases'] = resp['prereleases']
-              else # TODO: Compatibility; should remove soon
-                new_statuses[name]['packages'] = resp
-              end
+
+              new_statuses[name]['packages'] = resp['packages']
+              new_statuses[name]['prereleases'] = resp['prereleases']
             rescue JSON::ParserError => e
               logger.warn "Failed to parse packages from #{name}: #{e.message}"
               next

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.0.1.alpha23"
+  VERSION = "0.0.1.alpha24"
 end

data/spec/master/agent_monitor_spec.rb

@@ -121,7 +121,6 @@ describe Mamiya::Master::AgentMonitor do
       }
     end
 
-
     it "updates status .packages by packages query" do
       expect {
         agent_monitor.refresh
@@ -233,6 +232,97 @@ describe Mamiya::Master::AgentMonitor do
         agent_monitor.refresh(node: 'foo')
       end
     end
+
+    context "with nodes list" do
+      before do
+        stub_serf_queries()
+        agent_monitor.refresh
+
+        allow(serf).to receive(:query) do |query, payload, kwargs={}|
+          expect(payload).to eq ''
+          #expect(kwargs).to eq(node: ['b'])
+          expect(%w(mamiya:status mamiya:packages)).to include(query)
+
+          {'mamiya:status' => status_query_response_part, 'mamiya:packages' => packages_query_response_part}[query]
+        end
+      end
+
+      let(:status_query_response) do
+        {
+          "Acks" => ['a'],
+          "Responses" => {
+            'a' => {"foo" => "bar"}.to_json,
+          },
+        }
+      end
+
+      let(:packages_query_response) do
+        {
+          "Acks" => ['a'],
+          "Responses" => {
+            'a' => {"packages" => {"app" => ['pkg1','pkg2']}, "prereleases" => {"app" => ['pkg2']}}.to_json,
+          },
+        }
+      end
+
+      let(:status_query_response_part) do
+        {
+          "Acks" => ['a'],
+          "Responses" => {
+            'b' => {"foo" => "bar"}.to_json,
+          },
+        }
+      end
+
+      let(:packages_query_response_part) do
+        {
+          "Acks" => ['a'],
+          "Responses" => {
+            'b' => {"packages" => {"app" => ['pkg1']}, "prereleases" => {"app" => ['pkg2']}}.to_json,
+          },
+        }
+      end
+
+      let(:members) do
+        [
+          {
+            "name"=>"a", "status"=>"alive",
+            "addr"=>"x.x.x.x:7676", "port"=>7676,
+            "protocol"=>{"max"=>4, "min"=>2, "version"=>4},
+            "tags"=>{},
+          },
+          {
+            "name"=>"b", "status"=>"alive",
+            "addr"=>"x.x.y.y:7676", "port"=>7676,
+            "protocol"=>{"max"=>4, "min"=>2, "version"=>4},
+            "tags"=>{},
+          },
+        ]
+      end
+
+      it "updates partially" do
+        expect(agent_monitor.statuses['b']).to be_nil
+
+        expect {
+          agent_monitor.refresh(node: ['b'])
+        }.not_to change {
+          [agent_monitor.statuses['a'], agent_monitor.agents['a']]
+        }
+
+        expect(agent_monitor.failed_agents).to eq []
+        expect(agent_monitor.statuses['b']).to eq(
+          {"foo" => "bar", "packages" => {"app" => ['pkg1']}, "prereleases" => {"app" => ['pkg2']}}
+        )
+        expect(agent_monitor.agents['b']).to eq(
+          {
+            "name"=>"b", "status"=>"alive",
+            "addr"=>"x.x.y.y:7676", "port"=>7676,
+            "protocol"=>{"max"=>4, "min"=>2, "version"=>4},
+            "tags"=>{},
+          }
+        )
+      end
+    end
   end
 
   describe "(commiting events)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha23
+  version: 0.0.1.alpha24
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)