Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: integration tests telemetry env #8705

Merged
merged 4 commits into from
Mar 23, 2023
Merged

fix: integration tests telemetry env #8705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcb3757
add env to docker compose
odysa Mar 22, 2023
48f854b
draft fix
odysa Mar 22, 2023
82c8253
set env
odysa Mar 22, 2023
cccd827
Merge branch 'main' into fix/integration-docker
odysa Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ services:
- "./risingwave.toml:/risingwave.toml"
environment:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
container_name: compactor-0
healthcheck:
test:
Expand Down Expand Up @@ -67,6 +69,8 @@ services:
- "./risingwave.toml:/risingwave.toml"
environment:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
container_name: compute-node-0
healthcheck:
test:
Expand Down Expand Up @@ -146,6 +150,8 @@ services:
- "./risingwave.toml:/risingwave.toml"
environment:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
container_name: frontend-node-0
healthcheck:
test:
Expand Down Expand Up @@ -216,6 +222,8 @@ services:
- "./risingwave.toml:/risingwave.toml"
environment:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
container_name: meta-node-0
healthcheck:
test:
Expand Down Expand Up @@ -244,7 +252,17 @@ services:
depends_on: []
volumes:
- "minio-0:/data"
entrypoint: "\n/bin/sh -c '\nset -e\nmkdir -p \"/data/hummock001\"\n/usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"\n'"
entrypoint: "

/bin/sh -c '

set -e

mkdir -p \"/data/hummock001\"

/usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"

'"
environment:
MINIO_CI_CD: "1"
MINIO_PROMETHEUS_AUTH_TYPE: public
Expand Down
8 changes: 5 additions & 3 deletions integration_tests/scripts/run_demos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def run_demo(demo: str, format: str):
run_sql_file(sql_file, demo_dir)
sleep(10)


def run_iceberg_demo():
demo = "iceberg-sink"
file_dir = dirname(abspath(__file__))
Expand Down Expand Up @@ -69,7 +70,7 @@ def run_iceberg_demo():

query_sql = open(os.path.join(demo_dir, "iceberg-query.sql")).read()

print("querying iceberg with presto sql: %s"%query_sql)
print("querying iceberg with presto sql: %s" % query_sql)

query_output_file_name = "query_outout.txt"

Expand All @@ -86,8 +87,6 @@ def run_iceberg_demo():
assert len(output_content.strip()) > 0




arg_parser = argparse.ArgumentParser(description='Run the demo')
arg_parser.add_argument('--format',
metavar='format',
Expand All @@ -100,6 +99,9 @@ def run_iceberg_demo():
help='the test case')
args = arg_parser.parse_args()

# disable telemetry in env
os.environ['ENABLE_TELEMETRY'] = "false"

if args.case == "iceberg-sink":
if args.format == "protobuf":
print("skip protobuf test for iceberg-sink")
Expand Down