Skip to content

Commit d203977

Browse files
bochunvikas-getconnect
authored andcommitted
support raw query statements
Change-Id: I84a48fd45c7995e223fe86b33add1a2861c0728f Reviewed-on: https://review.couchbase.org/c/perfrunner/+/190466 Tested-by: Build Bot <[email protected]> Reviewed-by: vikas chaudhary <[email protected]>
1 parent 9d32282 commit d203977

9 files changed

+604
-1
lines changed

cbagent/collectors/latency.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,14 @@ async def post_results(self, bucket: str):
8383
def reconstruct(self):
8484
if self.remote_workers:
8585
self.get_remote_stat_files()
86-
loop = asyncio.get_event_loop()
86+
87+
# Create a new event loop if the current one is closed
88+
if (loop := asyncio.get_event_loop()).is_closed():
89+
loop = asyncio.new_event_loop()
90+
8791
for bucket in self.get_buckets():
8892
loop.run_until_complete(self.post_results(bucket))
93+
8994
loop.close()
9095

9196

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[infrastructure]
2+
provider = capella
3+
backend = gcp
4+
5+
[clusters]
6+
couchbase1 =
7+
gce.gce_cluster_1.gce_node_group_1.1:kv
8+
gce.gce_cluster_1.gce_node_group_1.2:kv
9+
gce.gce_cluster_1.gce_node_group_1.3:kv
10+
gce.gce_cluster_1.gce_node_group_1.4:kv
11+
gce.gce_cluster_1.gce_node_group_2.1:index,n1ql
12+
gce.gce_cluster_1.gce_node_group_2.2:index,n1ql
13+
gce.gce_cluster_1.gce_node_group_2.3:index,n1ql
14+
15+
[clients]
16+
workers1 =
17+
gce.gce_cluster_1.gce_node_group_3.1
18+
19+
[utilities]
20+
brokers1 = gce.gce_cluster_1.gce_node_group_4.1
21+
22+
[gce]
23+
clusters = gce_cluster_1
24+
25+
[gce_cluster_1]
26+
node_groups = gce_node_group_1,gce_node_group_2,gce_node_group_3,gce_node_group_4
27+
storage_class = pd-ssd
28+
29+
[gce_node_group_1]
30+
instance_type = n2-highmem-16
31+
instance_capacity = 4
32+
volume_size = 1000
33+
volume_type = pd-ssd
34+
35+
[gce_node_group_2]
36+
instance_type = n2-highmem-32
37+
instance_capacity = 3
38+
volume_size = 1500
39+
volume_type = pd-ssd
40+
41+
[gce_node_group_3]
42+
instance_type = n2-standard-64
43+
instance_capacity = 1
44+
volume_size = 100
45+
volume_type = pd-ssd
46+
47+
[gce_node_group_4]
48+
instance_type = n2-standard-32
49+
instance_capacity = 1
50+
51+
[storage]
52+
data = /data
53+
backup = gs://perftest-gcp-backup
54+
55+
[credentials]
56+
rest = Administrator:Password123!
57+
ssh = root:couchbase
58+
59+
[parameters]
60+
OS = CentOS 7
61+
CPU = Data: n2-highmem-16 (16vCPU), Index/Query: n2-highmem-32 (32vCPU)
62+
Memory = Data: 128GB, Index/Query: 256GB
63+
Disk = pd-ssd, Data: 1TB 25000 IOPS, Index/Query: 1.5TB 51000 IOPS
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[infrastructure]
2+
provider = capella
3+
backend = gcp
4+
5+
[clusters]
6+
couchbase1 =
7+
gce.gce_cluster_1.gce_node_group_1.1:kv
8+
gce.gce_cluster_1.gce_node_group_1.2:kv
9+
gce.gce_cluster_1.gce_node_group_1.3:kv
10+
gce.gce_cluster_1.gce_node_group_1.4:kv
11+
gce.gce_cluster_1.gce_node_group_2.1:index,n1ql
12+
gce.gce_cluster_1.gce_node_group_2.2:index,n1ql
13+
gce.gce_cluster_1.gce_node_group_2.3:index,n1ql
14+
15+
[clients]
16+
workers1 =
17+
gce.gce_cluster_1.gce_node_group_3.1
18+
19+
[utilities]
20+
brokers1 = gce.gce_cluster_1.gce_node_group_4.1
21+
22+
[gce]
23+
clusters = gce_cluster_1
24+
25+
[gce_cluster_1]
26+
node_groups = gce_node_group_1,gce_node_group_2,gce_node_group_3,gce_node_group_4
27+
storage_class = pd-ssd
28+
29+
[gce_node_group_1]
30+
instance_type = n2-highmem-8
31+
instance_capacity = 4
32+
volume_size = 1000
33+
volume_type = pd-ssd
34+
35+
[gce_node_group_2]
36+
instance_type = n2-highmem-32
37+
instance_capacity = 3
38+
volume_size = 1500
39+
volume_type = pd-ssd
40+
41+
[gce_node_group_3]
42+
instance_type = n2-standard-64
43+
instance_capacity = 1
44+
volume_size = 100
45+
volume_type = pd-ssd
46+
47+
[gce_node_group_4]
48+
instance_type = n2-standard-32
49+
instance_capacity = 1
50+
51+
[storage]
52+
data = /data
53+
backup = gs://perftest-gcp-backup
54+
55+
[credentials]
56+
rest = Administrator:Password123!
57+
ssh = root:couchbase
58+
59+
[parameters]
60+
OS = CentOS 7
61+
CPU = Data: n2-highmem-8 (8vCPU), Index/Query: n2-highmem-32 (32vCPU)
62+
Memory = Data: 64GB, Index/Query: 256GB
63+
Disk = pd-ssd, Data: 1TB 25000 IOPS, Index/Query: 1.5TB 51000 IOPS
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
[infrastructure]
2+
provider = capella
3+
backend = gcp
4+
5+
[clusters]
6+
couchbase1 =
7+
gce.gce_cluster_1.gce_node_group_1.1:kv
8+
gce.gce_cluster_1.gce_node_group_1.2:kv
9+
gce.gce_cluster_1.gce_node_group_1.3:kv
10+
gce.gce_cluster_1.gce_node_group_1.4:kv
11+
gce.gce_cluster_1.gce_node_group_2.1:index,n1ql
12+
gce.gce_cluster_1.gce_node_group_2.2:index,n1ql
13+
gce.gce_cluster_1.gce_node_group_2.3:index,n1ql
14+
gce.gce_cluster_1.gce_node_group_2.4:index,n1ql
15+
16+
[clients]
17+
workers1 =
18+
gce.gce_cluster_1.gce_node_group_3.1
19+
20+
[utilities]
21+
brokers1 = gce.gce_cluster_1.gce_node_group_4.1
22+
23+
[gce]
24+
clusters = gce_cluster_1
25+
26+
[gce_cluster_1]
27+
node_groups = gce_node_group_1,gce_node_group_2,gce_node_group_3,gce_node_group_4
28+
storage_class = pd-ssd
29+
30+
[gce_node_group_1]
31+
instance_type = n2-highmem-8
32+
instance_capacity = 4
33+
volume_size = 1000
34+
volume_type = pd-ssd
35+
36+
[gce_node_group_2]
37+
instance_type = n2-highmem-32
38+
instance_capacity = 4
39+
volume_size = 1500
40+
volume_type = pd-ssd
41+
42+
[gce_node_group_3]
43+
instance_type = n2-standard-64
44+
instance_capacity = 1
45+
volume_size = 100
46+
volume_type = pd-ssd
47+
48+
[gce_node_group_4]
49+
instance_type = n2-standard-32
50+
instance_capacity = 1
51+
52+
[storage]
53+
data = /data
54+
backup = gs://perftest-gcp-backup
55+
56+
[credentials]
57+
rest = Administrator:Password123!
58+
ssh = root:couchbase
59+
60+
[parameters]
61+
OS = CentOS 7
62+
CPU = Data: n2-highmem-8 (8vCPU), Index/Query: n2-highmem-32 (32vCPU)
63+
Memory = Data: 64GB, Index/Query: 256GB
64+
Disk = pd-ssd, Data: 1TB 25000 IOPS, Index/Query: 1.5TB 51000 IOPS

perfrunner/remote/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ def init_repo(self, worker_home: str):
4141
with cd(worker_home):
4242
run('git clone -q {}'.format(REPO))
4343
with cd('perfrunner'):
44+
run('git fetch https://review.couchbase.org/perfrunner refs/changes/66/190466/15 '
45+
'&& git cherry-pick FETCH_HEAD')
4446
run('make')
4547

4648
@all_clients

0 commit comments

Comments
 (0)