response to comments

oceanbase · Sep 24, 2024 · 53af87a · 53af87a
1 parent 9d14029
commit 53af87a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/task/caller/JobCallerBuilder.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/task/caller/JobCallerBuilder.java
@@ -48,7 +48,8 @@ public static JobCaller buildProcessCaller(JobContext context) {
  String jobContextFilePath = JobUtils.getExecutorDataPath() + "/" + StringUtils.uuid() + ".enc";
  try {
  FileUtils.writeStringToFile(new File(jobContextFilePath),
- environments.get(JobEnvKeyConstants.ODC_JOB_CONTEXT),
+ JobUtils.encrypt(environments.get(JobEnvKeyConstants.ENCRYPT_KEY),
+ environments.get(JobEnvKeyConstants.ENCRYPT_SALT), JobUtils.toJson(context)),
  Charset.defaultCharset());
  } catch (Exception ex) {
  FileUtils.deleteQuietly(new File(jobContextFilePath));
@@ -57,8 +58,6 @@ public static JobCaller buildProcessCaller(JobContext context) {
  environments.put(JobEnvKeyConstants.ODC_JOB_CONTEXT_FILE_PATH,
  JobUtils.encrypt(environments.get(JobEnvKeyConstants.ENCRYPT_KEY),
  environments.get(JobEnvKeyConstants.ENCRYPT_SALT), jobContextFilePath));
- // remove JobContext from environments
- environments.remove(JobEnvKeyConstants.ODC_JOB_CONTEXT);
  ProcessConfig config = new ProcessConfig();
  config.setEnvironments(environments);
 

diff --git a/...dc-service/src/main/java/com/oceanbase/odc/service/task/caller/JobEnvironmentFactory.java b/...dc-service/src/main/java/com/oceanbase/odc/service/task/caller/JobEnvironmentFactory.java
@@ -44,8 +44,9 @@ public class JobEnvironmentFactory {
  public Map<String, String> build(JobContext context, TaskRunMode runMode) {
  putEnv(JobEnvKeyConstants.ODC_BOOT_MODE, () -> JobConstants.ODC_BOOT_MODE_EXECUTOR);
  putEnv(JobEnvKeyConstants.ODC_TASK_RUN_MODE, runMode::name);
- putEnv(JobEnvKeyConstants.ODC_JOB_CONTEXT, () -> JobUtils.toJson(context));
-
+ if (runMode.isK8s()) {
+ putEnv(JobEnvKeyConstants.ODC_JOB_CONTEXT, () -> JobUtils.toJson(context));
+ }
  JobCredentialProvider jobCredentialProvider = JobConfigurationHolder.getJobConfiguration()
  .getJobCredentialProvider();
 

diff --git a/...er/odc-service/src/main/java/com/oceanbase/odc/service/task/executor/TaskApplication.java b/...er/odc-service/src/main/java/com/oceanbase/odc/service/task/executor/TaskApplication.java
@@ -24,10 +24,10 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.eclipse.jgit.util.StringUtils;
 
 import com.oceanbase.odc.common.trace.TaskContextHolder;
 import com.oceanbase.odc.common.trace.TraceContextHolder;
+import com.oceanbase.odc.common.util.StringUtils;
 import com.oceanbase.odc.common.util.SystemUtils;
 import com.oceanbase.odc.core.shared.Verify;
 import com.oceanbase.odc.service.task.caller.JobContext;