From 41f13dcd3b0c0ac8fcd568552c8be7cbb9d11b82 Mon Sep 17 00:00:00 2001 From: Amogh Bharadwaj Date: Tue, 19 Sep 2023 22:25:00 +0530 Subject: [PATCH 1/2] Fixes catalog locking (#398) --- nexus/server/src/main.rs | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/nexus/server/src/main.rs b/nexus/server/src/main.rs index 7089f93ee2..4b6acec350 100644 --- 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 = From ea1c85369e7ae42ff26a37209654ce2beadd81c1 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 19 Sep 2023 15:29:53 -0400 Subject: [PATCH 2/2] [Snyk] Upgrade @types/react from 18.2.20 to 18.2.21 (#401) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit

This PR was automatically created by Snyk using the credentials of a real user.


Snyk has created this PR to upgrade @types/react from 18.2.20 to 18.2.21.

:information_source: Keep your dependencies up-to-date. This makes it easier to fix existing vulnerabilities and to more quickly identify and fix newly disclosed vulnerabilities when they affect your project.
- The recommended version is **1 version** ahead of your current version. - The recommended version was released **a month ago**, on 2023-08-22.
**Note:** *You are seeing this because you or someone else with access to this repository has authorized Snyk to open upgrade PRs.* For more information: 🧐 [View latest project report](https://app.snyk.io/org/kaushik-r24/project/33b5a4be-b993-4706-9c92-4d176697b861?utm_source=github&utm_medium=referral&page=upgrade-pr) 🛠 [Adjust upgrade PR settings](https://app.snyk.io/org/kaushik-r24/project/33b5a4be-b993-4706-9c92-4d176697b861/settings/integration?utm_source=github&utm_medium=referral&page=upgrade-pr) 🔕 [Ignore this dependency or unsubscribe from future upgrade PRs](https://app.snyk.io/org/kaushik-r24/project/33b5a4be-b993-4706-9c92-4d176697b861/settings/integration?pkg=@types/react&utm_source=github&utm_medium=referral&page=upgrade-pr#auto-dep-upgrades) Co-authored-by: snyk-bot --- ui/package.json | 2 +- ui/yarn.lock | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ui/package.json b/ui/package.json index 9b747bdc89..608e5ebbb6 100644 --- 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 index 3f01e702bb..1845f2a6a3 100644 --- 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/react@18.2.20": - 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"