Merge pull request #2839 from getsentry/sketch-switch

Disable frequency sketches for Redis by default.

Author: ted kaemming

src/sentry/tsdb/redis.py

@@ -96,13 +96,15 @@ def __init__(self, prefix='ts:', vnodes=64, **options):
         self.cluster, options = get_cluster_from_options(self, options)
         self.prefix = prefix
         self.vnodes = vnodes
+        self.enable_frequency_sketches = options.pop('enable_frequency_sketches', False)
         super(RedisTSDB, self).__init__(**options)
 
     def validate(self):
         logger.debug('Validating Redis version...')
+        version = Version((2, 8, 18)) if self.enable_frequency_sketches else Version((2, 8, 9))
         check_cluster_versions(
             self.cluster,
-            Version((2, 8, 9)),
+            version,
             label='TSDB',
         )
 
@@ -296,6 +298,9 @@ def make_frequency_table_keys(self, model, rollup, timestamp, key):
         )
 
     def record_frequency_multi(self, requests, timestamp=None):
+        if not self.enable_frequency_sketches:
+            return
+
         if timestamp is None:
             timestamp = timezone.now()
 
@@ -332,6 +337,9 @@ def record_frequency_multi(self, requests, timestamp=None):
         self.cluster.execute_commands(commands)
 
     def get_most_frequent(self, model, keys, start, end=None, rollup=None, limit=None):
+        if not self.enable_frequency_sketches:
+            raise NotImplementedError("Frequency sketches are disabled.")
+
         rollup, series = self.get_optimal_rollup_series(start, end, rollup)
 
         commands = {}
@@ -354,6 +362,9 @@ def get_most_frequent(self, model, keys, start, end=None, rollup=None, limit=Non
         return results
 
     def get_frequency_series(self, model, items, start, end=None, rollup=None):
+        if not self.enable_frequency_sketches:
+            raise NotImplementedError("Frequency sketches are disabled.")
+
         rollup, series = self.get_optimal_rollup_series(start, end, rollup)
 
         # Freeze ordering of the members (we'll need these later.)
@@ -381,6 +392,9 @@ def get_frequency_series(self, model, items, start, end=None, rollup=None):
         return results
 
     def get_frequency_totals(self, model, items, start, end=None, rollup=None):
+        if not self.enable_frequency_sketches:
+            raise NotImplementedError("Frequency sketches are disabled.")
+
         responses = {}
 
         for key, series in self.get_frequency_series(model, items, start, end, rollup).iteritems():

tests/sentry/tsdb/test_redis.py

@@ -23,7 +23,8 @@ def setUp(self):
                 (ONE_HOUR, 24),  # 1 days at 1 hour
                 (ONE_DAY, 30),  # 30 days at 1 day
             ),
-            vnodes=64
+            vnodes=64,
+            enable_frequency_sketches=True,
         )
 
     def test_make_counter_key(self):