Skip to content

Commit

Permalink
Add config files
Browse files Browse the repository at this point in the history
  • Loading branch information
aminst committed Dec 12, 2023
1 parent e5dfc1b commit 796bde2
Show file tree
Hide file tree
Showing 12 changed files with 233 additions and 72 deletions.
64 changes: 50 additions & 14 deletions configs/default/oramnode_endpoints.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,55 @@
endpoints:
- exposed_ip: localhost
local_bind_ip: localhost
port: 8751
port: 2751
id: 0
replicaid: 0
raftport: 3127
- exposed_ip: localhost
local_bind_ip: localhost
port: 8752
id: 0
replicaid: 1
raftport: 3128
- exposed_ip: localhost
local_bind_ip: localhost
port: 8753
id: 0
replicaid: 2
raftport: 3129
raftport: 1127
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2752
# id: 0
# replicaid: 1
# raftport: 1128
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2753
# id: 0
# replicaid: 2
# raftport: 1129
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2754
# id: 1
# replicaid: 0
# raftport: 1130
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2755
# id: 1
# replicaid: 1
# raftport: 1131
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2756
# id: 1
# replicaid: 2
# raftport: 1132
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2757
# id: 2
# replicaid: 0
# raftport: 1133
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2758
# id: 2
# replicaid: 1
# raftport: 1134
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 2759
# id: 2
# replicaid: 2
# raftport: 1135
12 changes: 7 additions & 5 deletions configs/default/parameters.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
max-blocks-to-send: 200 # The maximum number of blocks to send from each shard node to the oram node during evictions
eviction-rate: 1 # How many ReadPath operations before eviction
eviction-rate: 1000000 # How many ReadPath operations before eviction
evict-path-count: 200 # How many paths to evict at a time
batch-timeout: 25 # How many milliseconds to wait before sending a batch of blocks to the oram node
epoch-time: 25 # How many milliseconds between each epoch
batch-timeout: 5 # How many milliseconds to wait before sending a batch of blocks to the oram node
epoch-time: 5 # How many milliseconds between each epoch
trace: false # Whether to use opentelemetry and jaeger
Z: 1 # number of real blocks per bucket
S: 9 # number of dummy blocks per bucket
shift: 1 # 2^shift is the tree branching factor
tree-height: 11 # height of the tree
max-requests: 3000 # maximum number of requests in flight at the client
tree-height: 15 # height of the tree
max-requests: 40000 # maximum number of requests in flight at the client
log: true # whether to log
profile: false # Whether to profile
13 changes: 12 additions & 1 deletion configs/default/redis_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,15 @@ endpoints:
- exposed_ip: localhost
local_bind_ip: localhost
port: 6379
id: 0
id: 0
oramnode_id: 0
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 6380
# id: 1
# oramnode_id: 1
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 6381
# id: 2
# oramnode_id: 2
6 changes: 5 additions & 1 deletion configs/default/router_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ endpoints:
- exposed_ip: localhost
local_bind_ip: localhost
port: 8745
id: 0
id: 0
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 8746
# id: 1
42 changes: 30 additions & 12 deletions configs/default/shardnode_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,33 @@ endpoints:
id: 0
replicaid: 0
raftport: 3124
- exposed_ip: localhost
local_bind_ip: localhost
port: 8749
id: 0
replicaid: 1
raftport: 3125
- exposed_ip: localhost
local_bind_ip: localhost
port: 8750
id: 0
replicaid: 2
raftport: 3126
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 8749
# id: 0
# replicaid: 1
# raftport: 3125
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 8750
# id: 0
# replicaid: 2
# raftport: 3126
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 8751
# id: 1
# replicaid: 0
# raftport: 3127
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 8752
# id: 1
# replicaid: 1
# raftport: 3128
# - exposed_ip: localhost
# local_bind_ip: localhost
# port: 8753
# id: 1
# replicaid: 2
# raftport: 3129
53 changes: 37 additions & 16 deletions configs/oramnode_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,42 @@ endpoints:
- exposed_ip: 192.168.252.115
local_bind_ip: 192.168.252.115
deploy_host: host1
port: 8751
port: 1751
id: 0
replicaid: 0
raftport: 3127
- exposed_ip: 192.168.252.117
local_bind_ip: 192.168.252.117
deploy_host: host2
port: 8752
id: 0
replicaid: 1
raftport: 3128
- exposed_ip: 192.168.252.119
local_bind_ip: 192.168.252.119
deploy_host: host3
port: 8753
id: 0
replicaid: 2
raftport: 3129
raftport: 1127
# - exposed_ip: 192.168.252.117
# local_bind_ip: 192.168.252.117
# deploy_host: host2
# port: 1752
# id: 0
# replicaid: 1
# raftport: 1128
# - exposed_ip: 192.168.252.119
# local_bind_ip: 192.168.252.119
# deploy_host: host3
# port: 1753
# id: 0
# replicaid: 2
# raftport: 1129
# - exposed_ip: 192.168.252.117
# local_bind_ip: 192.168.252.117
# deploy_host: host2
# port: 1754
# id: 1
# replicaid: 0
# raftport: 1130
# - exposed_ip: 192.168.252.115
# local_bind_ip: 192.168.252.115
# deploy_host: host1
# port: 1755
# id: 1
# replicaid: 1
# raftport: 1131
# - exposed_ip: 192.168.252.119
# local_bind_ip: 192.168.252.119
# deploy_host: host3
# port: 1756
# id: 1
# replicaid: 2
# raftport: 1132
12 changes: 7 additions & 5 deletions configs/parameters.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
max-blocks-to-send: 200 # The maximum number of blocks to send from each shard node to the oram node during evictions
eviction-rate: 5 # How many ReadPath operations before eviction
eviction-rate: 1 # How many ReadPath operations before eviction
evict-path-count: 200 # How many paths to evict at a time
batch-timeout: 100 # How many milliseconds to wait before sending a batch of blocks to the oram node
epoch-time: 100 # How many milliseconds between each epoch
batch-timeout: 5 # How many milliseconds to wait before sending a batch of blocks to the oram node
epoch-time: 5 # How many milliseconds between each epoch
trace: false # Whether to use opentelemetry and jaeger
Z: 1 # number of real blocks per bucket
S: 9 # number of dummy blocks per bucket
shift: 1 # 2^shift is the tree branching factor
tree-height: 11 # height of the tree
max-requests: 1500 # maximum number of requests in flight at the client
tree-height: 20 # height of the tree
max-requests: 40000 # maximum number of requests in flight at the client
log: false # Whether to log
profile: false # Whether to profile
15 changes: 14 additions & 1 deletion configs/redis_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,17 @@ endpoints:
local_bind_ip: 192.168.252.115
deploy_host: host1
port: 6379
id: 0
id: 0
oramnode_id: 0
# - exposed_ip: 192.168.252.117
# local_bind_ip: 192.168.252.117
# deploy_host: host2
# port: 6379
# id: 1
# oramnode_id: 1
# - exposed_ip: 192.168.252.119
# local_bind_ip: 192.168.252.119
# deploy_host: host3
# port: 6379
# id: 2
# oramnode_id: 2
12 changes: 11 additions & 1 deletion configs/router_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,14 @@ endpoints:
local_bind_ip: 192.168.252.115
deploy_host: host1
port: 8745
id: 0
id: 0
# - exposed_ip: 192.168.252.117
# local_bind_ip: 192.168.252.117
# deploy_host: host2
# port: 8745
# id: 1
# - exposed_ip: 192.168.252.119
# local_bind_ip: 192.168.252.119
# deploy_host: host3
# port: 8745
# id: 2
70 changes: 56 additions & 14 deletions configs/shardnode_endpoints.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,59 @@ endpoints:
id: 0
replicaid: 0
raftport: 3124
- exposed_ip: 192.168.252.117
local_bind_ip: 192.168.252.117
deploy_host: host2
port: 8749
id: 0
replicaid: 1
raftport: 3125
- exposed_ip: 192.168.252.119
local_bind_ip: 192.168.252.119
deploy_host: host3
port: 8750
id: 0
replicaid: 2
raftport: 3126
# - exposed_ip: 192.168.252.117
# local_bind_ip: 192.168.252.117
# deploy_host: host2
# port: 8749
# id: 0
# replicaid: 1
# raftport: 3125
# - exposed_ip: 192.168.252.119
# local_bind_ip: 192.168.252.119
# deploy_host: host3
# port: 8750
# id: 0
# replicaid: 2
# raftport: 3126
# - exposed_ip: 192.168.252.117
# local_bind_ip: 192.168.252.117
# deploy_host: host2
# port: 8751
# id: 1
# replicaid: 0
# raftport: 3127
# - exposed_ip: 192.168.252.115
# local_bind_ip: 192.168.252.115
# deploy_host: host1
# port: 8752
# id: 1
# replicaid: 1
# raftport: 3128
# - exposed_ip: 192.168.252.119
# local_bind_ip: 192.168.252.119
# deploy_host: host3
# port: 8753
# id: 1
# replicaid: 2
# raftport: 3129
# - exposed_ip: 192.168.252.119
# local_bind_ip: 192.168.252.119
# deploy_host: host3
# port: 2754
# id: 2
# replicaid: 0
# raftport: 3130
# - exposed_ip: 192.168.252.115
# local_bind_ip: 192.168.252.115
# deploy_host: host1
# port: 2755
# id: 2
# replicaid: 1
# raftport: 3131
# - exposed_ip: 192.168.252.117
# local_bind_ip: 192.168.252.117
# deploy_host: host2
# port: 2756
# id: 2
# replicaid: 2
# raftport: 3132
2 changes: 1 addition & 1 deletion deploy/ansible/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
dest: "/root/oblishard/{{ item[0] }}"
mode: '0666'
delegate_to: "{{ item[1] }}"
loop: "{{ ['router_endpoints.yaml', 'shardnode_endpoints.yaml', 'oramnode_endpoints.yaml', 'redis_endpoints.yaml', 'parameters.yaml', 'simple.trace'] | product(groups['all']) | list }}"
loop: "{{ ['router_endpoints.yaml', 'shardnode_endpoints.yaml', 'oramnode_endpoints.yaml', 'redis_endpoints.yaml', 'parameters.yaml', 'trace.txt', 'db.txt'] | product(groups['all']) | list }}"

- name: Create oramnode systemd services
template:
Expand Down
4 changes: 3 additions & 1 deletion pkg/e2e/configs/parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ Z: 1 # number of real blocks per bucket
S: 9 # number of dummy blocks per bucket
shift: 1 # 2^shift is the tree branching factor
tree-height: 3 # height of the tree
max-requests: 1000 # maximum number of requests in flight at the client
max-requests: 1000 # maximum number of requests in flight at the client
log: true # whether to log
profile: true # Whether to profile

0 comments on commit 796bde2

Please sign in to comment.