beetle 3.3.7 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160267d529bff32ee4ffa817f9b99a66160d66e4aa936821017888dca6418f56
-  data.tar.gz: a9cd48404944b9a4dc8eb6487dcd41dca3147a49394285d11defe22ad82f270f
+  metadata.gz: b64b9ad7d4d36c450c8219f666db52323d1d30e6f741ccb5791469f9f9c7b7a0
+  data.tar.gz: 860d8813af202e5463aa70d2b33466c0cb1d0f0ed8afe7490ae82e106c2cc3f7
 SHA512:
-  metadata.gz: d55f6e1607625de496664e0e2bff9bb36082d7c5dc63dbc4232609e66be03ecf06c213310e621dfe530be5fe5df491bd5fcd54733321a7a6846a80f30a214c49
-  data.tar.gz: a1b3b43d252b82c24e026a401d383b5d5ea80b33237e39f3a41795deaa3583bc5e12ec80ea26db5855d9c6f70ceb14b36d1b9aa976d6f5a406c9c7d33a7d0462
+  metadata.gz: b97d517694c27bfa3bcbb6d7714374b998a6e1268e0012e59a9d8e0c57e7fac0904cf978a9e5dee7c92c03f183c679ad238102704152e1f1115bedcc9280b70a
+  data.tar.gz: 63875a03bf6cd2c0221ce925d9b14d49aae0fbf547a40177ef4eee77a5913894b64df82967c45a3aecc0eff8a7631a8038e4fae1e5b7618dea3a66be030a472d

data/RELEASE_NOTES.rdoc

@@ -1,7 +1,15 @@
 = Release Notes
 
+== Version 3.3.8
+* Avoid needless put call when updating queue policies.
+  It seems the additional call to get the current definition of a policy
+  is to be preferred over relying on the idempotency of the PUT call.
+  This helps when adding a new fresh server to a beetle cluster: import
+  the definitions of one of the existing nodes on the fresh node before
+  actually adding it to the list of servers in the client's beetle config..
+
 == Version 3.3.7
-* incease http api read timeout to handle large server better.
+* Increased default http api read timeout to handle large server better.
 
 == Version 3.3.6
 * Fixed a redis connection leak in gobeetle.

data/lib/beetle/queue_properties.rb

@@ -46,7 +46,8 @@ module Beetle
 
       # no need to worry that the server has the port 5672. Net:HTTP will take care of this. See below.
       request_url = URI("http://#{server}/api/policies/#{vhost}/#{queue_name}_policy")
-      request = Net::HTTP::Put.new(request_url)
+      get_request = Net::HTTP::Get.new(request_url)
+      put_request = Net::HTTP::Put.new(request_url)
 
       # set up queue policy
       definition = {}
@@ -58,19 +59,28 @@ module Beetle
 
       definition["queue-mode"] = "lazy" if options[:lazy]
 
-      request_body = {
+      put_request_body = {
         "pattern" => "^#{queue_name}$",
         "priority" => 1,
         "apply-to" => "queues",
         "definition" => definition,
       }
 
-      response = run_rabbit_http_request(request_url, request) do |http|
-        http.request(request, request_body.to_json)
+      get_response = run_rabbit_http_request(request_url, get_request) do |http|
+        http.request(get_request, nil)
       end
 
-      unless %w(200 201 204).include?(response.code)
-        log_error("Failed to create policy for queue #{queue_name}", response)
+      if get_response.code == "200"
+        response_body = JSON.parse(get_response.body) rescue {}
+        return :ok if put_request_body.all? { |k,v| response_body[k] == v }
+      end
+
+      put_response = run_rabbit_http_request(request_url, put_request) do |http|
+        http.request(put_request, put_request_body.to_json)
+      end
+
+      unless %w(200 201 204).include?(put_response.code)
+        log_error("Failed to create policy for queue #{queue_name}", put_response)
         raise FailedRabbitRequest.new("Could not create policy")
       end
 
@@ -131,7 +141,11 @@ module Beetle
 
     def run_rabbit_http_request(uri, request, &block)
       request.basic_auth(config.user, config.password)
-      request["Content-Type"] = "application/json"
+      if request.class::METHOD == 'GET'
+        request["Accept"] = "application/json"
+      else
+        request["Content-Type"] = "application/json"
+      end
       http = Net::HTTP.new(uri.hostname, config.api_port)
       http.read_timeout = config.rabbitmq_api_read_timeout
       # don't do this in production:

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "3.3.7"
+  VERSION = "3.3.8"
 end

data/test/beetle/queue_properties_test.rb

@@ -41,6 +41,10 @@ module Beetle
     end
 
     test "creates a policy by posting to the rabbitmq if dead lettering is enabled" do
+      stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 404)
+
       stub_request(:put, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
         .with(basic_auth: ['guest', 'guest'])
         .with(:body => {
@@ -56,7 +60,29 @@ module Beetle
       @queue_properties.set_queue_policy!(@server, @queue_name, :lazy => false, :dead_lettering => true, :routing_key => "QUEUE_NAME_dead_letter")
     end
 
+    test "skips the PUT call to rabbitmq if the policy is already defined as desired" do
+      stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 200,
+                   :body => {
+                     "vhost" => "/",
+                     "name" => "QUEUE_NAME_policy",
+                     "pattern" => "^QUEUE_NAME$",
+                     "priority" => 1,
+                     "apply-to" => "queues",
+                     "definition" => {
+                       "dead-letter-routing-key" => "QUEUE_NAME_dead_letter",
+                       "dead-letter-exchange" => ""
+                     }}.to_json)
+
+      @queue_properties.set_queue_policy!(@server, @queue_name, :lazy => false, :dead_lettering => true, :routing_key => "QUEUE_NAME_dead_letter")
+    end
+
     test "creates a policy by posting to the rabbitmq if lazy queues are enabled" do
+      stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 404)
+
       stub_request(:put, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
         .with(basic_auth: ['guest', 'guest'])
         .with(:body => {
@@ -72,6 +98,10 @@ module Beetle
     end
 
     test "raises exception when policy couldn't successfully be created" do
+      stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 404)
+
       stub_request(:put, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
         .with(basic_auth: ['guest', 'guest'])
         .to_return(:status => [405])
@@ -82,6 +112,10 @@ module Beetle
     end
 
     test "can optionally specify a message ttl" do
+      stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 404)
+
       stub_request(:put, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
         .with(basic_auth: ['guest', 'guest'])
         .with(:body => {
@@ -99,6 +133,10 @@ module Beetle
     end
 
     test "properly encodes the vhost from the configuration" do
+      stub_request(:get, "http://localhost:15672/api/policies/foo%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 404)
+
       stub_request(:put, "http://localhost:15672/api/policies/foo%2F/QUEUE_NAME_policy")
         .with(basic_auth: ['guest', 'guest'])
         .with(:body => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.3.8
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny