worker和agent支持java17和java8同步运行 TencentBlueKing#10586

tangruotian · Jul 10, 2024 · f89da8f · f89da8f
1 parent 4e23f68
commit f89da8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/agent/agent/src/pkg/config/config.go b/src/agent/agent/src/pkg/config/config.go
@@ -280,6 +280,10 @@ func LoadAgentConfig() error {
 	if jdkDirPath == "" {
 		jdkDirPath = getJavaDir()
 	}
+	jdk17DirPath := conf.Section("").Key(KeyJdk17DirPath).String()
+	if jdk17DirPath == "" {
+		jdk17DirPath = systemutil.GetWorkDir() + "/jdk17"
+	}
 
 	// 兼容旧版本 .agent.properties 没有这个键
 	dockerParallelTaskCount := 4

diff --git a/src/agent/agent/src/pkg/upgrade/upgrade.go b/src/agent/agent/src/pkg/upgrade/upgrade.go
@@ -110,13 +110,13 @@ func AgentUpgrade(upgradeItem *api.UpgradeItem, hasBuild bool) {
 		return
 	}
 
-	logs.Info("agentUpgrade|download upgrade files start")
+	logs.Infof("agentUpgrade|download upgrade files start %+v", upgradeItem)
 	changeItems := downloadUpgradeFiles(upgradeItem)
 	if changeItems.checkNoChange() {
 		return
 	}
 
-	logs.Info("agentUpgrade|download upgrade files done")
+	logs.Infof("agentUpgrade|download upgrade files done %+v", changeItems)
 	err := DoUpgradeOperation(changeItems)
 	if err != nil {
 		logs.WithError(err).Error("agentUpgrade|do upgrade operation failed")

diff --git a/src/agent/agent/src/third_components/jdk.go b/src/agent/agent/src/third_components/jdk.go
@@ -41,7 +41,7 @@ type JdkVersionType struct {
 }
 
 func (j *JdkVersionType) IsNull() bool {
-	return commonutil.IsStringSliceBlank(j.version)
+	return commonutil.IsStringSliceBlank(j.GetVersion())
 }
 
 func (j *JdkVersionType) GetVersion() []string {
@@ -131,6 +131,7 @@ func (j *JdkVersionType) getJdkVersion() ([]string, error) {
 	case jdk17:
 		jdkV = trimJdk17VersionList(versionOutputString)
 	}
+	j.logs.Infof("%d getJdkVersion %+v", j.vNum, jdkVersion)
 	return jdkV, nil
 }