This is an automated email from the ASF dual-hosted git repository.
xiaozhenliu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new 6b90b003cf fix(backend): use dynamic DSLContext lookup to fix stale DB
connections in tests (#4179)
6b90b003cf is described below
commit 6b90b003cf71368f4e3e7fbfa77f09cd6997b818
Author: Seongjin Yoon <[email protected]>
AuthorDate: Thu Jan 29 17:30:48 2026 -0800
fix(backend): use dynamic DSLContext lookup to fix stale DB connections in
tests (#4179)
<!--
Thanks for sending a pull request (PR)! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
[Contributing to
Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md)
2. Ensure you have added or run the appropriate tests for your PR
3. If the PR is work in progress, mark it a draft on GitHub.
4. Please write your PR title to summarize what this PR proposes, we
are following Conventional Commits style for PR titles as well.
5. Be sure to keep the PR description updated to reflect all changes.
-->
### What changes were proposed in this PR?
<!--
Please clarify what changes you are proposing. The purpose of this
section
is to outline the changes. Here are some tips for you:
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
3. If it is a refactoring, clarify what has been changed.
3. It would be helpful to include a before-and-after comparison using
screenshots or GIFs.
4. Please consider writing useful notes for better and faster reviews.
-->
Fixed a test isolation issue where tests that use `MockTexeraDB` pass
when run individually but fail when run together (e.g., `sbt test`).
The root cause is that resource classes cache the database connection on
first access. When a test class shuts down its `EmbeddedPostgres` and
the next test class starts a new one on a different port, the cached
connection still points to the dead port, causing "Connection refused"
errors.
The fix ensures the connection is looked up fresh form `SqlServer` each
time instead of being cached, so it always reflects the current
database.
Files changed across 5 modules: `amber`, `file-service`,
`computing-unit-managing-service`, `common/auth`, `common/dao`.
### Any related issues, documentation, discussions?
<!--
Please use this section to link other resources if not mentioned
already.
1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves
#1234`
or `Closes #1234`. If it is only related, simply mention the issue
number.
2. If there is design documentation, please add the link.
3. If there is a discussion in the mailing list, please add the link.
-->
Closes #4178
### How was this PR tested?
<!--
If tests were added, say they were added here. Or simply mention that if
the PR
is tested with existing test cases. Make sure to include/update test
cases that
check the changes thoroughly including negative and positive cases if
possible.
If it was tested in a way different from regular unit tests, please
clarify how
you tested step by step, ideally copy and paste-able, so that other
reviewers can
test and check, and descendants can verify in the future. If tests were
not added,
please describe why they were not added and/or why it was difficult to
add.
-->
Manually tested.
### Was this PR authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this
PR,
please include the phrase: 'Generated-by: ' followed by the name of the
tool
and its version. If no, write 'No'.
Please refer to the [ASF Generative Tooling
Guidance](https://www.apache.org/legal/generative-tooling.html) for
details.
-->
Revised with Claude Code.
---
.../apache/texera/web/resource/GmailResource.scala | 9 ++++----
.../texera/web/resource/UserConfigResource.scala | 13 ++++++-----
.../texera/web/resource/auth/AuthResource.scala | 13 ++++++-----
.../web/resource/auth/GoogleAuthResource.scala | 13 ++++++-----
.../resource/dashboard/SearchQueryBuilder.scala | 7 +++---
.../resource/dashboard/UnifiedResourceSchema.scala | 7 +++---
.../admin/execution/AdminExecutionResource.scala | 7 +++---
.../admin/settings/AdminSettingsResource.scala | 2 +-
.../dashboard/admin/user/AdminUserResource.scala | 9 ++++----
.../web/resource/dashboard/hub/HubResource.scala | 14 ++++++-----
.../web/resource/dashboard/user/UserResource.scala | 4 ++--
.../dataset/utils/DatasetStatisticsUtils.scala | 8 +++----
.../user/project/ProjectAccessResource.scala | 20 ++++++++--------
.../dashboard/user/project/ProjectResource.scala | 13 ++++++-----
.../user/project/PublicProjectResource.scala | 11 +++++----
.../dashboard/user/quota/UserQuotaResource.scala | 7 +++---
.../user/workflow/WorkflowAccessResource.scala | 7 +++---
.../user/workflow/WorkflowExecutionsResource.scala | 9 ++++----
.../dashboard/user/workflow/WorkflowResource.scala | 27 ++++++++++++----------
.../user/workflow/WorkflowVersionResource.scala | 11 +++++----
.../service/ExecutionsMetadataPersistService.scala | 14 ++++++-----
.../org/apache/texera/auth/JwtAuthFilter.scala | 2 +-
.../texera/auth/util/ComputingUnitAccess.scala | 7 +++---
.../scala/org/apache/texera/dao/SqlServer.scala | 14 +++++++----
.../resource/ComputingUnitAccessResource.scala | 7 +++---
.../resource/ComputingUnitManagingResource.scala | 7 +++---
.../service/resource/DatasetAccessResource.scala | 7 +++---
.../texera/service/resource/DatasetResource.scala | 7 +++---
28 files changed, 155 insertions(+), 121 deletions(-)
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala
index 6ab5b7bcce..255567494f 100644
--- a/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala
+++ b/amber/src/main/scala/org/apache/texera/web/resource/GmailResource.scala
@@ -38,10 +38,11 @@ import scala.util.{Failure, Success, Try}
case class EmailMessage(receiver: String, subject: String, content: String)
object GmailResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
- final private lazy val userDao = new UserDao(context.configuration)
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def userDao = new UserDao(context.configuration)
private lazy val senderGmail: String = UserSystemConfig.gmail
private val smtpProperties = Map(
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
index 2bf5a7d26a..3e36adf934 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala
@@ -41,12 +41,13 @@ import scala.jdk.CollectionConverters.CollectionHasAsScala
@RolesAllowed(Array("REGULAR", "ADMIN"))
@Consumes(Array(MediaType.TEXT_PLAIN))
class UserConfigResource {
- final private lazy val userDictionaryDao = new UserConfigDao(
- SqlServer
- .getInstance()
- .createDSLContext()
- .configuration
- )
+ private def userDictionaryDao =
+ new UserConfigDao(
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ .configuration
+ )
@GET
@Produces(Array(MediaType.APPLICATION_JSON))
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala
index 76544ae8ff..98b6752727 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala
@@ -36,12 +36,13 @@ import javax.ws.rs.core.MediaType
object AuthResource {
- final private lazy val userDao = new UserDao(
- SqlServer
- .getInstance()
- .createDSLContext()
- .configuration
- )
+ private def userDao =
+ new UserDao(
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ .configuration
+ )
/**
* Retrieve exactly one User from databases with the given username and
password.
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala
index 5b91583222..2f99b9c1bd 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/auth/GoogleAuthResource.scala
@@ -36,12 +36,13 @@ import javax.ws.rs._
import javax.ws.rs.core.MediaType
object GoogleAuthResource {
- final private lazy val userDao = new UserDao(
- SqlServer
- .getInstance()
- .createDSLContext()
- .configuration
- )
+ private def userDao =
+ new UserDao(
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ .configuration
+ )
}
@Path("/auth/google")
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/SearchQueryBuilder.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/SearchQueryBuilder.scala
index e762f1715c..e19755e611 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/SearchQueryBuilder.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/SearchQueryBuilder.scala
@@ -29,9 +29,10 @@ import org.jooq._
object SearchQueryBuilder {
- final lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
+ def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
val FILE_RESOURCE_TYPE = "file"
val WORKFLOW_RESOURCE_TYPE = "workflow"
val PROJECT_RESOURCE_TYPE = "project"
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
index 785640808f..dbcf192640 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala
@@ -46,9 +46,10 @@ object UnifiedResourceSchema {
val resourceOwnerIdField: Field[_] =
DSL.field(DSL.name(resourceOwnerIdAlias))
val resourceLastModifiedTimeField: Field[_] =
DSL.field(DSL.name(resourceLastModifiedTimeAlias))
- final lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
+ def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
def apply(
resourceType: Field[String] = DSL.inline(""),
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
index a537718735..e9b890cd1d 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/execution/AdminExecutionResource.scala
@@ -36,9 +36,10 @@ import scala.jdk.CollectionConverters._
*/
object AdminExecutionResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
case class dashboardExecution(
workflowName: String,
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
index 1c42be759d..d98ede5610 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/settings/AdminSettingsResource.scala
@@ -39,7 +39,7 @@ case class AdminSettingsPojo(
@Produces(Array(MediaType.APPLICATION_JSON))
class AdminSettingsResource {
- private val ctx = SqlServer.getInstance().createDSLContext()
+ private def ctx = SqlServer.getInstance().createDSLContext()
private val siteSettings = DSL.table("site_settings")
private val key = DSL.field("key", classOf[String])
private val value = DSL.field("value", classOf[String])
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
index 7372ab6fc0..a6778f27e9 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/admin/user/AdminUserResource.scala
@@ -50,10 +50,11 @@ case class UserInfo(
)
object AdminUserResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
- final private lazy val userDao = new UserDao(context.configuration)
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def userDao = new UserDao(context.configuration)
}
@Path("/admin/user")
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala
index e4ecc769c1..fe687aa1d7 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/hub/HubResource.scala
@@ -83,9 +83,10 @@ object HubResource {
counts: java.util.Map[ActionType, Int]
)
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
final private val ipv4Pattern: Pattern = Pattern.compile(
"^([0-9]{1,3}\\.){3}[0-9]{1,3}$"
@@ -325,9 +326,10 @@ object HubResource {
@Produces(Array(MediaType.APPLICATION_JSON))
@Path("/hub")
class HubResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
@GET
@Path("/count")
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/UserResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/UserResource.scala
index eaafe7f323..6282bf24ea 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/UserResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/UserResource.scala
@@ -28,8 +28,8 @@ import javax.ws.rs.core.{MediaType, Response}
case class AffiliationUpdateRequest(uid: Int, affiliation: String)
object UserResource {
- private lazy val context = SqlServer.getInstance().createDSLContext()
- private lazy val userDao = new UserDao(context.configuration)
+ private def context = SqlServer.getInstance().createDSLContext()
+ private def userDao = new UserDao(context.configuration)
}
@Path("/user")
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
index de6f1adf96..01a949e94c 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/dataset/utils/DatasetStatisticsUtils.scala
@@ -26,10 +26,10 @@ import
org.apache.texera.web.resource.dashboard.user.quota.UserQuotaResource.Dat
import scala.jdk.CollectionConverters._
object DatasetStatisticsUtils {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
-
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
// this function retrieves the total counts of dataset that belongs to the
user
def getUserCreatedDatasetCount(uid: Integer): Int = {
val count = context
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
index d2673400ea..1e3340973d 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectAccessResource.scala
@@ -41,9 +41,10 @@ import javax.ws.rs._
import javax.ws.rs.core.MediaType
object ProjectAccessResource {
- final private val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
def userHasWriteAccess(pid: Integer, uid: Integer): Boolean = {
getProjectAccessPrivilege(pid, uid) == PrivilegeEnum.WRITE
@@ -68,12 +69,13 @@ object ProjectAccessResource {
@RolesAllowed(Array("REGULAR", "ADMIN"))
@Path("/access/project")
class ProjectAccessResource() {
- final private val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
- final private val userDao = new UserDao(context.configuration())
- final private val projectDao = new ProjectDao(context.configuration)
- final private val projectUserAccessDao = new
ProjectUserAccessDao(context.configuration)
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def userDao = new UserDao(context.configuration())
+ private def projectDao = new ProjectDao(context.configuration)
+ private def projectUserAccessDao = new
ProjectUserAccessDao(context.configuration)
/**
* This method returns the owner of a project
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
index 08dcff6e40..be72fd21d0 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala
@@ -52,12 +52,13 @@ import scala.jdk.CollectionConverters.IterableHasAsScala
*/
object ProjectResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
- final private lazy val userProjectDao = new ProjectDao(context.configuration)
- final private lazy val workflowOfProjectDao = new
WorkflowOfProjectDao(context.configuration)
- final private lazy val projectUserAccessDao = new
ProjectUserAccessDao(context.configuration)
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def userProjectDao = new ProjectDao(context.configuration)
+ private def workflowOfProjectDao = new
WorkflowOfProjectDao(context.configuration)
+ private def projectUserAccessDao = new
ProjectUserAccessDao(context.configuration)
/**
* This method is used to insert any CSV files created from
ResultExportService
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
index 7ba5aef401..6983bf13ee 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/PublicProjectResource.scala
@@ -43,11 +43,12 @@ case class DashboardPublicProject(
@Path("/public/project")
class PublicProjectResource {
- final private val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
- final private lazy val publicProjectDao = new
PublicProjectDao(context.configuration)
- final private val projectUserAccessDao = new
ProjectUserAccessDao(context.configuration)
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def publicProjectDao = new PublicProjectDao(context.configuration)
+ private def projectUserAccessDao = new
ProjectUserAccessDao(context.configuration)
@GET
@RolesAllowed(Array("ADMIN"))
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
index 14b5199fee..6f1bb79b15 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/quota/UserQuotaResource.scala
@@ -33,9 +33,10 @@ import javax.ws.rs.core.MediaType
import scala.jdk.CollectionConverters.IterableHasAsScala
object UserQuotaResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
case class Workflow(
userId: Integer,
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
index 799e3d7c5d..a439238aae 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowAccessResource.scala
@@ -44,9 +44,10 @@ import javax.ws.rs._
import javax.ws.rs.core.MediaType
object WorkflowAccessResource {
- final private val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
/**
* Identifies whether the given user has read-only access over the given
workflow
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
index d4bf3ffd41..72fb1c364e 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowExecutionsResource.scala
@@ -57,10 +57,11 @@ import scala.collection.mutable
import scala.jdk.CollectionConverters._
object WorkflowExecutionsResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
- final private lazy val executionsDao = new
WorkflowExecutionsDao(context.configuration)
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def executionsDao = new WorkflowExecutionsDao(context.configuration)
private def getExecutionById(eId: Integer): WorkflowExecutions = {
executionsDao.fetchOneByEid(eId)
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
index 5cbb5bbdd8..cb910d11c3 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
@@ -42,7 +42,7 @@ import
org.apache.texera.web.resource.dashboard.hub.HubResource.recordCloneActio
import
org.apache.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.hasReadAccess
import
org.apache.texera.web.resource.dashboard.user.workflow.WorkflowResource._
import org.jooq.impl.DSL.{groupConcatDistinct, noCondition}
-import org.jooq.{Condition, Record9, Result, SelectOnConditionStep}
+import org.jooq.{Condition, DSLContext, Record9, Result, SelectOnConditionStep}
import java.sql.Timestamp
import java.util
@@ -62,17 +62,20 @@ import scala.util.control.NonFatal
*/
object WorkflowResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
- final private lazy val workflowDao = new WorkflowDao(context.configuration)
- final private lazy val workflowOfUserDao = new WorkflowOfUserDao(
- context.configuration
- )
- final private lazy val workflowUserAccessDao = new WorkflowUserAccessDao(
- context.configuration()
- )
- final private lazy val workflowOfProjectDao = new
WorkflowOfProjectDao(context.configuration)
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def workflowDao = new WorkflowDao(context.configuration)
+ private def workflowOfUserDao =
+ new WorkflowOfUserDao(
+ context.configuration
+ )
+ private def workflowUserAccessDao =
+ new WorkflowUserAccessDao(
+ context.configuration()
+ )
+ private def workflowOfProjectDao = new
WorkflowOfProjectDao(context.configuration)
def getWorkflowName(wid: Integer): String = {
val workflow = workflowDao.fetchOneByWid(wid)
diff --git
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
index 7b8141be7f..7be74ae5b0 100644
---
a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
+++
b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala
@@ -47,11 +47,12 @@ import scala.jdk.CollectionConverters.IterableHasAsScala
*/
object WorkflowVersionResource {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
- final private lazy val workflowVersionDao = new
WorkflowVersionDao(context.configuration)
- final private lazy val workflowDao = new WorkflowDao(context.configuration)
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def workflowVersionDao = new
WorkflowVersionDao(context.configuration)
+ private def workflowDao = new WorkflowDao(context.configuration)
// constant to indicate versions should be aggregated if they are within the
specified time limit
private final val AGGREGATE_TIME_LIMIT_MILLSEC =
UserSystemConfig.workflowVersionCollapseIntervalInMinutes * 60000
diff --git
a/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala
b/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala
index 1140f5f5cc..833c443332 100644
---
a/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala
+++
b/amber/src/main/scala/org/apache/texera/web/service/ExecutionsMetadataPersistService.scala
@@ -33,12 +33,14 @@ import java.sql.Timestamp
* It also updates the entry if an execution status is updated
*/
object ExecutionsMetadataPersistService extends LazyLogging {
- final private lazy val context = SqlServer
- .getInstance()
- .createDSLContext()
- private lazy val workflowExecutionsDao = new WorkflowExecutionsDao(
- context.configuration
- )
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
+ private def workflowExecutionsDao =
+ new WorkflowExecutionsDao(
+ context.configuration
+ )
/**
* This method inserts a new entry of a workflow execution in the database
and returns the generated eId
diff --git
a/common/auth/src/main/scala/org/apache/texera/auth/JwtAuthFilter.scala
b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuthFilter.scala
index 10c498951c..ed9615b451 100644
--- a/common/auth/src/main/scala/org/apache/texera/auth/JwtAuthFilter.scala
+++ b/common/auth/src/main/scala/org/apache/texera/auth/JwtAuthFilter.scala
@@ -35,7 +35,7 @@ class JwtAuthFilter extends ContainerRequestFilter with
LazyLogging {
@Context
private var resourceInfo: ResourceInfo = _
- private val ctx = SqlServer.getInstance().createDSLContext()
+ private def ctx = SqlServer.getInstance().createDSLContext()
override def filter(requestContext: ContainerRequestContext): Unit = {
val authHeader = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION)
diff --git
a/common/auth/src/main/scala/org/apache/texera/auth/util/ComputingUnitAccess.scala
b/common/auth/src/main/scala/org/apache/texera/auth/util/ComputingUnitAccess.scala
index 14dd68e0a0..743ed2e7e6 100644
---
a/common/auth/src/main/scala/org/apache/texera/auth/util/ComputingUnitAccess.scala
+++
b/common/auth/src/main/scala/org/apache/texera/auth/util/ComputingUnitAccess.scala
@@ -28,9 +28,10 @@ import org.jooq.DSLContext
import scala.jdk.CollectionConverters._
object ComputingUnitAccess {
- private lazy val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
def getComputingUnitAccess(cuid: Integer, uid: Integer): PrivilegeEnum = {
val workflowComputingUnitDao = new
WorkflowComputingUnitDao(context.configuration())
diff --git a/common/dao/src/main/scala/org/apache/texera/dao/SqlServer.scala
b/common/dao/src/main/scala/org/apache/texera/dao/SqlServer.scala
index 2864aa3090..942bac4f07 100644
--- a/common/dao/src/main/scala/org/apache/texera/dao/SqlServer.scala
+++ b/common/dao/src/main/scala/org/apache/texera/dao/SqlServer.scala
@@ -24,11 +24,17 @@ import org.jooq.{DSLContext, SQLDialect}
import org.postgresql.ds.PGSimpleDataSource
/**
- * SqlServer class that manages a connection to a MySQL database using jOOQ.
+ * SqlServer class that manages a connection to a PostgreSQL database using
jOOQ.
*
- * @param url The database connection URL, specifying the MySQL server and
database name.
- * @param user The username for authenticating with the MySQL database.
- * @param password The password for authenticating with the MySQL database.
+ * WARNING: Do not cache the DSLContext returned by `createDSLContext()` in a
val or lazy val.
+ * During testing, `MockTexeraDB` replaces the SqlServer instance between
test classes.
+ * A cached DSLContext will hold a stale reference to a dead database
connection from a previous test class,
+ * causing "Connection refused" errors when tests run together.
+ * Use `def` to ensure the connection is looked up each time.
+ *
+ * @param url The database connection URL.
+ * @param user The username for authenticating with the database.
+ * @param password The password for authenticating with the database.
*/
class SqlServer private (url: String, user: String, password: String) {
val SQL_DIALECT: SQLDialect = SQLDialect.POSTGRES
diff --git
a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala
b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala
index c5fdfa260d..9538ca4168 100644
---
a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala
+++
b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitAccessResource.scala
@@ -40,9 +40,10 @@ import org.jooq.{DSLContext, EnumType}
import scala.jdk.CollectionConverters._
object ComputingUnitAccessResource {
- private lazy val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
/**
* Identifies whether the given user has read-only access over the given
computing unit
diff --git
a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala
b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala
index 8161643bd6..1249d06783 100644
---
a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala
+++
b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/resource/ComputingUnitManagingResource.scala
@@ -60,9 +60,10 @@ import scala.annotation.unused
import scala.jdk.CollectionConverters.CollectionHasAsScala
object ComputingUnitManagingResource {
- private lazy val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
// Environment variables passed to the created computing unit(pod)
private lazy val computingUnitEnvironmentVariables: Map[String, Any] = Map(
diff --git
a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
index 4698c7d77c..28b90c542a 100644
---
a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
+++
b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
@@ -42,9 +42,10 @@ import org.jooq.{DSLContext, EnumType}
import javax.ws.rs.ForbiddenException
object DatasetAccessResource {
- private lazy val context: DSLContext = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context: DSLContext =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
def isDatasetPublic(ctx: DSLContext, did: Integer): Boolean = {
val datasetDao = new DatasetDao(ctx.configuration())
diff --git
a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
index 5a2658e065..f39885367c 100644
---
a/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
+++
b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
@@ -79,9 +79,10 @@ import scala.util.Try
object DatasetResource {
- private val context = SqlServer
- .getInstance()
- .createDSLContext()
+ private def context =
+ SqlServer
+ .getInstance()
+ .createDSLContext()
private def singleFileUploadMaxBytes(ctx: DSLContext, defaultMiB: Long =
20L): Long = {
val limit = ctx
