aerospike 1.0.9 → 1.0.10

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## September 22 2015 (1.0.10)
+
+  Major fix release.
+
+  * **Fixes**:
+
+    * Fixes find_node_in_partition_map logic.
+
+    * Fixes Node.Refresh logic.
+
+    * Fixes an issue with dead connections that would cause an infinite loop.
+
 ## Augest 11 2015 (1.0.9)
 
   Minor fix release.

data/lib/aerospike/cluster/cluster.rb

@@ -238,7 +238,7 @@ module Aerospike
       remove_list = find_nodes_to_remove(refresh_count)
       remove_nodes(remove_list) unless remove_list.empty?
 
-      Aerospike.logger.info("Tend finished. Live node count: #{nodes.length}")
+      Aerospike.logger.info("Tend finished. Live node count: #{nodes.length} #{nodes}")
     end
 
     def wait_till_stablized
@@ -246,7 +246,6 @@ module Aerospike
 
       # will run until the cluster is stablized
       thr = Thread.new do
-        abort_on_exception=true
         while true
           tend
 
@@ -445,19 +444,8 @@ module Aerospike
     def find_node_in_partition_map(filter)
       partitions_list = partitions
 
-      partitions_list.each do |node_array|
-        max = node_array.length
-
-        i = 0
-        while i < max
-          node = node_array[i]
-          # Use reference equality for performance.
-          if node == filter
-            return true
-          end
-
-          i = i.succ
-        end
+      partitions_list.values.each do |node_array|
+        return true if node_array.value.any? { |node| node == filter }
       end
       false
     end

data/lib/aerospike/cluster/connection.rb

@@ -62,7 +62,7 @@ module Aerospike
           IO.select(nil, [@socket])
           retry
         rescue => e
-          Aerospike::Exceptions::Connection.new("#{e}")
+          raise Aerospike::Exceptions::Connection.new("#{e}")
         end
       end
     end
@@ -72,13 +72,18 @@ module Aerospike
       while total < length
         begin
           bytes = @socket.recv_nonblock(length - total)
-          buffer.write_binary(bytes, total) if bytes.bytesize > 0
+          if bytes.bytesize > 0
+            buffer.write_binary(bytes, total)
+          else
+            # connection is dead; return an error
+            raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Connection to the server node is dead.")
+          end
           total += bytes.bytesize
         rescue IO::WaitReadable,  Errno::EAGAIN
           IO.select([@socket], nil)
           retry
         rescue => e
-          Aerospike::Exceptions::Connection.new("#{e}")
+          raise Aerospike::Exceptions::Connection.new("#{e}")
         end
       end
     end

data/lib/aerospike/cluster/node.rb

@@ -71,17 +71,17 @@ module Aerospike
     # Request current status from server node, and update node with the result
     def refresh
       friends = []
-      conn = get_connection(1)
 
       begin
+        conn = get_connection(1)
         info_map = Info.request(conn, "node", "partition-generation", "services")
       rescue => e
-        Aerospike.logger.error(e)
+        Aerospike.logger.error("Error during refresh for node #{self}: #{e}")
 
         conn.close if conn
         decrease_health
 
-        raise e
+        return friends
       end
 
       verify_node_name(info_map)

data/lib/aerospike/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack