aerospike 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ec864bf7ffd197e9badf516904193eb4e6260ac257335facc8e3df058307384
-  data.tar.gz: '09fe60ac38789318a8739439d99490810129056614a479cafcecce01803c1bff'
+  metadata.gz: 61a847f7addabd7b9e7bf77326537e94cc437e99041e664fcd3496ffb7cba843
+  data.tar.gz: '033279bbc6e8410e585ace808aabf4ae469a4bd233c1d80f10c2a488894fc5ad'
 SHA512:
-  metadata.gz: 0cf87d41d1b4b04121bbf8589974bfa931dea4ec96f17bdf94db737797afb60dc05932f6f56eed0b8f138bb6684a45eb4974c489e878ed5a949209734bf2dae7
-  data.tar.gz: 65bccc5b55db802415541ae4b5307020477344bb2d771d7cc84b9554192fa97f76874c7538d2c62dbd0025780d91bd91c8dfc1e0143c2bd3753f092d1c391885
+  metadata.gz: 5b19a2653c7464e185a0d50faff2ac735b990188eee1021627d6eaab55020130797f14b20eb1f98a79a7cc846962d0d45ba47cd03f8e48ddafba48de6b4ac85f
+  data.tar.gz: b550a9058c7c2eed384f1b3635a6f56836aa250248bd48837d72e1ac466a6bb8b06c051122b750e5ccc9f61c7f5736bad12627742e91cf61f215188d1e3dfce8

data/CHANGELOG.md

@@ -4,10 +4,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.10.0] - 2019-05-10
+
+* **New Features**
+  * Add support for LB discovery / seeding. Thanks to [@filiptepper](https://github.com/filiptepper)! [[#80](https://github.com/aerospike/aerospike-client-ruby/issues/80)]
+
 ## [2.9.1] - 2019-04-03
 
 * **Bug Fixes**
-  * Query fails if one or more cluster nodes do not have records in the set [[#77](https://github.com/aerospike/aerospike-client-ruby/issue/77)]
+  * Query fails if one or more cluster nodes do not have records in the set [[#77](https://github.com/aerospike/aerospike-client-ruby/issues/77)]
 
 * **Updates**
   * Change admin message version to 2 (from 0)
@@ -20,10 +25,10 @@ All notable changes to this project will be documented in this file.
   * Add INFINITY and WILDCARD values for use in CDT map/list comparators. [AER-5945]
 
 * **Bug Fixes**
-  * Default policies set on Client instance do not get applied [[#74](https://github.com/aerospike/aerospike-client-ruby/issue/74)]
+  * Default policies set on Client instance do not get applied [[#74](https://github.com/aerospike/aerospike-client-ruby/issues/74)]
 
 * **Updates**
-  * *BREAKING CHANGE*: Change default for send_key write policy to false [[#73](https://github.com/aerospike/aerospike-client-ruby/issue/73)]
+  * *BREAKING CHANGE*: Change default for send_key write policy to false [[#73](https://github.com/aerospike/aerospike-client-ruby/issues/73)]
   * Support truncate info command argument "lut=now" for servers that require it. [AER-5955]
 
 ## [2.8.0] - 2018-08-06

data/lib/aerospike/node_validator.rb

@@ -31,42 +31,53 @@ module Aerospike
       @cluster_name = cluster_name
       @tls_options = tls_options
 
-      set_aliases(host)
-      set_address(timeout)
+      @aliases = []
+
+      resolve(host.name).each do |address|
+        @aliases += get_hosts(address)
+      end
     end
 
     private
 
-    def set_aliases(host)
-      addresses = resolve(host.name)
-      @aliases = addresses.map { |addr| Host.new(addr, host.port, host.tls_name) }
-      Aerospike.logger.debug("Node Validator found #{aliases.length} addresses for host #{host}: #{@aliases}")
-    end
+    def get_hosts(address)
+      aliases = [get_alias(address, host.port)]
+
+      begin
+        conn = Cluster::CreateConnection.(@cluster, Host.new(address, host.port, host.tls_name))
+
+        commands = %w[node build features]
+        commands << address_command unless is_loopback?(address)
+
+        info_map = Info.request(conn, *commands)
+
+        if node_name = info_map['node']
+          @name = node_name
+
+          # Set features
+          if features = info_map['features']
+            @features = features.split(';').to_set
+          end
 
-    def set_address(timeout)
-      @aliases.each do |aliass|
-        begin
-          conn = Cluster::CreateConnection.(@cluster, @host)
-
-          info_map = Info.request(conn, 'node', 'build', 'features')
-          if node_name = info_map['node']
-            @name = node_name
-
-            # Set features
-            if features = info_map['features']
-              @features = features.split(';').to_set
-            end
-
-            # Check new info protocol support for >= 2.6.6 build
-            if build_version = info_map['build']
-              v1, v2, v3 = parse_version_string(build_version)
-              @use_new_info = v1.to_i > 2 || (v1.to_i == 2 && (v2.to_i > 6 || (v2.to_i == 6 && v3.to_i >= 6)))
-            end
+          # Check new info protocol support for >= 2.6.6 build
+          if build_version = info_map['build']
+            v1, v2, v3 = parse_version_string(build_version)
+            @use_new_info = v1.to_i > 2 || (v1.to_i == 2 && (v2.to_i > 6 || (v2.to_i == 6 && v3.to_i >= 6)))
           end
-        ensure
-          conn.close if conn
         end
+
+        unless is_loopback?(address)
+          aliases = info_map[address_command].split(',').map { |address| get_alias(*address.split(':')) }
+        end
+      ensure
+        conn.close if conn
       end
+
+      aliases.map { |al| Host.new(al[:address], al[:port], host.tls_name) }
+    end
+
+    def get_alias(address, port)
+      { address: address, port: port }
     end
 
     def resolve(hostname)
@@ -79,6 +90,15 @@ module Aerospike
       end
     end
 
+    def address_command
+      @address_command ||= @cluster.tls_enabled? ? 'service-tls-std': 'service-clear-std'
+    end
+
+    def is_loopback?(address)
+      info = Addrinfo.ip(address)
+      info.ipv4_loopback? || info.ipv6_loopback?
+    end
+
     def is_ip?(hostname)
       !!((hostname =~ Resolv::IPv4::Regex) || (hostname =~ Resolv::IPv6::Regex))
     end
@@ -91,4 +111,4 @@ module Aerospike
       raise Aerospike::Exceptions::Parse.new("Invalid build version string in Info: #{version}")
     end
   end # class
-end #module
+end # module

data/lib/aerospike/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Aerospike
-  VERSION = "2.9.1"
+  VERSION = "2.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack