fix ci

risingwavelabs · May 6, 2024 · 8fe0672 · 8fe0672
1 parent 3728162
commit 8fe0672
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml
@@ -708,10 +708,10 @@ steps:
   - label: "e2e single-node binary test"
     command: "ci/scripts/e2e-test.sh -p ci-dev -m single-node"
     if: build.pull_request.labels includes "ci/run-e2e-single-node-tests" || build.env("CI_STEPS") =~ /(^|,)e2e-single-node-tests?(,|$$)/
-    depends_on:
-      - "build"
-      - "build-other"
-      - "docslt"
+    # depends_on:
+    #   - "build"
+    #   - "build-other"
+    #   - "docslt"
     plugins:
       - docker-compose#v4.9.0:
           run: rw-build-env

diff --git a/src/frontend/src/observer/observer_manager.rs b/src/frontend/src/observer/observer_manager.rs
@@ -294,16 +294,21 @@ impl FrontendObserverNode {
                             Operation::Update => catalog_guard.update_sink(sink),
                             _ => panic!("receive an unsupported notify {:?}", resp),
                         },
-                        RelationInfo::Subscription(subscription) => match resp.operation() {
-                            Operation::Add => catalog_guard.create_subscription(subscription),
-                            Operation::Delete => catalog_guard.drop_subscription(
-                                subscription.database_id,
-                                subscription.schema_id,
-                                subscription.id,
-                            ),
-                            Operation::Update => catalog_guard.update_subscription(subscription),
-                            _ => panic!("receive an unsupported notify {:?}", resp),
-                        },
+                        RelationInfo::Subscription(subscription) => {
+                            println!("subscription: {:?}", resp);
+                            match resp.operation() {
+                                Operation::Add => catalog_guard.create_subscription(subscription),
+                                Operation::Delete => catalog_guard.drop_subscription(
+                                    subscription.database_id,
+                                    subscription.schema_id,
+                                    subscription.id,
+                                ),
+                                Operation::Update => {
+                                    catalog_guard.update_subscription(subscription)
+                                }
+                                _ => panic!("receive an unsupported notify {:?}", resp),
+                            }
+                        }
                         RelationInfo::Index(index) => match resp.operation() {
                             Operation::Add => catalog_guard.create_index(index),
                             Operation::Delete => catalog_guard.drop_index(

diff --git a/src/meta/src/controller/catalog.rs b/src/meta/src/controller/catalog.rs
@@ -483,15 +483,17 @@ impl CatalogController {
             .await?
             .ok_or_else(|| MetaError::catalog_id_not_found("subscription", job_id))?;
 
-        let relations = vec![PbRelation {
-            relation_info: Some(PbRelationInfo::Subscription(
-                ObjectModel(subscription, obj.unwrap()).into(),
-            )),
-        }];
         let version = self
             .notify_frontend(
-                NotificationOperation::Add,
-                NotificationInfo::RelationGroup(PbRelationGroup { relations }),
+                Operation::Add,
+                Info::RelationGroup(PbRelationGroup {
+                    relations: vec![PbRelation {
+                        relation_info: PbRelationInfo::Subscription(
+                            ObjectModel(subscription, obj.unwrap()).into(),
+                        )
+                        .into(),
+                    }],
+                }),
             )
             .await;
         Ok(version)