cassie 1.1.7 → 1.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 516dd219afc382e2f7ccebfa43998423d51d75a9
-  data.tar.gz: e2e3a2d435b809d9643189ced3173d41f60b8eab
+  metadata.gz: 5bb6cb16602c5cb41e80bdb4b4ad94be40c1da78
+  data.tar.gz: 4917f132273bd32583d55c50c3d83a8a14cac85e
 SHA512:
-  metadata.gz: 71762ac6ddf825494856ba4e8bf4a5fc2f90ac6bc7b5d31c5b9f015d8e5e175056dcfdea28d6206829562eeb7ed3f23734e286b1f24e62002fe4f978e257fe93
-  data.tar.gz: 28097a2f129db304102ea029aff231723ea011af6768590d1f3b40b1a9a193b069f4c3890fcd5e73cce4ae9a6f54fa4b0038059154aa9b6c91c9b1b45f44cda0
+  metadata.gz: 9f4f335f7fe3ecf6011ed9af858cba5cbe0d621523f59831245c1fd14730a590fdbb0b0b6538037194c25d4471a8e08d41b401ce69c085be62a0ebba8cf31f40
+  data.tar.gz: adf8a2beb2069df8812ce33de0996265dbcec108bba7cf848fe892fca20f9587e562828e0d9129f699f76d0688569ec00d39f2e8c2d680681e025100411012c8

data/lib/cassie/connection_handler/cluster.rb

@@ -11,6 +11,7 @@ module Cassie::ConnectionHandler
 
     included do
       include Instrumentation
+      CREATE_CLUSTER_LOCK = Mutex.new
     end
 
     # The cluster connection and metadata. This cluster connection is
@@ -50,7 +51,13 @@ module Cassie::ConnectionHandler
     protected
 
     def initialize_cluster
-      Cassandra.cluster(configuration.try(:symbolize_keys))
+      CREATE_CLUSTER_LOCK.synchronize do
+        # check to see if another thread
+        # initialized the cluster while
+        # we waited on lock to be available
+        # e.g. this ||= is critical
+        @cluster ||= Cassandra.cluster(configuration.try(:symbolize_keys))
+      end
     end
   end
 end

data/lib/cassie/connection_handler/sessions.rb

@@ -5,9 +5,10 @@ module Cassie::ConnectionHandler
 
     included do
       include Instrumentation
+      CREATE_SESSION_LOCK = Mutex.new
     end
 
-    # Sessions cache containint sessions that
+    # Sessions cache containing sessions that
     # have been opened to the {#cluster}
     # @return [Hash{String => Cassandra::Session}] The underlying driver sessions, keyed by keyspaced name
     # @!parse attr_reader :sessions
@@ -18,16 +19,29 @@ module Cassie::ConnectionHandler
     # Fetches a session from the sessions cache.
     # If no session has been opened to the requested keyspace
     # a new session is created to the {#cluster} and cached.
+    # @note this method is thread-safe, only one session will be opened
+    #   per keyspace regardless of how many threads are accessing.
+    # @note there is no connection pooling happening here, +cassandra_driver+
+    #   manages per node connection pools within the +Session+ object.
     # @param [String] keyspace The keyspace used for session scope. If +nil+, session will not be scoped (scoped to global space).
     # @return [Cassandra::Session]
     def session(keyspace=self.keyspace)
-      sessions[keyspace] || initialize_session(keyspace)
+      return sessions[keyspace] || initialize_session(keyspace)
     end
 
     protected
 
+    # thread safe initialization
+    # only one session should be initialized
+    # per keyspace
     def initialize_session(keyspace)
-      @sessions[keyspace] = cluster.connect(keyspace)
+      CREATE_SESSION_LOCK.synchronize do
+        # check to see if another thread
+        # initialized the session while
+        # we waited on lock to be available
+        # e.g. this ||= is critical
+        @sessions[keyspace] ||= cluster.connect(keyspace)
+      end
     end
   end
 end

data/lib/cassie/support/system_command.rb

@@ -98,8 +98,8 @@ module Cassie
         t1=Time.now
 
         IO.popen(command) do |io|
-          @status=Process.waitpid2(io.pid)[1]
-          @output=io.read.sub(/\n\z/, "")
+          @output= io.read.sub(/\n+\z/, "")
+          @status= Process.waitpid2(io.pid)[1]
         end
 
         @duration=Time.now-t1

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.1.7"
+  VERSION = "1.2.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0.pre1
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -269,9 +269,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2