whi-cassie 1.3.0 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38924e7460050a72c231a359a4a07e1695349b55d24868ae8332a0ecbcf61356
-  data.tar.gz: 69f5b3396cb45c8f3247ba377d456173ac114220b2247163bc74060e9cff921a
+  metadata.gz: da71885a1923c8c8d801ae3312151406ec78630237c43f9057c4abc6970626cd
+  data.tar.gz: a4ac1795d699b89efac12f4c5455d84095dacfe07d5634754a3ac8e129d8553f
 SHA512:
-  metadata.gz: 46242596cf88a2d0600be23bb25a5138c7090acc952ccdbab3344d36abb1cd94ef4aef85bae071f60275297f10571377704a7de7348875cd0984439c7a3aecfd
-  data.tar.gz: d6e68b1ffd9a28cb27984e01bbce135502b4107d50be350d275dd745375fb5a2b90efa5384a4578c250654674b0ae7512bfe529fe3dc21f52c59b37b87e390e3
+  metadata.gz: 55c5506a91a5a6cc353d64ca12a0a57bb6cd691a1f4314e257fc468cfb0bdd12b60a590a1663a2cd3b200ca9da8891c80de6cd43c4b0fc12910ca155a96cead3
+  data.tar.gz: 07463a9d5b35522559405d8c94f35cd4c922e2c59e7bf62fc2cc99a91d3ff22503f9900ece00fa4ffec0d050fa5c2712b8da90b150b99d6b6eb6a0c6f02bcc00

data/.github/workflows/continuous_integration.yml

@@ -13,18 +13,34 @@ env:
   BUNDLE_JOBS: 3
   BUNDLE_RETRY: 3
 jobs:
+  standard:
+    name: StandardRB
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+      - name: install dependencies
+        run:  bundle install
+      - name: standardrb
+        if:   matrix.job == 'standardrb'
+        run:  bundle exec rake standard
+
   specs:
     name: ${{ matrix.job }} ruby-${{ matrix.ruby }} ${{ matrix.activemodel && format('activemodel-{0}', matrix.activemodel) }} cassandra-${{ matrix.cassandra_version }}
     runs-on: ubuntu-latest
     services:
       cassandra:
-        image: cassandra:${{ matrix.cassandra_version }}
+        image: cassandra:${{ matrix.cassandra_version || 'latest' }}
         ports:
           - 9042:9042
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0"]
+        ruby: ["3.1"]
         activemodel: ["original"]
         job: [rspec]
         cassandra_version: ["latest"]
@@ -39,8 +55,10 @@ jobs:
             cassandra_version: "2"
           - ruby: "2.7"
             activemodel: "6"
+            job: rspec
           - ruby: "3.0"
-            job: standardrb
+            activemodel: "7"
+            job: rspec
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -59,6 +77,3 @@ jobs:
       - name: specs
         if:   matrix.job == 'rspec'
         run:  bundle exec rake spec
-      - name: standardrb
-        if:   matrix.job == 'standardrb'
-        run:  bundle exec rake standard

data/HISTORY.md

@@ -1,3 +1,21 @@
+## 1.3.4
+
+* Fix syntax error.
+
+## 1.3.3 (yanked)
+
+* Restore automatic reconnect on dead connections.
+* Handle race condition on reconnect logic.
+
+## 1.3.2
+
+* Improved synchronization on reconnect logic.
+
+## 1.3.1
+
+* Remove automatic reconnect on I/O errors.
+* Handle race condition on connecting when already connected.
+
 ## 1.3.0
 
 * Add update, update!, primary_key, and reload methods to models.

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.4

data/lib/cassie.rb

@@ -102,19 +102,23 @@ class Cassie
     cluster = Cassandra.cluster(cluster_config)
     logger&.info("Cassie.connect with #{config.sanitized_cluster} in #{((Time.now - start_time) * 1000).round}ms")
     @monitor.synchronize do
-      @session = cluster.connect(config.default_keyspace)
-      @prepared_statements = {}
+      unless @session
+        @session = cluster.connect(config.default_keyspace)
+        @prepared_statements = {}
+      end
     end
   end
 
   # Close the connections to the Cassandra cluster.
   def disconnect
     logger&.info("Cassie.disconnect from #{config.sanitized_cluster}")
+    old_session = nil
     @monitor.synchronize do
-      @session&.close
+      old_session = @session
       @session = nil
       @prepared_statements = {}
     end
+    old_session&.close
   end
 
   # Return true if the connection to the Cassandra cluster has been established.
@@ -125,8 +129,13 @@ class Cassie
   # Force reconnection. If you're using this code in conjunction in a forking server environment
   # like passenger or unicorn you should call this method after forking.
   def reconnect
-    disconnect
-    connect
+    existing_session = @session
+    @monitor.synchronize do
+      if @session == existing_session
+        disconnect
+        connect
+      end
+    end
   end
 
   # Prepare a CQL statement for repeate execution. Prepared statements
@@ -307,8 +316,8 @@ class Cassie
       end
 
       session.execute(statement, options || {})
-    rescue Cassandra::Errors::IOError => e
-      disconnect
+    rescue Cassandra::Errors::NoHostsAvailable => e
+      reconnect
       raise e
     ensure
       if statement.is_a?(Cassandra::Statement) && !subscribers.empty?
@@ -330,7 +339,13 @@ class Cassie
   end
 
   def session
-    connect unless connected?
+    unless connected?
+      # Check again inside the monitor lock so we don't get in a race condition
+      # where another thread has already established the connection.
+      @monitor.synchronize do
+        connect unless connected?
+      end
+    end
     @session
   end
 

data/spec/cassie/model_spec.rb

@@ -133,7 +133,7 @@ describe Cassie::Model do
   describe "batch" do
     it "should delegate to Cassie.batch using the write consistency" do
       expect(Cassie::Thing.connection).to be_a(Cassie)
-      expect(Cassie::Thing.connection).to receive(:batch).with(consistency: :quorum).and_call_original
+      expect(Cassie::Thing.connection).to receive(:batch).and_call_original
       Cassie::Thing.batch {}
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whi-cassie
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.4
 platform: ruby
 authors:
 - We Heart It
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver