From df7f54f0b35cfe39937ae49bf9b5dab4343d51de Mon Sep 17 00:00:00 2001
From: zwang28 <70626450+zwang28@users.noreply.github.com>
Date: Thu, 5 Sep 2024 22:59:18 +0800
Subject: [PATCH] fix(meta): fix catalog ref count (#18427)

---
 e2e_test/backup_restore/tpch_snapshot_create.slt   |  3 +++
 e2e_test/backup_restore/tpch_snapshot_drop.slt     |  3 +++
 src/meta/src/manager/catalog/user.rs               |  1 +
 src/storage/backup/integration_tests/test_basic.sh | 14 +++++++++++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/e2e_test/backup_restore/tpch_snapshot_create.slt b/e2e_test/backup_restore/tpch_snapshot_create.slt
index c1fad2a2e0759..bb14dd369b837 100644
--- a/e2e_test/backup_restore/tpch_snapshot_create.slt
+++ b/e2e_test/backup_restore/tpch_snapshot_create.slt
@@ -1,5 +1,8 @@
 include ../tpch/create_tables.slt.part
 
+statement ok
+CREATE SECRET secret1 WITH (backend = 'meta') AS 'demo-secret'
+
 # First, insert the data into the tables
 include ../tpch/insert_customer.slt.part
 include ../tpch/insert_lineitem.slt.part
diff --git a/e2e_test/backup_restore/tpch_snapshot_drop.slt b/e2e_test/backup_restore/tpch_snapshot_drop.slt
index 0e593371347b7..27d271c35c617 100644
--- a/e2e_test/backup_restore/tpch_snapshot_drop.slt
+++ b/e2e_test/backup_restore/tpch_snapshot_drop.slt
@@ -1,3 +1,6 @@
+statement ok
+DROP SECRET secret1;
+
 statement ok
 drop materialized view tpch_q7;
 
diff --git a/src/meta/src/manager/catalog/user.rs b/src/meta/src/manager/catalog/user.rs
index 81181b0fc1e17..68e5e31395c0d 100644
--- a/src/meta/src/manager/catalog/user.rs
+++ b/src/meta/src/manager/catalog/user.rs
@@ -74,6 +74,7 @@ impl UserManager {
                     .values()
                     .map(|connection| connection.owner),
             )
+            .chain(database.secrets.values().map(|secret| secret.owner))
             .for_each(|owner_id| user_manager.increase_ref(owner_id));
 
         Ok(user_manager)
diff --git a/src/storage/backup/integration_tests/test_basic.sh b/src/storage/backup/integration_tests/test_basic.sh
index afaee3ac6c507..9674807e62c6e 100644
--- a/src/storage/backup/integration_tests/test_basic.sh
+++ b/src/storage/backup/integration_tests/test_basic.sh
@@ -34,12 +34,20 @@ if ! psql -h localhost -p 4566 -d dev -U root -c "show materialized views;" | gr
   echo "expect 0 MV"
   exit 1
 fi
+if ! psql -h localhost -p 4566 -d dev -U root -c "show secrets;" | grep -q "0 row"; then
+  echo "expect 0 SECRET"
+  exit 1
+fi
 echo "restore snapshot ${job_id_1} succeeded"
 
 restore "${job_id_2}"
 start_cluster
 if ! psql -h localhost -p 4566 -d dev -U root -c "show materialized views;" | grep -q "1 row"; then
-  echo "expect 1 MVs"
+  echo "expect 1 MV"
+  exit 1
+fi
+if ! psql -h localhost -p 4566 -d dev -U root -c "show secrets;" | grep -q "1 row"; then
+  echo "expect 1 SECRET"
   exit 1
 fi
 echo "restore snapshot ${job_id_2} succeeded"
@@ -55,6 +63,10 @@ if ! psql -h localhost -p 4566 -d dev -U root -c "show materialized views;" | gr
   echo "expect 0 MV"
   exit 1
 fi
+if ! psql -h localhost -p 4566 -d dev -U root -c "show secrets;" | grep -q "0 row"; then
+  echo "expect 0 SECRET"
+  exit 1
+fi
 echo "restore snapshot ${job_id_3} succeeded"
 
 echo "test succeeded"