Merge pull request #1713 from wiredtiger/shared-cache-reconfigure-bug

Fix a bug in the reconfigure API related to shared cache quotas.

2 files changed, 182 insertions, 26 deletions

diff --git a/test/suite/test_shared_cache.py b/test/suite/test_shared_cache01.py
index ff40d31e6df..e6d712e61bc 100644
--- a/test/suite/test_shared_cache.py
+++ b/test/suite/test_shared_cache01.py
@@ -33,12 +33,12 @@ import wiredtiger, wttest
 from wttest import unittest
 from helper import key_populate, simple_populate
 
-# test_shared_cache.py
+# test_shared_cache01.py
 #    Checkpoint tests
 # Test shared cache shared amongst multiple connections.
-class test_shared_cache(wttest.WiredTigerTestCase):
+class test_shared_cache01(wttest.WiredTigerTestCase):
 
-    uri = 'table:test_shared_cache'
+    uri = 'table:test_shared_cache01'
     # Setup fairly large items to use up cache
     data_str = 'abcdefghijklmnopqrstuvwxyz' * 20
 
@@ -89,7 +89,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.sessions = [] # Implicitly closed when closing sessions.
 
     # Basic test of shared cache
-    def test_shared_cache01(self):
+    def test_shared_cache_basic(self):
         nops = 1000
         self.openConnections(['WT_TEST1', 'WT_TEST2'])
 
@@ -99,7 +99,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.closeConnections()
 
     # Test of shared cache with more connections
-    def test_shared_cache02(self):
+    def test_shared_cache_more_connections(self):
         nops = 1000
         self.openConnections(['WT_TEST1', 'WT_TEST2', 'WT_TEST3', 'WT_TEST4'])
 
@@ -109,7 +109,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.closeConnections()
 
     # Do enough work for the shared cache to be fully allocated.
-    def test_shared_cache03(self):
+    def test_shared_cache_full(self):
         nops = 10000
         self.openConnections(['WT_TEST1', 'WT_TEST2'])
         for sess in self.sessions:
@@ -121,7 +121,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.closeConnections()
 
     # Switch the work between connections, to test rebalancing.
-    def test_shared_cache04(self):
+    def test_shared_cache_rebalance(self):
         # About 100 MB of data with ~250 byte values.
         nops = 200000
         self.openConnections(['WT_TEST1', 'WT_TEST2'])
@@ -132,7 +132,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.closeConnections()
 
     # Add a new connection once the shared cache is already established.
-    def test_shared_cache05(self):
+    def test_shared_cache_late_join(self):
         nops = 1000
         self.openConnections(['WT_TEST1', 'WT_TEST2'])
 
@@ -147,7 +147,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.closeConnections()
 
     # Close a connection and keep using other connections.
-    def test_shared_cache06(self):
+    def test_shared_cache_leaving(self):
         nops = 10000
         self.openConnections(['WT_TEST1', 'WT_TEST2', 'WT_TEST3'])
 
@@ -163,7 +163,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
 
     # Test verbose output
     @unittest.skip("Verbose output handling")
-    def test_shared_cache07(self):
+    def test_shared_cache_verbose(self):
         nops = 1000
         self.openConnections(
                 ['WT_TEST1', 'WT_TEST2'], extra_opts="verbose=[shared_cache]")
@@ -174,7 +174,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.closeConnections()
 
     # Test opening a connection outside of the shared cache
-    def test_shared_cache08(self):
+    def test_shared_cache_mixed(self):
         nops = 1000
         self.openConnections(['WT_TEST1', 'WT_TEST2'])
 
@@ -185,7 +185,7 @@ class test_shared_cache(wttest.WiredTigerTestCase):
         self.closeConnections()
 
     # Test default config values
-    def test_shared_cache09(self):
+    def test_shared_cache_defaults(self):
         nops = 1000
         self.openConnections(['WT_TEST1', 'WT_TEST2'], pool_opts=',shared_cache=(name=pool,size=200M)')
 
@@ -194,21 +194,8 @@ class test_shared_cache(wttest.WiredTigerTestCase):
             self.add_records(sess, 0, nops)
         self.closeConnections()
 
-    # Test reconfigure API
-    def test_shared_cache10(self):
-        nops = 1000
-        self.openConnections(['WT_TEST1', 'WT_TEST2'])
-
-        for sess in self.sessions:
-            sess.create(self.uri, "key_format=S,value_format=S")
-            self.add_records(sess, 0, nops)
-
-        connection = self.conns[0]
-        connection.reconfigure("shared_cache=(name=pool,size=300M)")
-        self.closeConnections()
-
     # Test default config values
-    def test_shared_cache11(self):
+    def test_shared_cache_defaults2(self):
         nops = 1000
         self.openConnections(['WT_TEST1', 'WT_TEST2'], pool_opts=',shared_cache=(name=pool)')
 
diff --git a/test/suite/test_shared_cache02.py b/test/suite/test_shared_cache02.py
new file mode 100644
index 00000000000..3806e9d0cda
--- /dev/null
+++ b/test/suite/test_shared_cache02.py
@@ -0,0 +1,169 @@
+#!/usr/bin/env python
+#
+# Public Domain 2014-2015 MongoDB, Inc.
+# Public Domain 2008-2014 WiredTiger, Inc.
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+# If unittest2 is available, use it in preference to (the old) unittest
+
+import os
+import shutil
+import wiredtiger, wttest
+from wttest import unittest
+from helper import key_populate, simple_populate
+
+# test_shared_cache02.py
+#    Shared cache tests
+# Test shared cache shared amongst multiple connections.
+class test_shared_cache02(wttest.WiredTigerTestCase):
+
+    uri = 'table:test_shared_cache02'
+    # Setup fairly large items to use up cache
+    data_str = 'abcdefghijklmnopqrstuvwxyz' * 20
+
+    # Add a set of records
+    def add_records(self, session, start, stop):
+        cursor = session.open_cursor(self.uri, None, "overwrite")
+        for i in range(start, stop+1):
+            cursor.set_key("%010d KEY------" % i)
+            cursor.set_value("%010d VALUE "% i + self.data_str)
+            self.assertEqual(cursor.insert(), 0)
+        cursor.close()
+
+    # Disable default setup/shutdown steps - connections are managed manually.
+    def setUpSessionOpen(self, conn):
+        return None
+
+    def close_conn(self):
+        return None
+
+    def setUpConnectionOpen(self, dir):
+        return None
+
+    def openConnections(
+            self,
+            connections,
+            pool_opts = ',shared_cache=(name=pool,size=200M,chunk=10M,reserve=30M),',
+            extra_opts = '',
+            add=0):
+        if add == 0:
+            self.conns = []
+            self.sessions = []
+        # Open the set of connections.
+        for name in connections:
+            shutil.rmtree(name, True)
+            os.mkdir(name)
+            next_conn =  wiredtiger.wiredtiger_open(
+                name,
+                'create,error_prefix="' + self.shortid() + ': "' +
+                pool_opts + extra_opts)
+            self.conns.append(next_conn)
+            self.sessions.append(next_conn.open_session(None))
+        return None
+
+    def closeConnections(self):
+        for tmp_conn in self.conns:
+            tmp_conn.close()
+        self.conns = []
+        self.sessions = [] # Implicitly closed when closing sessions.
+
+    # Test reconfigure API
+    def test_shared_cache_reconfig01(self):
+        nops = 1000
+        self.openConnections(['WT_TEST1', 'WT_TEST2'])
+
+        for sess in self.sessions:
+            sess.create(self.uri, "key_format=S,value_format=S")
+            self.add_records(sess, 0, nops)
+
+        connection = self.conns[0]
+        connection.reconfigure("shared_cache=(name=pool,size=300M)")
+        self.closeConnections()
+
+    # Test reconfigure that grows the usage over quota fails
+    def test_shared_cache_reconfig02(self):
+        nops = 1000
+        self.openConnections(['WT_TEST1', 'WT_TEST2'],
+            pool_opts = ',shared_cache=(name=pool,size=50M,reserve=20M),')
+
+        for sess in self.sessions:
+            sess.create(self.uri, "key_format=S,value_format=S")
+            self.add_records(sess, 0, nops)
+
+        connection = self.conns[0]
+        # Reconfigure to over-subscribe, call should fail with an error
+        self.assertRaisesWithMessage(wiredtiger.WiredTigerError,
+            lambda: connection.reconfigure("shared_cache=(name=pool,reserve=40M)"),
+            '/Shared cache unable to accommodate this configuration/')
+        # TODO: Ensure that the reserve size wasn't updated.
+        # cursor = self.sessions[0].open_cursor('config:', None, None)
+        # value = cursor['connection']
+        # self.assertTrue(value.find('reserve') != -1)
+
+        self.closeConnections()
+
+    # Test reconfigure that would grow the usage over quota if the
+    # previous reserve size isn't taken into account
+    def test_shared_cache_reconfig03(self):
+        nops = 1000
+        self.openConnections(['WT_TEST1', 'WT_TEST2'],
+            pool_opts = ',shared_cache=(name=pool,size=50M,reserve=20M),')
+
+        for sess in self.sessions:
+            sess.create(self.uri, "key_format=S,value_format=S")
+            self.add_records(sess, 0, nops)
+
+        connection = self.conns[0]
+
+        connection.reconfigure("shared_cache=(name=pool,reserve=30M)"),
+
+        # TODO: Ensure that the reserve size was updated.
+        # cursor = self.sessions[0].open_cursor('config:', None, None)
+        # value = cursor['connection']
+        # self.assertTrue(value.find('reserve') != -1)
+
+        self.closeConnections()
+
+    # Test reconfigure that switches to using a shared cache
+    # previous reserve size isn't taken into account
+    def test_shared_cache_reconfig03(self):
+        nops = 1000
+        self.openConnections(['WT_TEST1', 'WT_TEST2'], pool_opts = ',')
+
+        for sess in self.sessions:
+            sess.create(self.uri, "key_format=S,value_format=S")
+            self.add_records(sess, 0, nops)
+
+        self.conns[0].reconfigure("shared_cache=(name=pool,reserve=20M)"),
+        self.conns[1].reconfigure("shared_cache=(name=pool,reserve=20M)"),
+
+        # TODO: Ensure that the reserve size was updated.
+        # cursor = self.sessions[0].open_cursor('config:', None, None)
+        # value = cursor['connection']
+        # self.assertTrue(value.find('reserve') != -1)
+
+        self.closeConnections()
+
+if __name__ == '__main__':
+    wttest.run()