aerospike 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccefb4dd82c2d6d15f9f0eac08d32acceacf2da1d93c8ca3a462f4c7e4e10e95
-  data.tar.gz: f133ccde7da4ea553d933a30c367ecf2a354c2e85ecce0b141c2071f94702237
+  metadata.gz: 2cf4004182c5166b136433e8be338b9187718684c2783808d18b3ed31f1dbd17
+  data.tar.gz: 3a18cdde5294fb88ee0d4d710fb870c29db3273f5e29bd2d2ea92fd824857f00
 SHA512:
-  metadata.gz: e9baa1554bad7b3f3f8625940ee2e62f08b7185a662401757b8b172d7b9734427245fd8a18fc2aaeb7e4a90c15f3fa3f2346bfc53cce41efe03c15794b63a01c
-  data.tar.gz: 52be62b23c582cdcc7fd12c5961c7ed82847a57b90bf8aea88a56580c7e05c1c416a0a51f7b8e170afde63763560a6acfa4200b95917ee5bc6542ae028954aec
+  metadata.gz: ab75f0c1d0d57c37f3d3f16966a27017b706067e414306c25a3388ad4a02571cdb18b1f019d67472e35386ad659db1d23d8685664ea6a7f2279e904b4c52383b
+  data.tar.gz: 501dabb13c9eb471e83cbda40aa22f2df7ae7e2c6083d447917a02e71017b9b64abe4bbff37798ef2517bced052c17347a109c842b97ab6b16f921939c6ebe23

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+v2.6.0 / 2018-03-27
+===================
+
+* **New Features**
+  * Support for peers protocol for cluster discovery. Requires Aerospike server version 3.10 or later. Thanks to [@wallin](https://github.com/wallin) of [castle.io](https://castle.io/)! [[#59](https://github.com/aerospike/aerospike-client-ruby/pull/59)]
+  * TLS encryption support for client <-> server connections. Requires Aerospike Enterprise Edition version 3.11 or later. Thanks to [@wallin](https://github.com/wallin) of [castle.io](https://castle.io/)! [[#59](https://github.com/aerospike/aerospike-client-ruby/pull/59)]
+
+* **Bug Fixes**
+  * Fix min./max. boundary check for Integer bin values and improve performance. Thanks to [@wallin](https://github.com/wallin) of [castle.io](https://castle.io/)! [[#60](https://github.com/aerospike/aerospike-client-ruby/pull/60)]
+
+* **Updates**
+  * Update minimum required Ruby version to v2.3.
+
 v2.5.1 / 2018-01-25
 ===================
 

data/README.md

@@ -7,7 +7,7 @@
 
 An Aerospike library for Ruby.
 
-This library is compatible with Ruby 2.2+ and supports Linux, Mac OS X and various other BSDs.
+This library is compatible with Ruby 2.3+ and supports Linux, Mac OS X and various other BSDs.
 
 - [Usage](#Usage)
 - [Prerequisites](#Prerequisites)
@@ -61,7 +61,7 @@ Details about the API are available in the [`docs`](docs) directory.
 <a name="Prerequisites"></a>
 ## Prerequisites
 
-[Ruby](https://ruby-lang.org) version v2.2+ is required.
+[Ruby](https://ruby-lang.org) version v2.3+ is required.
 
 Aerospike Ruby client implements the wire protocol, and does not depend on the C client.
 It is thread friendly.
@@ -81,7 +81,7 @@ Supported operating systems:
 
 ### Installation from source
 
-1. Install Ruby 2.2+
+1. Install Ruby 2.3+
 2. Install RubyGems
 3. Install Bundler: ```gem install bundler```
 4. Install dependencies: ```bundler install```

data/lib/aerospike.rb

@@ -1,12 +1,14 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
-# the License at http:#www.apache.org/licenses/LICENSE-2.0
+# the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -29,7 +31,9 @@ require 'aerospike/utils/pool'
 require 'aerospike/utils/packer'
 require 'aerospike/utils/unpacker'
 require 'aerospike/utils/buffer'
+require 'aerospike/utils/string_parser'
 require 'aerospike/host'
+require 'aerospike/host/parse'
 require 'aerospike/loggable'
 require 'aerospike/record'
 require 'aerospike/result_code'
@@ -77,13 +81,36 @@ require 'aerospike/policy/consistency_level'
 require 'aerospike/policy/commit_level'
 require 'aerospike/policy/admin_policy'
 
-require 'aerospike/cluster/connection'
-require 'aerospike/cluster/cluster'
-require 'aerospike/cluster/node_validator'
+require 'aerospike/socket/base'
+require 'aerospike/socket/ssl'
+require 'aerospike/socket/tcp'
+
+require 'aerospike/connection/authenticate'
+require 'aerospike/connection/create'
+
+require 'aerospike/cluster'
+require 'aerospike/cluster/create_connection'
 require 'aerospike/cluster/partition'
-require 'aerospike/cluster/node'
+require 'aerospike/cluster/find_node'
 require 'aerospike/cluster/partition_tokenizer_new'
 require 'aerospike/cluster/partition_tokenizer_old'
+require 'aerospike/node'
+require 'aerospike/node/generation'
+require 'aerospike/node/refresh/failed'
+require 'aerospike/node/refresh/friends'
+require 'aerospike/node/refresh/info'
+require 'aerospike/node/refresh/partitions'
+require 'aerospike/node/refresh/peers'
+require 'aerospike/node/refresh/reset'
+require 'aerospike/node/verify/cluster_name'
+require 'aerospike/node/verify/name'
+require 'aerospike/node/verify/partition_generation'
+require 'aerospike/node/verify/peers_generation'
+require 'aerospike/node_validator'
+require 'aerospike/peer'
+require 'aerospike/peers'
+require 'aerospike/peers/fetch'
+require 'aerospike/peers/parse'
 require 'aerospike/info'
 require 'aerospike/udf'
 require 'aerospike/bin'

data/lib/aerospike/aerospike_exception.rb

@@ -1,12 +1,14 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
-# the License at http:#www.apache.org/licenses/LICENSE-2.0
+# the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -17,95 +19,76 @@
 require 'aerospike/result_code'
 
 module Aerospike
-
   module Exceptions
-
     class Aerospike < StandardError
-
       attr_reader :result_code
 
       def initialize(result_code, message = nil)
         @result_code = result_code
         message ||= ResultCode.message(result_code)
         super(message)
-
-        self
       end
-
     end
 
     class Timeout < Aerospike
-
       attr_reader :timeout, :iterations, :failed_nodes, :failed_connections
 
       def initialize(timeout, iterations, failed_nodes=nil, failed_connections=nil)
-
         @timeout = timeout
         @iterations = iterations
         @failed_nodes = failed_nodes
         @failed_connections = failed_connections
 
         super(ResultCode::TIMEOUT)
-
       end
+    end
 
+    class InvalidCredentials < Aerospike
+      def initialize(msg = nil)
+        super(ResultCode::NOT_AUTHENTICATED, msg)
+      end
     end
 
     class Serialize < Aerospike
-
       def initialize(msg=nil)
         super(ResultCode::SERIALIZE_ERROR, msg)
       end
-
     end
 
     class Parse < Aerospike
-
       def initialize(msg=nil)
         super(ResultCode::PARSE_ERROR, msg)
       end
-
     end
 
     class Connection < Aerospike
-
       def initialize(msg=nil)
         super(ResultCode::SERVER_NOT_AVAILABLE, msg)
       end
-
     end
 
     class InvalidNode < Aerospike
-
       def initialize(msg=nil)
         super(ResultCode::INVALID_NODE_ERROR, msg)
       end
-
     end
 
     class ScanTerminated < Aerospike
-
       def initialize(msg=nil)
         super(ResultCode::SCAN_TERMINATED, msg)
       end
-
     end
 
     class QueryTerminated < Aerospike
-
       def initialize(msg=nil)
         super(ResultCode::QUERY_TERMINATED, msg)
       end
-
     end
 
     class CommandRejected < Aerospike
-
       def initialize(msg=nil)
         super(ResultCode::COMMAND_REJECTED, msg)
       end
-
     end
-
   end
 end

data/lib/aerospike/client.rb

@@ -1,12 +1,14 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
-# the License at http:#www.apache.org/licenses/LICENSE-2.0
+# the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -46,9 +48,9 @@ module Aerospike
       @default_query_policy = QueryPolicy.new
       @default_admin_policy = QueryPolicy.new
 
-      hosts = parse_hosts(hosts || ENV["AEROSPIKE_HOSTS"] || "localhost")
+      hosts = ::Aerospike::Host::Parse.(hosts || ENV['AEROSPIKE_HOSTS'] || 'localhost')
       policy = create_policy(policy, ClientPolicy)
-      @cluster = Cluster.new(policy, *hosts)
+      @cluster = Cluster.new(policy, hosts)
       @cluster.add_cluster_config_change_listener(self)
 
       self.connect if connect
@@ -88,7 +90,7 @@ module Aerospike
     #  Returns list of active server node names in the cluster.
 
     def node_names
-      @cluster.nodes.map(&:get_name)
+      @cluster.nodes.map(&:name)
     end
 
     def supports_feature?(feature)
@@ -826,23 +828,6 @@ module Aerospike
       end
     end
 
-    def parse_hosts(hosts)
-      case hosts
-      when Host
-        [hosts]
-      when Array
-        hosts
-      when String
-        hosts.split(?,).map { |host|
-          (addr, port) = host.split(?:)
-          port ||= 3000
-          Host.new(addr, port.to_i)
-        }
-      else
-        fail TypeError, "hosts should be a Host object, an Array of Host objects, or a String"
-      end
-    end
-
     def cluster=(cluster)
       @cluster = cluster
     end

data/lib/aerospike/{cluster/cluster.rb → cluster.rb}

@@ -1,12 +1,15 @@
-# encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# frozen_string_literal: true
+
+# Copyright 2014-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
-# the License at http:#www.apache.org/licenses/LICENSE-2.0
+# the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -15,27 +18,26 @@
 # the License.
 
 require 'set'
-require 'thread'
 require 'timeout'
 
 require 'aerospike/atomic/atomic'
 
 module Aerospike
-
-  private
-
   class Cluster
-
     attr_reader :connection_timeout, :connection_queue_size, :user, :password
-    attr_reader :features
+    attr_reader :features, :ssl_options
+    attr_reader :cluster_id, :aliases
+    attr_reader :cluster_name
 
-    def initialize(policy, *hosts)
+    def initialize(policy, hosts)
       @cluster_seeds = hosts
       @fail_if_not_connected = policy.fail_if_not_connected
       @connection_queue_size = policy.connection_queue_size
       @connection_timeout = policy.timeout
       @tend_interval = policy.tend_interval
       @cluster_name = policy.cluster_name
+      @ssl_options = policy.ssl_options
+
       @aliases = {}
       @cluster_nodes = []
       @partition_write_map = {}
@@ -53,21 +55,33 @@ module Aerospike
         @password = AdminCommand.hash_password(policy.password)
       end
 
-      self
+      initialize_tls_host_names(hosts) if tls_enabled?
     end
 
     def connect
       wait_till_stablized
 
       if @fail_if_not_connected && !connected?
-        raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE)
+        raise Aerospike::Exceptions::Aerospike, Aerospike::ResultCode::SERVER_NOT_AVAILABLE
       end
 
       launch_tend_thread
 
       Aerospike.logger.info('New cluster initialized and ready to be used...')
+    end
 
-      self
+    def credentials_given?
+      !(@user.nil? || @user.empty?)
+    end
+
+    def tls_enabled?
+      !ssl_options.nil? && ssl_options[:enable] != false
+    end
+
+    def initialize_tls_host_names(hosts)
+      hosts.each do |host|
+        host.tls_name ||= cluster_id.nil? ? host.name : cluster_id
+      end
     end
 
     def add_seeds(hosts)
@@ -94,12 +108,10 @@ module Aerospike
       if node_array = nmap[partition.namespace]
         node = node_array.value[partition.partition_id]
 
-        if node && node.active?
-          return node
-        end
+        return node if node && node.active?
       end
 
-      return random_node
+      random_node
     end
 
     # Returns a random node on the cluster
@@ -110,16 +122,14 @@ module Aerospike
       i = 0
       while i < length
         # Must handle concurrency with other non-tending threads, so node_index is consistent.
-        index = (@node_index.update{|v| v+1} % node_array.length).abs
+        index = (@node_index.update{ |v| v+1 } % node_array.length).abs
         node = node_array[index]
 
-        if node.active?
-          return node
-        end
+        return node if node.active?
 
         i = i.succ
       end
-      raise Aerospike::Exceptions::InvalidNode.new
+      raise Aerospike::Exceptions::InvalidNode
     end
 
     # Returns a list of all nodes in the cluster
@@ -134,23 +144,19 @@ module Aerospike
     def get_node_by_name(node_name)
       node = find_node_by_name(node_name)
 
-      raise Aerospike::Exceptions::InvalidNode.new unless node
+      raise Aerospike::Exceptions::InvalidNode unless node
 
       node
     end
 
     # Closes all cached connections to the cluster nodes and stops the tend thread
     def close
-      unless @closed.value
-        # send close signal to maintenance channel
-        @closed.value = true
-        @tend_thread.kill
-
-        nodes.each do |node|
-          node.close
-        end
-      end
+      return if @closed.value
+      # send close signal to maintenance channel
+      @closed.value = true
+      @tend_thread.kill
 
+      nodes.each(&:close)
     end
 
     def find_alias(aliass)
@@ -159,25 +165,12 @@ module Aerospike
       end
     end
 
-    def update_partitions(conn, node)
-      # TODO: Cluster should not care about version of tokenizer
-      # decouple clstr interface
-      nmap = {}
-      if node.use_new_info?
-        Aerospike.logger.info("Updating partitions using new protocol...")
-
-        tokens = PartitionTokenizerNew.new(conn)
-        nmap = tokens.update_partition(partitions, node)
-      else
-        Aerospike.logger.info("Updating partitions using old protocol...")
-        tokens = PartitionTokenizerOld.new(conn)
-        nmap = tokens.update_partition(partitions, node)
-      end
-
+    def update_partitions(tokens, node)
+      nmap = tokens.update_partition(partitions, node)
       # update partition write map
       set_partitions(nmap) if nmap
 
-      Aerospike.logger.info("Partitions updated...")
+      Aerospike.logger.info("Partitions for node #{node.name} updated")
     end
 
     def request_info(policy, *commands)
@@ -192,9 +185,13 @@ module Aerospike
       @features.get.include?(feature.to_s)
     end
 
+    def supports_peers_protocol?
+      nodes.all? { |node| node.supports_feature?('peers') }
+    end
+
     def change_password(user, password)
-     # change password ONLY if the user is the same
-     @password = password if @user == user
+      # change password ONLY if the user is the same
+      @password = password if @user == user
     end
 
     def add_cluster_config_change_listener(listener)
@@ -213,85 +210,96 @@ module Aerospike
       "#<Aerospike::Cluster @cluster_nodes=#{@cluster_nodes}>"
     end
 
-    private
-
     def launch_tend_thread
       @tend_thread = Thread.new do
         Thread.current.abort_on_exception = false
-        while true
+        loop do
           begin
             tend
             sleep(@tend_interval / 1000.0)
           rescue => e
             Aerospike.logger.error("Exception occured during tend: #{e}")
+            Aerospike.logger.debug { e.backtrace.join("\n") }
           end
         end
       end
     end
 
+    # Check health of all nodes in cluster
     def tend
-      nodes = self.nodes
+      was_changed = refresh_nodes
+
+      return unless was_changed
+
+      update_cluster_features
+      notify_cluster_config_changed
+      # only log the tend finish IF the number of nodes has been changed.
+      # This prevents spamming the log on every tend interval
+      log_tend_stats(nodes)
+    end
+
+    # Refresh status of all nodes in cluster. Adds new nodes and/or removes
+    # unhealty ones
+    def refresh_nodes
       cluster_config_changed = false
 
-      # All node additions/deletions are performed in tend thread.
-      # If active nodes don't exist, seed cluster.
+      nodes = self.nodes
       if nodes.empty?
-        Aerospike.logger.info("No connections available; seeding...")
         seed_nodes
         cluster_config_changed = true
-
-        # refresh nodes list after seeding
         nodes = self.nodes
       end
 
-      # Refresh all known nodes.
-      friend_list = []
-      refresh_count = 0
+      peers = Peers.new
 
-      # Clear node reference counts.
+      # Clear node reference count
       nodes.each do |node|
-        node.reference_count.value = 0
-        node.responded.value = false
+        node.refresh_reset
+      end
 
-        if node.active?
-          begin
-            friends = node.refresh
-            refresh_count += 1
-            friend_list.concat(friends) if friends
-          rescue => e
-            Aerospike.logger.error("Node `#{node}` refresh failed: #{e}")
-            Aerospike.logger.error(e.backtrace.join("\n"))
-          end
+      peers.use_peers = supports_peers_protocol?
+
+      # refresh all known nodes
+      nodes.each do |node|
+        node.refresh_info(peers)
+      end
+
+      # refresh peers when necessary
+      if peers.generation_changed?
+        # Refresh peers for all nodes that responded the first time even if only
+        # one node's peers changed.
+        nodes.each do |node|
+          node.refresh_peers(peers)
         end
       end
 
-      # Add nodes in a batch.
-      add_list = find_nodes_to_add(friend_list)
-      unless add_list.empty?
-        add_nodes(add_list)
-        cluster_config_changed = true
+      nodes.each do |node|
+        node.refresh_partitions(peers) if node.partition_generation.changed?
       end
 
-      # Handle nodes changes determined from refreshes.
-      # Remove nodes in a batch.
-      remove_list = find_nodes_to_remove(refresh_count)
-      unless remove_list.empty?
-        remove_nodes(remove_list)
-        cluster_config_changed = true
+      if peers.generation_changed? || !peers.use_peers?
+        nodes_to_remove = find_nodes_to_remove(peers.refresh_count)
+        if nodes_to_remove.any?
+          remove_nodes(nodes_to_remove)
+          cluster_config_changed = true
+        end
       end
 
-      if cluster_config_changed
-        update_cluster_features
+      # Add any new nodes from peer refresh
+      if peers.nodes.any?
+        # peers.nodes is a Hash. Pass only values, ie. the array of nodes
+        add_nodes(peers.nodes.values)
+        cluster_config_changed = true
+      end
 
-        # only log the tend finish IF the number of nodes has been changed.
-        # This prevents spamming the log on every tend interval
-        diff = nodes.length - @old_node_count
-        action = "#{diff.abs} #{diff.abs == 1 ? "node has" : "nodes have"} #{diff > 0 ? "joined" : "left"} the cluster."
-        Aerospike.logger.info("Tend finished. #{action} Old node count: #{@old_node_count}, New node count: #{nodes.length}")
-        @old_node_count = nodes.length
+      cluster_config_changed
+    end
 
-        notify_cluster_config_changed
-      end
+    def log_tend_stats(nodes)
+      diff = nodes.size - @old_node_count
+      action = "#{diff.abs} #{diff.abs == 1 ? "node has" : "nodes have"} #{diff > 0 ? "joined" : "left"} the cluster."
+      Aerospike.logger.info("Tend finished. #{action} Old node count: #{@old_node_count}, New node count: #{nodes.size}")
+      @old_node_count = nodes.size
     end
 
     def wait_till_stablized
@@ -299,14 +307,12 @@ module Aerospike
 
       # will run until the cluster is stablized
       thr = Thread.new do
-        while true
+        loop do
           tend
 
           # Check to see if cluster has changed since the last Tend.
           # If not, assume cluster has stabilized and return.
-          if count == nodes.length
-            break
-          end
+          break if count == nodes.length
 
           sleep(0.001) # sleep for a miliseconds
 
@@ -324,13 +330,12 @@ module Aerospike
       end
 
       @closed.value = false if @cluster_nodes.length > 0
-
     end
 
     def update_cluster_features
       # Cluster supports features that are supported by all nodes
       @features.update do
-        node_features = self.nodes.map(&:features)
+        node_features = nodes.map(&:features)
         node_features.reduce(&:intersection) || Set.new
       end
     end
@@ -366,45 +371,39 @@ module Aerospike
 
       seed_array.each do |seed|
         begin
-          seed_node_validator = NodeValidator.new(self, seed, @connection_timeout, @cluster_name)
+          seed_node_validator = NodeValidator.new(self, seed, @connection_timeout, @cluster_name, ssl_options)
         rescue => e
-          Aerospike.logger.error("Seed #{seed.to_s} failed: #{e.backtrace.join("\n")}")
+          Aerospike.logger.error("Seed #{seed} failed: #{e}\n#{e.backtrace.join("\n")}")
           next
         end
 
         nv = nil
         # Seed host may have multiple aliases in the case of round-robin dns configurations.
         seed_node_validator.aliases.each do |aliass|
-
           if aliass == seed
             nv = seed_node_validator
           else
             begin
-              nv = NodeValidator.new(self, aliass, @connection_timeout, @cluster_name)
+              nv = NodeValidator.new(self, aliass, @connection_timeout, @cluster_name, ssl_options)
             rescue => e
-              Aerospike.logger.error("Seed #{seed.to_s} failed: #{e}")
+              Aerospike.logger.error("Seed #{seed} failed: #{e}")
               next
             end
           end
+          next if find_node_name(list, nv.name)
 
-          if !find_node_name(list, nv.name)
-            node = create_node(nv)
-            add_aliases(node)
-            list << node
-          end
+          node = create_node(nv)
+          add_aliases(node)
+          list << node
         end
-
-      end
-
-      if list.length > 0
-        add_nodes_copy(list)
       end
 
+      add_nodes_copy(list) if list.length > 0
     end
 
     # Finds a node by name in a list of nodes
     def find_node_name(list, name)
-      list.any?{|node| node.name == name}
+      list.any? { |node| node.name == name }
     end
 
     def add_alias(host, node)
@@ -423,44 +422,8 @@ module Aerospike
       end
     end
 
-    def find_nodes_to_add(hosts)
-      list = []
-
-      hosts.each do |host|
-        begin
-          nv = NodeValidator.new(self, host, @connection_timeout, @cluster_name)
-
-          # if node is already in cluster's node list,
-          # or already included in the list to be added, we should skip it
-          node = find_node_by_name(nv.name)
-          node ||= list.detect{|n| n.name == nv.name}
-
-          # make sure node is not already in the list to add
-          if node
-            # Duplicate node name found.  This usually occurs when the server
-            # services list contains both internal and external IP addresses
-            # for the same node.  Add new host to list of alias filters
-            # and do not add new node.
-            node.reference_count.update{|v| v + 1}
-            node.add_alias(host)
-            add_alias(host, node)
-            next
-          end
-
-          node = create_node(nv)
-          list << node
-
-        rescue => e
-          Aerospike.logger.error("Add node #{node} failed: #{e}")
-          Aerospike.logger.error(e.backtrace.join("\n"))
-        end
-      end
-
-      list
-    end
-
     def create_node(nv)
-      Node.new(self, nv)
+      ::Aerospike::Node.new(self, nv)
     end
 
     def find_nodes_to_remove(refresh_count)
@@ -482,7 +445,7 @@ module Aerospike
 
         when 2
           # Two node clusters require at least one successful refresh before removing.
-          if refresh_count == 2 && node.reference_count.value == 0 && !node.responded.value
+          if refresh_count == 2 && node.reference_count.value == 0 && !node.responded?
             # Node is not referenced nor did it respond.
             remove_list << node
           end
@@ -492,9 +455,9 @@ module Aerospike
           if refresh_count >= 2 && node.reference_count.value == 0
             # Node is not referenced by other nodes.
             # Check if node responded to info request.
-            if node.responded.value
+            if node.responded?
               # Node is alive, but not referenced by other nodes.  Check if mapped.
-              if !find_node_in_partition_map(node)
+              unless find_node_in_partition_map(node)
                 # Node doesn't have any partitions mapped to it.
                 # There is not point in keeping it in the cluster.
                 remove_list << node
@@ -531,7 +494,7 @@ module Aerospike
     def add_aliases(node)
       # Add node's aliases to global alias set.
       # Aliases are only used in tend thread, so synchronization is not necessary.
-      node.get_aliases.each do |aliass|
+      node.aliases.each do |aliass|
         @aliases[aliass] = node
       end
     end
@@ -551,7 +514,7 @@ module Aerospike
       nodes_to_remove.each do |node|
         # Remove node's aliases from cluster alias set.
         # Aliases are only used in tend thread, so synchronization is not necessary.
-        node.get_aliases.each do |aliass|
+        node.aliases.each do |aliass|
           Aerospike.logger.debug("Removing alias #{aliass}")
           remove_alias(aliass)
         end
@@ -607,7 +570,5 @@ module Aerospike
     def find_node_by_name(node_name)
       nodes.detect{|node| node.name == node_name }
     end
-
   end
-
 end