Merge branch 'master' into 4.x

aboudreault · aboudreault · commit ab241e70a4a0 · 2018-04-28T10:29:18.000-04:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -21,9 +21,15 @@ Other
 * cqlengine: Remove Model.__default_ttl__ (PYTHON-889)
 * Remove Cluster.set_meta_refresh_enabled (PYTHON-890)
 
+3.15.0
+======
+Bug Fixes
+---------
+* Tokenmap.get_replicas returns the wrong value if token coincides with the end of the range (PYTHON-978)
 
 3.14.0
 ======
+April 17, 2018
 
 Features
 --------
diff --git a/build.yaml b/build.yaml
@@ -146,17 +146,6 @@ build:
       echo "Installing simulacron"
       pushd ~
 
-      if [ ! -d "simulacron" ] ; then
-        git clone git@github.com:datastax/simulacron.git
-        cd simulacron
-        git clone git@github.com:datastax/native-protocol.git
-        cd native-protocol
-        mvn clean install
-        cd ../..
-      fi
-      cd simulacron
-      mvn clean install -DskipTests=true
-      ls standalone/target
       SIMULACRON_JAR=`find \`pwd\` -name "simulacron-standalone-*.jar"`
       echo "SIMULACRON_JAR: $SIMULACRON_JAR"
 
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from binascii import unhexlify
-from bisect import bisect_right
+from bisect import bisect_left
 from collections import defaultdict, Mapping
 from functools import total_ordering
 from hashlib import md5
@@ -1481,10 +1481,9 @@ def get_replicas(self, keyspace, token):
             tokens_to_hosts = self.tokens_to_hosts_by_ks.get(keyspace, None)
 
         if tokens_to_hosts:
-            # token range ownership is exclusive on the LHS (the start token), so
-            # we use bisect_right, which, in the case of a tie/exact match,
-            # picks an insertion point to the right of the existing match
-            point = bisect_right(self.ring, token)
+            # The values in self.ring correspond to the end of the
+            # token range up to and including the value listed.
+            point = bisect_left(self.ring, token)
             if point == len(self.ring):
                 return tokens_to_hosts[self.ring[0]]
             else:
diff --git a/tests/integration/standard/test_authentication.py b/tests/integration/standard/test_authentication.py
@@ -86,7 +86,7 @@ def test_auth_connect(self):
             session = cluster.connect()
             try:
                 self.assertTrue(session.execute('SELECT release_version FROM system.local'))
-                assert_quiescent_pool_state(self, cluster)
+                assert_quiescent_pool_state(self, cluster, wait=1)
                 for pool in session.get_pools():
                     connection, _ = pool.borrow_connection(timeout=0)
                     self.assertEqual(connection.authenticator.server_authenticator_class, 'org.apache.cassandra.auth.PasswordAuthenticator')
@@ -95,7 +95,7 @@ def test_auth_connect(self):
                 cluster.shutdown()
         finally:
             root_session.execute('DROP USER %s', user)
-            assert_quiescent_pool_state(self, root_session.cluster)
+            assert_quiescent_pool_state(self, root_session.cluster, wait=1)
             root_session.cluster.shutdown()
 
     def test_connect_wrong_pwd(self):
diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py
@@ -1007,8 +1007,8 @@ def test_token_map(self):
 
         for i, token in enumerate(ring):
             self.assertEqual(set(get_replicas('test3rf', token)), set(owners))
-            self.assertEqual(set(get_replicas('test2rf', token)), set([owners[(i + 1) % 3], owners[(i + 2) % 3]]))
-            self.assertEqual(set(get_replicas('test1rf', token)), set([owners[(i + 1) % 3]]))
+            self.assertEqual(set(get_replicas('test2rf', token)), set([owners[i], owners[(i + 1) % 3]]))
+            self.assertEqual(set(get_replicas('test1rf', token)), set([owners[i]]))
         cluster.shutdown()
 
 
diff --git a/tests/integration/util.py b/tests/integration/util.py
@@ -13,8 +13,23 @@
 # limitations under the License.
 
 from tests.integration import PROTOCOL_VERSION
+import time
 
-def assert_quiescent_pool_state(test_case, cluster):
+
+def assert_quiescent_pool_state(test_case, cluster, wait=None):
+    """
+    Checking the quiescent pool state checks that none of the requests ids have
+    been lost. However, the callback corresponding to a request_id is called
+    before the request_id is returned back to the pool, therefore
+
+    session.execute("SELECT * from system.local")
+    assert_quiescent_pool_state(self, session.cluster)
+
+    (with no wait) might fail because when execute comes back the request_id
+    hasn't yet been returned to the pool, therefore the wait.
+    """
+    if wait is not None:
+        time.sleep(wait)
 
     for session in cluster.sessions:
         pool_states = session.get_pool_state().values()
@@ -32,4 +47,3 @@ def assert_quiescent_pool_state(test_case, cluster):
             test_case.assertEqual(len(req_ids), len(set(req_ids)))
             test_case.assertEqual(connection.highest_request_id, len(req_ids) - 1)
             test_case.assertEqual(connection.highest_request_id, max(req_ids))
-
diff --git a/tests/unit/test_metadata.py b/tests/unit/test_metadata.py
@@ -312,8 +312,7 @@ def _get_replicas(self, token_klass):
         token_map = TokenMap(token_klass, token_to_primary_replica, tokens, metadata)
 
         # tokens match node tokens exactly
-        for i, token in enumerate(tokens):
-            expected_host = hosts[(i + 1) % len(hosts)]
+        for token, expected_host in zip(tokens, hosts):
             replicas = token_map.get_replicas("ks", token)
             self.assertEqual(set(replicas), {expected_host})
 
