Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b373de6

Browse files
committedJul 30, 2015
Some fixes
1 parent 0f2da4e commit b373de6

File tree

5 files changed

+123
-96
lines changed

5 files changed

+123
-96
lines changed
 

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ output
77

88
bench_frmw.py
99
lib.prev
10+
benchmark.yml

‎benchmark.example.yml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
---
2+
runs:
3+
threads: [16]
4+
retries: 3
5+
databases:
6+
opts:
7+
path: '/home/bigbes/bin/'
8+
list:
9+
# - name: 'redis-28'
10+
# binary: 'redis-28'
11+
# config: 'redis.conf'
12+
# opts:
13+
# port: 6400
14+
# - name: 'redis-30'
15+
# binary: 'redis-30'
16+
# config: 'redis.conf'
17+
# opts:
18+
# port: 6400
19+
# - name: 'tarantool-tree-165'
20+
# binary: 'tarantool-165'
21+
# config: 'tarantool-tree.lua'
22+
# opts:
23+
# port: 3310
24+
# arena: 0.2
25+
# index: 'tree'
26+
# - name: 'tarantool-hash-165'
27+
# binary: 'tarantool-165'
28+
# config: 'tarantool-hash.lua'
29+
# opts:
30+
# port: 3310
31+
# arena: 0.2
32+
# index: 'hash'
33+
# - name: 'tarantool-tree-166'
34+
# binary: 'tarantool-166'
35+
# config: 'tarantool-tree.lua'
36+
# opts:
37+
# port: 3310
38+
# arena: 0.2
39+
# index: 'tree'
40+
- name: 'tarantool-hash-166'
41+
binary: 'tarantool-166'
42+
config: 'tarantool-hash.lua'
43+
opts:
44+
port: 3310
45+
arena: 0.2
46+
index: 'hash'
47+
host:
48+
host: '---'
49+
user: '---'
50+
# opts:
51+
# ansible_sudo_pass: '---'
52+
# ansible_ssh_private_key_file: '---'
53+
workloads:
54+
params:
55+
recordcount: 3000000
56+
operationcount: 5000000
57+
exporter: 'com.yahoo.ycsb.measurements.exporter.JSONArrayMeasurementsExporter'
58+
measurementtype: 'timeseries'
59+
timeseries.granularity: 2000
60+
fieldcount: 2
61+
list:
62+
# 'A': {
63+
# workloadfile: 'workloads/workloada',
64+
# description: 'Workload A'
65+
# }
66+
# 'B': {
67+
# workloadfile: 'workloads/workloadb',
68+
# description: 'Workload B'
69+
# }
70+
'C': {
71+
workloadfile: 'workloads/workloadc',
72+
description: 'Workload C'
73+
}
74+
# 'D': {
75+
# workloadfile: 'workloads/workloada',
76+
# description: 'Workload D'
77+
# }
78+
# 'E': {
79+
# workloadfile: 'workloads/workloade',
80+
# description: 'Workload E',
81+
# params: {
82+
# operationcount: 200000
83+
# }
84+
# }
85+
# 'F': {
86+
# workloadfile: 'workloads/workloadf',
87+
# description: 'Workload F'
88+
# }
89+
# 'LOAD': {
90+
# workloadfile: 'workloads/workloada',
91+
# description: 'Insert Only',
92+
# params: {
93+
# insertproportion: 1,
94+
# updateproportion: 0,
95+
# readproportion: 0,
96+
# scanproportion: 0
97+
# }
98+
# }
99+
hosts:
100+
- host: '---'
101+
user: '---'
102+
# opts:
103+
# ansible_sudo_pass: '---'
104+
# ansible_ssh_private_key_file: '/home/---/.ssh/id_rsa'
105+
- host: '---'
106+
user: '---'
107+
# opts:
108+
# ansible_sudo_pass: '---'
109+
# ansible_ssh_private_key_file: '/home/---/.ssh/id_rsa'
110+
ansible:
111+
timeout: 60
112+
output: './output/'
113+
...

‎benchmark.yml

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎roles/redis/start/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# service: "name={{ name }}_{{ port }} state=started"
44
# sudo: True
55
- name: start Redis
6-
command: './redis-server redis.conf'
6+
command: './{{ binary }} {{ config }}'
77
args:
8-
chdir: '{{ path }}/{{ name }}'
8+
chdir: '{{ path }}'
99
...

‎roles/tarantool/start/tasks/main.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
# - name: start tarantool
33
# command: tarantoolctl start {{ name }}-ycsb
44
# sudo: true
5-
- name: start Tarantool
6-
command: './tarantool tarantool.lua'
5+
# - name: start Tarantool
6+
# command: './tarantool tarantool.lua'
7+
# args:
8+
# chdir: '{{ path }}/{{ name }}'
9+
- name: start tarantool
10+
shell: './{{ binary }} {{ tarantoolctl }} {{ config }}'
711
args:
8-
chdir: '{{ path }}/{{ name }}'
12+
chdir: '{{ path }}'
913
...

0 commit comments

Comments
 (0)
Please sign in to comment.