Merge pull request #353 from dblock/fix-345

Fix + spec for #345.

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Overview
 
+## Next
+
+### Resolved Issues
+
+* \#345
+  Writes fail with ConnectionPool::PoolShuttingDownError. (fedenusy, dblock)
+
 ## 2.0.3
 
 ### Resolved Issues

lib/moped/node.rb

@@ -150,10 +150,10 @@ def disconnect
     #
     # @since 2.0.0
     def down!
-      @pool = Connection::Manager.shutdown(self)
       @down_at = Time.new
+      @pool = nil
       @latency = nil
-      true
+      Connection::Manager.shutdown(self)
     end
 
     # Yields the block if a connection can be established, retrying when a

spec/moped/node_spec.rb

@@ -63,15 +63,33 @@
     end
   end
 
-  pending '#down!' do
+  describe '#down!' do
+    describe 'when connected' do
+      before do
+        node.connected?
+      end
 
-    before do
-      node.connected?
-      node.down!
-    end
+      describe 'shutdown' do
+        before do
+          node.down!
+        end
 
-    it 'clears out the connection pool' do
-      expect(node.instance_variable_get(:@pool)).to be_nil
+        it 'clears out the connection pool' do
+          expect(node.instance_variable_get(:@pool)).to be_nil
+        end
+      end
+
+      describe 'shutdown from multiple threads' do
+        before do
+          # fake the behavior of @pool that holds its value until shutdown returns
+          allow(Moped::Connection::Manager).to receive(:shutdown).and_return(node.instance_variable_get(:@pool)).once
+          node.down!
+        end
+
+        it 'clears out the connection pool before returning' do
+          expect(node.instance_variable_get(:@pool)).to be_nil
+        end
+      end
     end
   end