You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ho...@apache.org on 2021/08/16 04:35:28 UTC
[arrow-datafusion] branch master updated: update
docker-compose.yaml on ballista version bump (#893)
This is an automated email from the ASF dual-hosted git repository.
houqp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 57bf54f update docker-compose.yaml on ballista version bump (#893)
57bf54f is described below
commit 57bf54f7665e9393528edcb5974df33cf3ca3e0d
Author: QP Hou <qp...@scribd.com>
AuthorDate: Sun Aug 15 21:35:23 2021 -0700
update docker-compose.yaml on ballista version bump (#893)
---
benchmarks/docker-compose.yaml | 6 +++---
dev/update_ballista_versions.py | 11 +++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/benchmarks/docker-compose.yaml b/benchmarks/docker-compose.yaml
index e025ea3..437b461 100644
--- a/benchmarks/docker-compose.yaml
+++ b/benchmarks/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
image: quay.io/coreos/etcd:v3.4.9
command: "etcd -advertise-client-urls http://etcd:2379 -listen-client-urls http://0.0.0.0:2379"
ballista-scheduler:
- image: ballista:0.5.0-SNAPSHOT
+ image: ballista:0.6.0
command: "/scheduler --config-backend etcd --etcd-urls etcd:2379 --bind-host 0.0.0.0 --bind-port 50050"
environment:
- RUST_LOG=ballista=debug
@@ -29,7 +29,7 @@ services:
depends_on:
- etcd
ballista-executor:
- image: ballista:0.5.0-SNAPSHOT
+ image: ballista:0.6.0
command: "/executor --bind-host 0.0.0.0 --bind-port 50051 --scheduler-host ballista-scheduler"
scale: 2
environment:
@@ -39,7 +39,7 @@ services:
depends_on:
- ballista-scheduler
ballista-client:
- image: ballista:0.5.0-SNAPSHOT
+ image: ballista:0.6.0
command: "/bin/sh" # do nothing
environment:
- RUST_LOG=info
diff --git a/dev/update_ballista_versions.py b/dev/update_ballista_versions.py
index 3a023a7..f4319e2 100755
--- a/dev/update_ballista_versions.py
+++ b/dev/update_ballista_versions.py
@@ -23,6 +23,7 @@
# pip install tomlkit
import os
+import re
import argparse
from pathlib import Path
import tomlkit
@@ -77,6 +78,16 @@ def main():
for cargo_toml in ballista_crates:
update_cargo_toml(cargo_toml, new_version)
+ docker_compose_path = os.path.join(repo_root, "benchmarks/docker-compose.yaml")
+ print(f'Updating ballista versions in {docker_compose_path}')
+ with open(docker_compose_path, "r+") as fd:
+ data = fd.read()
+ pattern = re.compile(r'(^\s+image:\sballista:)\d+\.\d+\.\d+(-SNAPSHOT)?', re.MULTILINE)
+ data = pattern.sub(r"\g<1>"+new_version, data)
+ fd.truncate(0)
+ fd.seek(0)
+ fd.write(data)
+
if __name__ == "__main__":
main()