cequel 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39be41ec7fa476af8f992f29924fd443953878f6
-  data.tar.gz: fe9ff8053a6fd8b895451af0e3d873c05a9900b1
+  metadata.gz: e428934f7aef3a261e5ee1c06b940ea008fd17de
+  data.tar.gz: 49a65b153251cb761a8421c56268d5b9c83d6966
 SHA512:
-  metadata.gz: 15247d49c41700123aad6763a7891fd7cf99c216aa3adfc37e00746c531fcb7c10565af34570914358ee8cd8a098745bca0a2c348b0bfd6a193ab1a9ba017030
-  data.tar.gz: 3f1f170c476ae40e64530c43c9f57f732b2d8ac63f06c9e27e07edd6b69e30b67b68cca25636c0602281802c7bf1d8b27c9be1909af6d3eb0936ed570de9c603
+  metadata.gz: 623e015fa5d288ca1302eafaec1ada9aa0224b23a28c854e6e69e3dd7dfaa6d5e32a768291ecb9d23d2b3eb4f80a272fe57ef045cb4651f5a69217a264cafb3e
+  data.tar.gz: 5ddbd20b44c69675be0025cea406961dad9a336b91853ae68b30914138e4b78c23baff03be79278a387b24d0a827e676485db78c045d5d5e9ffc40adcf902ed3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.2
+
+* Fix intermittent failures around preparing statements ([PR 330](https://github.com/cequel/cequel/pull/330))
+* Fix new relic instrumentation ([PR 331](https://github.com/cequel/cequel/pull/331))
+
 ## 2.0.1
 
 * Remove requirment on activemodel-serializers-xml ([PR 329](https://github.com/cequel/cequel/pull/329))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (2.0.1)
+    cequel (2.0.2)
       activemodel (>= 4.0)
       cassandra-driver (~> 3.0)
 

data/lib/cequel/metal/keyspace.rb

@@ -202,29 +202,39 @@ module Cequel
       def execute_with_options(statement, options={})
         options[:consistency] ||= default_consistency
 
-        retries = max_retries
         cql, options = *case statement
                         when Statement
-                          [client.prepare(statement.cql),
+                          [prepare_statement(statement),
                            {arguments: statement.bind_vars}.merge(options)]
                         when Cassandra::Statements::Batch
                           [statement, options]
                         end
 
         log('CQL', statement) do
-          begin
+          client_retry do
             client.execute(cql, options)
-          rescue Cassandra::Errors::NoHostsAvailable,
-                 Ione::Io::ConnectionError => e
-            clear_active_connections!
-            raise if retries == 0
-            retries -= 1
-            sleep(retry_delay)
-            retry
           end
         end
       end
 
+      #
+      # Wraps the prepare statement in the default retry strategy
+      #
+      # @param statement [String,Statement] statement to prepare
+      # @return [Cassandra::Statement::Prepared] the prepared statement
+      #
+      def prepare_statement(statement)
+        cql = case statement
+              when Statement
+                statement.cql
+              else
+                statement
+              end
+        client_retry do
+          client.prepare(cql)
+        end
+      end
+
       #
       # Clears all active connections
       #
@@ -298,6 +308,20 @@ module Cequel
       def_delegator :lock, :synchronize
       private :lock
 
+      def client_retry
+        retries = max_retries
+        begin
+          yield
+        rescue Cassandra::Errors::NoHostsAvailable,
+               Cassandra::Errors::ExecutionError,
+               Cassandra::Errors::TimeoutError
+          clear_active_connections!
+          raise if retries == 0
+          retries -= 1
+          sleep(retry_delay)
+          retry
+        end
+      end
 
       def client_without_keyspace
         synchronize do

data/lib/cequel/metal/new_relic_instrumentation.rb

@@ -13,15 +13,28 @@ module Cequel
     module NewRelicInstrumentation
       extend ActiveSupport::Concern
 
-      define_method :execute_with_options_with_newrelic do |statement, bind_vars, options|
+      define_method :execute_with_options_with_newrelic do |statement, options|
+
+        operation = nil
+        statement_txt = nil 
+        statement_words = nil
+
+        if statement.is_a?(::Cequel::Metal::Statement)
+          statement_txt = statement.cql
+          statement_words = statement_txt.split
+          operation = statement_words.first.downcase
+        elsif statement.is_a?(::Cassandra::Statements::Batch)
+          operation = "batch"
+        end
+
         callback = Proc.new do |result, scoped_metric, elapsed|
-          NewRelic::Agent::Datastores.notice_statement(statement, elapsed)
+          NewRelic::Agent::Datastores.notice_statement(statement_txt, elapsed)
         end
 
-        statement_words = statement.split
-        operation = statement_words.first.downcase
         table = nil
         case operation
+        when "batch"
+          # Nothing to do
         when "begin"
           operation = "batch"
         when "select"
@@ -33,7 +46,7 @@ module Cequel
         end
 
         NewRelic::Agent::Datastores.wrap("Cassandra", operation, table, callback) do
-          execute_with_options_without_newrelic(statement, bind_vars, options)
+          execute_with_options_without_newrelic(statement, options)
         end
       end
 

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/spec/examples/metal/keyspace_spec.rb

@@ -118,6 +118,7 @@ describe Cequel::Metal::Keyspace do
 
   describe "#execute" do
     let(:statement) { "SELECT id FROM posts" }
+    let(:execution_error) { Cassandra::Errors::OverloadedError.new(1,2,3,4,5,6,7,8,9) }
 
     context "without a connection error" do
       it "executes a CQL query" do
@@ -126,16 +127,71 @@ describe Cequel::Metal::Keyspace do
     end
 
     context "with a connection error" do
-      it "reconnects to cassandra with a new client after first failed connection" do
+      it "reconnects to cassandra with a new client after no hosts could be reached" do
         allow(cequel.client)
           .to receive(:execute)
                .with(->(s){ s.cql == statement},
                      hash_including(:consistency => cequel.default_consistency))
-          .and_raise(Ione::Io::ConnectionError)
+          .and_raise(Cassandra::Errors::NoHostsAvailable)
           .once
 
         expect { cequel.execute(statement) }.not_to raise_error
       end
+
+      it "reconnects to cassandra with a new client after execution failed" do
+        allow(cequel.client)
+          .to receive(:execute)
+               .with(->(s){ s.cql == statement},
+                     hash_including(:consistency => cequel.default_consistency))
+          .and_raise(execution_error)
+          .once
+
+        expect { cequel.execute(statement) }.not_to raise_error
+      end
+
+      it "reconnects to cassandra with a new client after timeout occurs" do
+        allow(cequel.client)
+          .to receive(:execute)
+               .with(->(s){ s.cql == statement},
+                     hash_including(:consistency => cequel.default_consistency))
+          .and_raise(Cassandra::Errors::TimeoutError)
+          .once
+
+        expect { cequel.execute(statement) }.not_to raise_error
+      end
+    end
+  end
+
+  describe "#prepare_statement" do
+    let(:statement) { "SELECT id FROM posts" }
+    let(:execution_error) { Cassandra::Errors::OverloadedError.new(1,2,3,4,5,6,7,8,9) }
+
+    context "without a connection error" do
+      it "executes a CQL query" do
+        expect { cequel.prepare_statement(statement) }.not_to raise_error
+      end
+    end
+
+    context "with a connection error" do
+      it "reconnects to cassandra with a new client after no hosts could be reached" do
+        allow(cequel.client)
+          .to receive(:prepare)
+               .with(->(s){ s == statement})
+          .and_raise(Cassandra::Errors::NoHostsAvailable)
+          .once
+
+        expect { cequel.prepare_statement(statement) }.not_to raise_error
+      end
+
+      it "reconnects to cassandra with a new client after execution failed" do
+        allow(cequel.client)
+          .to receive(:prepare)
+               .with(->(s){ s == statement})
+          .and_raise(execution_error)
+          .once
+
+        expect { cequel.prepare_statement(statement) }.not_to raise_error
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel