From 11697fdd63021624d336cf6d59b0ca71e46cf6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl> Date: Thu, 3 Oct 2024 10:05:44 +0200 Subject: [PATCH] fix(restore): skip restoration of additional entities included in DESC SCHEMA WITH INTERNALS As described in the comment. Fixes #4050 --- pkg/service/restore/schema_worker.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/service/restore/schema_worker.go b/pkg/service/restore/schema_worker.go index bf1048f7f..1773ff4ab 100644 --- a/pkg/service/restore/schema_worker.go +++ b/pkg/service/restore/schema_worker.go @@ -141,6 +141,13 @@ func (w *schemaWorker) restoreFromSchemaFile(ctx context.Context) error { var createdKs []string for _, row := range *w.describedSchema { + if row.Keyspace == "" { + // Scylla 6.3 added roles and service levels to the output of + // DESC SCHEMA WITH INTERNALS (https://github.com/scylladb/scylladb/pull/20168). + // Those entities do not live in any particular keyspace, so that's how we identify them. + // We are skipping them until we properly support their restoration. + continue + } if row.Keyspace == "system_replicated_keys" { // See https://github.com/scylladb/scylla-enterprise/issues/4168 continue