Skip to content

In the engineConnExec.sh script, replace the absolute path of CLASSPA… #5276

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

In the engineConnExec.sh script, replace the absolute path of CLASSPA… #5276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...nager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ trait ProcessEngineConnLaunch extends EngineConnLaunch with Logging {
environment.put(PREFER_IP_ADDRESS.toString, Configuration.PREFER_IP_ADDRESS.toString)
case ENGINECONN_ENVKEYS =>
environment.put(ENGINECONN_ENVKEYS.toString, GovernanceCommonConf.ENGINECONN_ENVKEYS)
case LINKIS_HOME => putIfExists(LINKIS_HOME)
case _ =>
}
}
Expand Down
6 changes: 2 additions & 4 deletions .../src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,8 @@ object EnvConfiguration {

val LOG4J2_XML_FILE = CommonVars[String]("wds.linkis.engineconn.log4j2.xml.file", "log4j2.xml")

val LINKIS_PUBLIC_MODULE_PATH = CommonVars(
"wds.linkis.public_module.path",
Configuration.getLinkisHome + "/lib/linkis-commons/public-module"
)
val LINKIS_PUBLIC_MODULE_PATH =
CommonVars("wds.linkis.public_module.path", "/lib/linkis-commons/public-module")

val LINKIS_CONF_DIR = CommonVars("LINKIS_CONF_DIR", Configuration.getLinkisHome() + "/conf")
}
6 changes: 3 additions & 3 deletions ...main/scala/org/apache/linkis/manager/engineplugin/common/launch/process/Environment.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ object Environment extends Enumeration {

type Environment = Value

val USER, ECM_HOME, PWD, PATH, SHELL, JAVA_HOME, CLASSPATH, HADOOP_HOME, HADOOP_CONF_DIR,
HIVE_CONF_DIR, LOG_DIRS, TEMP_DIRS, ECM_HOST, ECM_PORT, RANDOM_PORT, SERVICE_DISCOVERY,
PREFER_IP_ADDRESS, UDF_JARS, ENGINECONN_ENVKEYS = Value
val USER, ECM_HOME, PWD, PATH, SHELL, JAVA_HOME, LINKIS_HOME, CLASSPATH, HADOOP_HOME,
HADOOP_CONF_DIR, HIVE_CONF_DIR, LOG_DIRS, TEMP_DIRS, ECM_HOST, ECM_PORT, RANDOM_PORT,
SERVICE_DISCOVERY, PREFER_IP_ADDRESS, UDF_JARS, ENGINECONN_ENVKEYS = Value

def variable(environment: Environment): String =
LaunchConstants.EXPANSION_MARKER_LEFT + environment + LaunchConstants.EXPANSION_MARKER_RIGHT
Expand Down
7 changes: 5 additions & 2 deletions ...inkis/manager/engineplugin/common/launch/process/JavaProcessEngineConnLaunchBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,15 @@ abstract class JavaProcessEngineConnLaunchBuilder
// first, add engineconn conf dirs.
addPathToClassPath(environment, buildPath(Seq(variable(PWD), ENGINE_CONN_CONF_DIR_NAME)))
// then, add LINKIS_CONF_DIR conf dirs.
addPathToClassPath(environment, buildPath(Seq(EnvConfiguration.LINKIS_CONF_DIR.getValue)))
addPathToClassPath(environment, buildPath(Seq(variable(LINKIS_HOME), "conf")))
// then, add engineconn libs.
addPathToClassPath(environment, buildPath(Seq(variable(PWD), ENGINE_CONN_LIB_DIR_NAME + "/*")))
// then, add public modules.
if (!enablePublicModule) {
addPathToClassPath(environment, buildPath(Seq(LINKIS_PUBLIC_MODULE_PATH.getValue + "/*")))
addPathToClassPath(
environment,
buildPath(Seq(variable(LINKIS_HOME), LINKIS_PUBLIC_MODULE_PATH.getValue + "/*"))
)
}
// finally, add the suitable properties key to classpath
val taskClassPathFiles = EnvConfiguration.ENGINE_CONN_CLASSPATH_FILES.getValue(
Expand Down
Loading