Merge branch 'main' into eventhub-drop-mirror

PeerDB-io · Sep 20, 2023 · 20dbc57 · 20dbc57
2 parents eec1f1a + ea1c853
commit 20dbc57
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/nexus/server/src/main.rs b/nexus/server/src/main.rs
@@ -316,22 +316,27 @@ impl NexusBackend {
                             err_msg: "flow service is not configured".to_owned(),
                         })));
                     }
-
-                    let catalog = self.catalog.lock().await;
-                    let mirror_details =
-                        Self::check_for_mirror(&catalog, qrep_flow_job.name.clone()).await?;
+                    let mirror_details;
+                    {
+                        let catalog = self.catalog.lock().await;
+                        mirror_details =
+                            Self::check_for_mirror(&catalog, qrep_flow_job.name.clone()).await?;
+                    }
                     if mirror_details.is_none() {
-                        catalog
-                            .create_qrep_flow_job_entry(&qrep_flow_job)
-                            .await
-                            .map_err(|err| {
-                                PgWireError::ApiError(Box::new(PgError::Internal {
-                                    err_msg: format!(
-                                        "unable to create mirror job entry: {:?}",
-                                        err
-                                    ),
-                                }))
-                            })?;
+                        {
+                            let catalog = self.catalog.lock().await;
+                            catalog
+                                .create_qrep_flow_job_entry(&qrep_flow_job)
+                                .await
+                                .map_err(|err| {
+                                    PgWireError::ApiError(Box::new(PgError::Internal {
+                                        err_msg: format!(
+                                            "unable to create mirror job entry: {:?}",
+                                            err
+                                        ),
+                                    }))
+                                })?;
+                        }
 
                         if qrep_flow_job.disabled {
                             let create_mirror_success =

diff --git a/ui/package.json b/ui/package.json
@@ -28,7 +28,7 @@
     "@radix-ui/react-tooltip": "^1.0.6",
     "@tremor/react": "^3.6.6",
     "@types/node": "20.5.0",
-    "@types/react": "18.2.20",
+    "@types/react": "18.2.21",
     "@types/react-dom": "18.2.7",
     "classnames": "^2.3.2",
     "long": "^5.2.3",

diff --git a/ui/yarn.lock b/ui/yarn.lock
@@ -3440,7 +3440,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@>=16":
+"@types/react@*", "@types/react@18.2.21", "@types/react@>=16":
   version "18.2.21"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.21.tgz#774c37fd01b522d0b91aed04811b58e4e0514ed9"
   integrity sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==
@@ -3449,15 +3449,6 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/[email protected]":
-  version "18.2.20"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.20.tgz#1605557a83df5c8a2cc4eeb743b3dfc0eb6aaeb2"
-  integrity sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
 "@types/react@^16.14.34":
   version "16.14.46"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.46.tgz#42ac91aece416176e6b6127cd9ec9e381ea67e16"