aerospike 2.5.1 → 2.6.0

data/lib/aerospike/node/verify/name.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# Copyright 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Aerospike
+  class Node
+    module Verify
+      module Name
+        class << self
+          def call(node, info_map)
+            info_name = info_map['node']
+
+            if !info_name
+              node.decrease_health
+              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, 'Node name is empty')
+            end
+
+            if !(node.name == info_name)
+              # Set node to inactive immediately.
+              node.inactive!
+              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Node name has changed. Old=#{node.name} New= #{info_name}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aerospike/node/verify/partition_generation.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# Copyright 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Aerospike
+  class Node
+    module Verify
+      # Fetch and set partition generation. If partitions needs to be refreshed
+      # this will be indicated in node.partition_changed
+      module PartitionGeneration
+        class << self
+          def call(node, info_map)
+            gen_string = info_map.fetch('partition-generation', nil)
+
+            raise Aerospike::Exceptions::Parse.new('partition-generation is empty') if gen_string.to_s.empty?
+
+            generation = gen_string.to_i
+
+            node.partition_generation.update(generation)
+
+            return unless node.partition_generation.changed?
+            Aerospike.logger.info("Node #{node.name} partition generation #{generation} changed")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aerospike/node/verify/peers_generation.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Copyright 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Aerospike
+  class Node
+    module Verify
+      module PeersGeneration
+        class << self
+          def call(node, info_map, peers)
+            gen_string = info_map.fetch('peers-generation', nil)
+
+            raise Aerospike::Exceptions::Parse.new('peers-generation is empty') if gen_string.to_s.empty?
+
+            generation = gen_string.to_i
+
+            return if node.peers_generation.eql?(generation)
+
+            Aerospike.logger.info("Node #{node.name} peers generation #{generation} changed")
+            peers.generation_changed = true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aerospike/{cluster/node_validator.rb → node_validator.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,62 +18,35 @@
 # the License.
 
 module Aerospike
-
-  private
-
   class NodeValidator # :nodoc:
+    VERSION_REGEXP = /(?<v1>\d+)\.(?<v2>\d+)\.(?<v3>\d+).*/.freeze
 
-    attr_reader :host, :aliases, :name, :use_new_info, :features, :cluster_name
+    attr_reader :host, :aliases, :name, :use_new_info, :features, :cluster_name, :ssl_options, :conn
 
-    def initialize(cluster, host, timeout, cluster_name)
+    def initialize(cluster, host, timeout, cluster_name, ssl_options = {})
       @cluster = cluster
       @use_new_info = true
       @features = Set.new
       @host = host
       @cluster_name = cluster_name
+      @ssl_options = ssl_options
 
       set_aliases(host)
       set_address(timeout)
-
-      self
     end
 
-    def set_aliases(host)
-      is_ip = !!((host =~ Resolv::IPv4::Regex) || (host =~ Resolv::IPv6::Regex))
-
-      if is_ip
-        # don't try to resolve IP addresses. May fail in different OS or network setups
-        addresses = host
-      else
-        addresses = Resolv.getaddresses(host.name)
-      end
-
-      aliases = []
-      addresses.each do |addr|
-        aliases << Host.new(addr, host.port)
-      end
-
-      @aliases = aliases
+    private
 
-      Aerospike.logger.debug("Node Validator has #{aliases.length} nodes.")
+    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 set_address(timeout)
       @aliases.each do |aliass|
         begin
-          conn = Connection.new(aliass.name, aliass.port, timeout)
-
-          # need to authenticate
-          if @cluster.user && @cluster.user != ''
-            begin
-              command = AdminCommand.new
-              command.authenticate(conn, @cluster.user, @cluster.password)
-            rescue => e
-              # Socket not authenticated. Do not put back into pool.
-              conn.close if conn
-              raise e
-            end
-          end
+          conn = Cluster::CreateConnection.(@cluster, @host)
 
           info_map = Info.request(conn, 'node', 'build', 'features')
           if node_name = info_map['node']
@@ -90,23 +66,29 @@ module Aerospike
         ensure
           conn.close if conn
         end
-
       end
     end
 
-    protected
+    def resolve(hostname)
+      if is_ip?(hostname)
+        # Don't try to resolve IP addresses.
+        # May fail in different OS or network setups
+        [hostname]
+      else
+        Resolv.getaddresses(hostname)
+      end
+    end
 
-    # parses a version string
-    @@version_regexp = /(?<v1>\d+)\.(?<v2>\d+)\.(?<v3>\d+).*/
+    def is_ip?(hostname)
+      !!((hostname =~ Resolv::IPv4::Regex) || (hostname =~ Resolv::IPv6::Regex))
+    end
 
     def parse_version_string(version)
-      if v = @@version_regexp.match(version)
+      if v = VERSION_REGEXP.match(version)
         return v['v1'], v['v2'], v['v3']
       end
 
       raise Aerospike::Exceptions::Parse.new("Invalid build version string in Info: #{version}")
     end
-
   end # class
-
 end #module

data/lib/aerospike/peer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Copyright 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Aerospike
+  class Peer
+    attr_accessor :node_name, :tls_name, :hosts
+  end
+end

data/lib/aerospike/peers.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Copyright 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Aerospike
+  class Peers
+    attr_accessor :peers, :hosts, :nodes, :refresh_count, :use_peers, :generation_changed
+
+    def initialize
+      @peers = ::Array.new
+      @hosts = ::Set.new
+      @nodes = {}
+      @use_peers = true
+      @refresh_count = 0
+    end
+
+    def find_node_by_name(node_name)
+      @nodes[node_name]
+    end
+
+    def generation_changed?
+      @generation_changed == true
+    end
+
+    def use_peers?
+      @use_peers == true
+    end
+  end
+end

data/lib/aerospike/peers/fetch.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Copyright 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Aerospike
+  class Peers
+    module Fetch
+      class << self
+        def call(cluster, conn)
+          cmd = cluster.tls_enabled? ? 'peers-tls-std' : 'peers-clear-std'
+
+          response = Info.request(conn, cmd)
+
+          raise if response.size.zero?
+
+          ::Aerospike::Peers::Parse.(response.fetch(cmd))
+        end
+      end
+    end
+  end
+end

data/lib/aerospike/peers/parse.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+# Copyright 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Aerospike
+  class Peers
+    # Parse the response from peers command
+    module Parse
+      # Object representing the parsed response from peers command
+      Object = ::Struct.new(:generation, :port_default, :peers)
+
+      class << self
+
+        BASE_REGEX = /(\d+),(\d*),\[(.*)\]/.freeze
+
+        def call(response)
+          gen, port, peers = parse_base(response)
+
+          ::Aerospike::Peers::Parse::Object.new.tap do |obj|
+            obj.generation = gen.to_i
+            obj.port_default = port.empty? ? nil : port.to_i
+            obj.peers = parse_peers(peers, obj)
+          end
+        end
+
+        def parse_base(response)
+         BASE_REGEX.match(response).to_a.last(3).tap do |parsed|
+          # Expect three pieces parsed from the Regex
+          raise ::Aerospike::Exceptions::Parse if parsed.size != 3
+         end
+        end
+
+        def parse_peers(response, obj)
+          return [] if response.empty?
+          parser = ::Aerospike::Utils::StringParser.new(response)
+          [].tap do |result|
+            loop do
+              result << parse_peer(parser, obj)
+              break unless parser.current == ','
+              parser.step
+            end
+          end
+        end
+
+        def parse_peer(parser, obj)
+          ::Aerospike::Peer.new.tap do |peer|
+            parser.expect('[')
+            peer.node_name = parser.read_until(',')
+            peer.tls_name = parser.read_until(',')
+            peer.hosts = parse_hosts(parser, peer)
+            # Assign default port if missing
+            peer.hosts.each do |host|
+              host.port ||= obj.port_default
+            end
+            parser.expect(']')
+          end
+        end
+
+        def parse_hosts(parser, peer)
+          parser.expect('[')
+          return [] if parser.current == ']'
+
+          # TODO(wallin): handle IPv6
+          raise ::Aerospike::Exceptions::Parse if parser.current == '['
+          parser.read_until(']').split(',').map do |host|
+            hostname, port = host.split(':')
+            ::Aerospike::Host.new(hostname, port, peer.tls_name)
+          end
+        end
+      end
+    end
+  end
+end