-
Notifications
You must be signed in to change notification settings - Fork 94
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[NU-1777] Separate classloader for deployment managers #7335
base: refactoring/NU-1777_nu_runtime_app
Are you sure you want to change the base?
Conversation
@@ -438,7 +456,8 @@ def assemblySettings( | |||
includeScala: Boolean, | |||
filterProvidedDeps: Boolean = true | |||
): List[Def.SettingsDefinition] = { | |||
// This work around need to be optional because for designer module it causes excluding of scala lib (because we has there other work around for Idea classpath and provided deps) | |||
// This work around need to be optional because for designer module it causes excluding of scala lib | |||
// (because we have there other work around for Idea classpath and provided deps) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it still relevant?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH I'm not sure what exact problem was solved this way and how to check if my change outdated it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see that false
was passed only for designer assembly. It looks like we have a fat jar for designer. I don't know if someone uses it :) but ... The only provided dependencies of designer where DMs so the default filterProvidedDeps = true
should work the same so we can remove this condition
build.sbt
Outdated
Def | ||
.taskDyn(if (addManagerArtifacts) distribution / managerArtifacts else Def.task[List[(File, String)]](Nil)) | ||
.taskDyn( | ||
if (addManagerArtifacts) distribution / deploymentManagerArtifacts else Def.task[List[(File, String)]](Nil) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Won't we build some artefacts twice? I see that developmentTestsDeployManagerArtifacts contains also production artifacts now. Or sbt deduplicate them?
designer/server/src/main/scala/pl/touk/nussknacker/ui/api/description/NodesApiEndpoints.scala
Outdated
Show resolved
Hide resolved
@@ -125,8 +128,6 @@ case class ClassLoaderModelData private ( | |||
override val additionalConfigsFromProvider: Map[DesignerWideComponentId, ComponentAdditionalConfig], | |||
// This property is for easier testing when for some reason, some jars with ComponentProvider are | |||
// on the test classpath and CPs collide with other once with the same name. | |||
// E.g. we add liteEmbeddedDeploymentManager as a designer provided dependency which also |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would remove these functions now and whole comment block
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wanted to remove it but there is still some problem with ProcessConfigCreator implementations. Nevertheless, the lite Embedded deployment manager is not the problem anymore.
build.sbt
Outdated
@@ -2036,6 +2057,8 @@ lazy val designer = (project in file("designer/server")) | |||
"io.circe" %% "circe-yaml" % circeYamlV % Test, | |||
"com.github.scopt" %% "scopt" % "4.1.0" % Test, | |||
"org.questdb" % "questdb" % "7.4.2", | |||
"org.apache.kafka" % "kafka-clients" % kafkaV, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's going on here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH this dependency should be added at the component definition level (in the module when the kafka-related component/s is/are added). For some reason, there is no such dependency in the lite kafka component module (or one of the lite-related kafka modules). It's hard for me to unravel the relationships between these modules, so I decided to put the dependency here as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the dependency was removed
build.sbt
Outdated
@@ -2051,24 +2074,18 @@ lazy val designer = (project in file("designer/server")) | |||
processReports, | |||
security, | |||
deploymentManagerApi, | |||
componentsApi, | |||
requestResponseComponentsApi, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Designer and Runtime should define the API of components they are supposed to work with. And with these dependencies we express it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, but I thought that componentsApi is only necessary. These below have some engine-specific agreement that designer shouldn't be aware of
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the dependencies were removed
created: #7410 |
Describe your changes
managersDirs
config settingincludeFlinkAndScala
)Checklist before merge