You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2018/09/26 09:14:21 UTC

cassandra-dtest git commit: always enable tombstone validation exceptions during tests

Repository: cassandra-dtest
Updated Branches:
  refs/heads/master 02c1cd774 -> 96f90eee2


always enable tombstone validation exceptions during tests

Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-14467

Closes #30


Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/96f90eee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/96f90eee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/96f90eee

Branch: refs/heads/master
Commit: 96f90eee28247cf9a8520e6962b0388f193c7ca8
Parents: 02c1cd7
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu May 31 08:41:11 2018 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Sep 26 11:13:16 2018 +0200

----------------------------------------------------------------------
 dtest_setup.py | 2 ++
 ttl_test.py    | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/96f90eee/dtest_setup.py
----------------------------------------------------------------------
diff --git a/dtest_setup.py b/dtest_setup.py
index 295fa3f..9e3f330 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -417,6 +417,8 @@ class DTestSetup:
         # No more thrift in 4.0, and start_rpc doesn't exists anymore
         if self.cluster.version() >= '4' and 'start_rpc' in values:
             del values['start_rpc']
+        if self.cluster.version() >= '4':
+            values['corrupted_tombstone_strategy'] = 'exception'
 
         self.cluster.set_configuration_options(values)
         logger.debug("Done setting configuration options:\n" + pprint.pformat(self.cluster._config_options, indent=4))

http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/96f90eee/ttl_test.py
----------------------------------------------------------------------
diff --git a/ttl_test.py b/ttl_test.py
index 4a7ad06..d89ca6a 100644
--- a/ttl_test.py
+++ b/ttl_test.py
@@ -567,6 +567,8 @@ class TestRecoverNegativeExpirationDate(TestHelper):
         Check that row with negative overflowed ttl is recovered by offline scrub
         """
         cluster = self.cluster
+        if self.cluster.version() >= '4':
+            cluster.set_configuration_options(values={'corrupted_tombstone_strategy': 'disabled'})
         cluster.populate(1).start(wait_for_binary_proto=True)
         [node] = cluster.nodelist()
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org