Skip to content

Commit

Permalink
test: Fix legacy upgrade tests catalog impl (#25324)
Browse files Browse the repository at this point in the history
This legacy upgrade test will skip versions when testing certain upgrade
paths. The persist catalog will panic if a version is skipped when
upgrading. Even when using the stash catalog implementation we open the
persist catalog during boot, which will cause the panic. To avoid this,
this commit uses the emergency-stash catalog implementation, which
doesn't even attempt to open the persist catalog.

Fixes #25321
  • Loading branch information
jkosh44 authored Feb 16, 2024
1 parent 83d1f20 commit e2cf001
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 0 additions & 1 deletion ci/test/pipeline.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ steps:

- id: legacy-upgrade
label: Legacy upgrade tests (last version from docs)
skip: "failing, to be addressed with #25321"
depends_on: build-aarch64
timeout_in_minutes: 60
artifact_paths: junit_*.xml
Expand Down
8 changes: 6 additions & 2 deletions test/legacy-upgrade/mzcompose.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@
options=list(mz_options.values()),
volumes_extra=["secrets:/share/secrets"],
external_cockroach=True,
catalog_store="stash",
# This test will skip versions when testing certain upgrade paths. The persist catalog
# will panic if a version is skipped when upgrading. Even when using the stash
# implementation we open the persist catalog, which will cause the panic. To avoid this, we
# use the emergency-stash, which doesn't even attempt to open the persist catalog.
catalog_store="emergency-stash",
),
# N.B.: we need to use `validate_catalog_store=None` because testdrive uses
# HEAD to load the catalog from disk but does *not* run migrations. There
Expand Down Expand Up @@ -141,7 +145,7 @@ def test_upgrade_from_version(
],
volumes_extra=["secrets:/share/secrets"],
external_cockroach=True,
catalog_store="stash",
catalog_store="emergency-stash",
)
with c.override(mz_from):
c.up("materialized")
Expand Down

0 comments on commit e2cf001

Please sign in to comment.