add random seed to analytics query and update resync tests

Change-Id: I93f5be74966b2630054229c419f6aae0ae821d36
Reviewed-on: http://review.couchbase.org/c/perfrunner/+/145613
Tested-by: Build Bot <[email protected]>
Reviewed-by: Korrigan Clark <[email protected]>

Author: bochun

perfrunner/tests/analytics.py

@@ -1,4 +1,5 @@
 import json
+import random
 import time
 from typing import List, Tuple
 
@@ -112,9 +113,9 @@ def sync(self):
                                                                self.analytics_nodes[0])
 
     def re_sync(self):
+        self.connect_buckets()
         for target in self.target_iterator:
-            self.connect_bucket(target.bucket)
-            self.monitor.monitor_data_synced(target.node, target.bucket)
+            self.monitor.monitor_data_synced(target.node, target.bucket, self.analytics_nodes[0])
 
     def set_analytics_logging_level(self):
         log_level = self.test_config.analytics_settings.log_level
@@ -231,7 +232,7 @@ def run(self):
 
         self.sync()
 
-        self.disconnect()
+        self.disconnect_link()
 
         super().run()
 
@@ -271,6 +272,7 @@ def _report_kpi(self, results: List[Tuple[Query, int]]):
             )
 
     def run(self):
+        random.seed(8095)
         super().run()
 
         self.sync()

tests/analytics/bigfun_20M_sync_1n_1io_incr.test

@@ -19,7 +19,6 @@ initial_nodes = 3
 num_buckets = 1
 
 [bucket]
-replica_number = 0
 eviction_policy = fullEviction
 
 [analytics]

tests/analytics/bigfun_20M_sync_1n_incr.test

@@ -19,7 +19,6 @@ initial_nodes = 3
 num_buckets = 1
 
 [bucket]
-replica_number = 0
 eviction_policy = fullEviction
 
 [analytics]

tests/analytics/bigfun_20M_sync_2n_1io_incr.test

@@ -19,7 +19,6 @@ initial_nodes = 4
 num_buckets = 1
 
 [bucket]
-replica_number = 0
 eviction_policy = fullEviction
 
 [analytics]

tests/analytics/bigfun_20M_sync_2n_incr.test

@@ -19,7 +19,6 @@ initial_nodes = 4
 num_buckets = 1
 
 [bucket]
-replica_number = 0
 eviction_policy = fullEviction
 
 [analytics]

tests/analytics/bigfun_20M_sync_4n_1io_incr.test

@@ -19,7 +19,6 @@ initial_nodes = 6
 num_buckets = 1
 
 [bucket]
-replica_number = 0
 eviction_policy = fullEviction
 
 [analytics]

tests/analytics/bigfun_20M_sync_4n_1s_3c_incr.test

@@ -0,0 +1,35 @@
+[test_case]
+test = perfrunner.tests.analytics.BigFunIncrSyncTest
+use_workers = 0
+
+[showfast]
+title = Avg. incremental ingestion rate (items/sec), 4 nodes, BigFUN 20M users (320M docs), 3 indexes, SSD, s=1 c=3
+component = analytics
+category = sync
+sub_category = Initial
+orderby = _ssd_4n_3
+
+[stats]
+server_processes = java
+
+[cluster]
+mem_quota = 20480
+analytics_mem_quota = 20480
+initial_nodes = 6
+num_buckets = 1
+
+[bucket]
+eviction_policy = fullEviction
+
+[collection]
+config = collections/1bucket_1scope_3collections_analytics.json
+
+[analytics]
+num_io_devices = 4
+analytics_config_file = tests/analytics/config/3_datasets_collection_config.json
+
+[restore]
+backup_storage = /data2/backup/3collections/
+backup_repo = default
+threads = 8
+map_data = bucket-1.scope-1.GleambookUsers=bucket-1.scope-1.GleambookUsers-1,bucket-1.scope-1.GleambookMessages=bucket-1.scope-1.GleambookMessages-1,bucket-1.scope-1.ChirpMessages=bucket-1.scope-1.ChirpMessages-1

tests/analytics/bigfun_20M_sync_4n_incr.test

@@ -19,7 +19,6 @@ initial_nodes = 6
 num_buckets = 1
 
 [bucket]
-replica_number = 0
 eviction_policy = fullEviction
 
 [analytics]