right_support 2.6.3 → 2.6.4

data/lib/right_support/db/cassandra_model.rb

@@ -104,6 +104,7 @@ module RightSupport::DB
   # Used to access data persisted in Cassandra
   # Provides wrappers for Cassandra client methods
   class CassandraModel
+    include RightSupport::Log::Mixin
 
     # Default timeout for client connection to Cassandra server
     DEFAULT_TIMEOUT = 10
@@ -114,8 +115,6 @@ module RightSupport::DB
     # Wrappers for Cassandra client
     class << self
 
-      @@logger = nil
-
       attr_reader   :default_keyspace
       attr_accessor :column_family
 
@@ -123,6 +122,8 @@ module RightSupport::DB
 
       @@connections = {}
 
+      METHODS_TO_LOG = [:multi_get, :get, :get_indexed_slices, :get_columns, :insert, :remove, 'multi_get', 'get', 'get_indexed_slices', 'get_columns', 'insert', 'remove']
+
       # Depricate usage of CassandraModel under Ruby < 1.9
       def inherited(base)
         raise UnsupportedRubyVersion, "Support only Ruby >= 1.9" unless RUBY_VERSION >= "1.9"
@@ -143,14 +144,6 @@ module RightSupport::DB
         @@config = normalize_config(value) unless value.nil?
       end
 
-      def logger=(l)
-        @@logger = l
-      end
-
-      def logger
-        @@logger
-      end
-
       # Return current keyspaces name as Array of String
       #
       # === Return
@@ -321,13 +314,13 @@ module RightSupport::DB
       end
 
       # This method is an attempt to circumvent the Cassandra gem limitation of returning only 100 columns for wide rows
-      # This method returns only columns that are within the result set specified by a secondary index equality query 
-      # This method will iterate through chunks of rows of the resultset and it will yield to the caller all of the 
+      # This method returns only columns that are within the result set specified by a secondary index equality query
+      # This method will iterate through chunks of rows of the resultset and it will yield to the caller all of the
       # columns in chunks of 1,000 until all of the columns have been retrieved
       #
       # == Parameters:
       # @param [String] index column name
-      # @param [String] index column value 
+      # @param [String] index column value
       #
       # == Yields:
       # @yield [Array<String, Array<CassandraThrift::ColumnOrSuperColumn>>] irray containing ndex column value passed in and an array of columns matching the index query
@@ -482,12 +475,12 @@ module RightSupport::DB
         do_op(:batch, *args, &block)
       end
 
-      # Execute Cassandra request
-      # Automatically reconnect and retry if IOError encountered
+      # Perform a Cassandra operation on the connection object.
+      # Rescue IOError by automatically reconnecting and retrying the operation.
       #
       # === Parameters
       # meth(Symbol):: Method to be executed
-      # args(Array):: Method arguments
+      # *args(Array):: Method arguments to forward to the Cassandra connection
       #
       # === Block
       # Block if any to be executed by method
@@ -495,12 +488,45 @@ module RightSupport::DB
       # === Return
       # (Object):: Value returned by executed method
       def do_op(meth, *args, &block)
-        conn.send(meth, *args, &block)
+        first_started_at ||= Time.now
+        retries          ||= 0
+        started_at         = Time.now
+
+        # cassandra functionality
+        result = conn.send(meth, *args, &block)
+
+        # log functionality
+        do_op_log(first_started_at, started_at, retries, meth, args[0], args[1])
+
+        return result
       rescue IOError
         reconnect
+        retries += 1
         retry
       end
 
+      def do_op_log(first_started_at, started_at, retries, meth, cf, key)
+        now          = Time.now
+        attempt_time = now - started_at
+
+        if METHODS_TO_LOG.include?(meth)
+          if key.is_a?(Array)
+            key_count = key.size
+          else
+            key_count = 1
+          end
+
+          log_string = sprintf("CassandraModel %s, cf=%s, keys=%d, time=%.1fms", meth, cf, key_count, attempt_time)
+
+          if retries && retries > 0
+            total_time  = now - first_started_at
+            log_string += sprintf(", retries=%d, total_time=%.1fms", retries, total_time)
+          end
+
+          logger.debug(log_string)
+        end
+      end
+
       # Reconnect to Cassandra server
       # Use BinaryProtocolAccelerated if it available
       #

data/lib/right_support/net/request_balancer.rb

@@ -256,15 +256,16 @@ module RightSupport::Net
       return result if complete
 
       # Produce a summary message for the exception that gives a bit of detail
-      summary = []
-      exceptions.each_pair do |_, list|
+      msg = [] 
+      exceptions.each_pair do |endpoint, list|
+        summary = []
         list.each { |e| summary << e.class }
+        msg << "'#{endpoint}' => [#{summary.uniq.join(', ')}]"
       end
-      summary = summary.uniq.join(', ')
-      msg = "Request failed after #{n} tries to #{exceptions.keys.size} endpoints. Exceptions: #{summary}"
+      message = "Request failed after #{n} tries to #{exceptions.keys.size} endpoints: (#{msg.join(', ')})"
 
-      logger.error "RequestBalancer: #{msg}"
-      raise NoResult.new(msg, exceptions)
+      logger.error "RequestBalancer: #{message}"
+      raise NoResult.new(message, exceptions)
     end
 
     # Provide an interface so one can query the RequestBalancer for statistics on

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '2.6.3'
-  s.date    = '2012-11-08'
+  s.version = '2.6.4'
+  s.date    = '2012-11-11'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin', 'Alexey Karpik']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 6
-  - 3
-  version: 2.6.3
+  - 4
+  version: 2.6.4
 platform: ruby
 authors: 
 - Tony Spataro
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-08 00:00:00 -08:00
+date: 2012-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: []