Deuxfleurs/mknet
17
1
Fork 2
Code Issues Pull requests Projects Releases Wiki Activity

Upstreaming patches written for Garage's benchmark #1

Merged
trinity-1686a merged 7 commits from quentin/mknet:improvements into main 2021-12-13 13:09:28 +00:00
Conversation 2 Commits 7 Files changed 5 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9719f4b294 - Show all commits

4
example/deploy_minio.py
View file

@ -19,7 +19,7 @@ def leader():
sock.bind(UNIX_SOCK) sock.bind(UNIX_SOCK)
sock.listen() sock.listen()
n_serv = os.environ['SIZE'] n_serv = int(os.environ['SERVER_COUNT'])
fl = [ co for co, addr in [ sock.accept() for i in range(n_serv - 1) ]] fl = [ co for co, addr in [ sock.accept() for i in range(n_serv - 1) ]]
identities = [ json.loads(co.makefile().readline()) for co in fl ] + [ { "ip": os.environ['IP'], "path": make_data() } ] identities = [ json.loads(co.makefile().readline()) for co in fl ] + [ { "ip": os.environ['IP'], "path": make_data() } ]
@ -52,7 +52,7 @@ def make_data():
return data_path return data_path
def run_minio(identities): def run_minio(identities):
cmd = f"minio server --console-address ':9001' --address [{os.environ['IP']}]:9000" cmd = f"minio server --console-address ':9001' --address ':9000'"
for ident in identities: for ident in identities:
cmd += f" http://[{ident['ip']}]:9000{ident['path']}" cmd += f" http://[{ident['ip']}]:9000{ident['path']}"
cmd += f" > {os.path.join(STORAGE_PATH, 'minio'+os.environ['ID']+'.log')} 2>&1" cmd += f" > {os.path.join(STORAGE_PATH, 'minio'+os.environ['ID']+'.log')} 2>&1"

4
mknet
View file

@ -321,7 +321,7 @@ def runall(cmd):
env["HOST"] = server.name env["HOST"] = server.name
env["IP"] = str(server.ip) env["IP"] = str(server.ip)
env["ID"] = str(number) env["ID"] = str(number)
env["SIZE"] = str(len(config['servers'])) env["SERVER_COUNT"] = str(len(config['servers']))
name = f'testnet-{zone.name}-{server.name}' name = f'testnet-{zone.name}-{server.name}'
net.ns.run(name, cmd, env) net.ns.run(name, cmd, env)
number +=1 number +=1
@ -331,7 +331,7 @@ def runall(cmd):
env["HOST"] = zone.name env["HOST"] = zone.name
env["IP"] = str(zone.ip) env["IP"] = str(zone.ip)
env["ID"] = str(number) env["ID"] = str(number)
env["SIZE"] = str(len(config['servers'])) env["SERVER_COUNT"] = str(len(config['servers']))
name = f'testnet-{zone.name}-{zone.name}' name = f'testnet-{zone.name}-{zone.name}'
net.ns.run(name, cmd, env) net.ns.run(name, cmd, env)
first = False first = False