Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions ci/plugins/mzcompose/hooks/command
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@ cleanup() {
mzcompose down --volumes || true
else
# Ignore failures, we still want the rest of the cleanup
mzcompose stop --timeout=0 || true
mzcompose rm -f || true
bin/ci-builder run "$builder" docker volume prune -f || true
bin/ci-builder run "$builder" docker network prune -f || true
bin/ci-builder run "$builder" timeout 60s bin/mzcompose --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" down --timeout=1 --volumes || {
sudo systemctl restart docker || true
bin/ci-builder run "$builder" timeout 60s bin/mzcompose --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" down --timeout=1 --volumes || true
}
fi

echo "Finding core files"
Expand Down
1 change: 1 addition & 0 deletions misc/python/materialize/cli/ci_annotate_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
# TODO: Reenable when https://github.com/MaterializeInc/database-issues/issues/9970 is fixed
| limits-materialized-.* \| .* very\ slow\ coordinator\ message
| zippy-materialized.* \| .* very\ slow\ coordinator\ message
| sqlsmith-mz.* \| .* very\ slow\ coordinator\ message
# Expected on AWS in RQG because of build
| comm="check"\ exe="/usr/bin/qemu-
)
Expand Down
9 changes: 5 additions & 4 deletions misc/python/materialize/parallel_workload/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -1015,14 +1015,15 @@ def create(self, exe: Executor, composition: Composition) -> None:
for row in exe.cur.fetchall():
exe.execute(f"DROP CLUSTER {identifier(row[0])} CASCADE")

exe.execute("SELECT name FROM mz_roles WHERE name LIKE 'r%'")
for row in exe.cur.fetchall():
exe.execute(f"DROP ROLE {identifier(row[0])} CASCADE")

exe.execute("DROP SECRET IF EXISTS pgpass CASCADE")
exe.execute("DROP SECRET IF EXISTS mypass CASCADE")
exe.execute("DROP SECRET IF EXISTS sql_server_pass CASCADE")
exe.execute("DROP SECRET IF EXISTS minio CASCADE")

exe.execute("SELECT name FROM mz_roles WHERE name LIKE 'r%'")
for row in exe.cur.fetchall():
exe.execute(f"DROP ROLE {identifier(row[0])}")

print("Creating connections")

exe.execute(
Expand Down