This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 17fabc9a2 Fix linkis cli npe error (#4919)
17fabc9a2 is described below
commit 17fabc9a22c7730f320a49d3614a5b47f0863b86
Author: sjgllgh <[email protected]>
AuthorDate: Sun Oct 1 22:44:37 2023 +0800
Fix linkis cli npe error (#4919)
* #4907 Incorrect adjustment of log printing resource parameters
* #4918 fix bug:linkis cli npe error
---
.../interactor/job/interactive/InteractiveJob.java | 18 ++++++++++--------
.../cli/application/operator/ujes/LinkisJobOper.java | 2 +-
.../application/operator/ujes/UJESResultAdapter.java | 4 ++++
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git
a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
index a097b1b25..12e491c5a 100644
---
a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
+++
b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
@@ -88,17 +88,17 @@ public class InteractiveJob implements Job {
LinkisOperResultAdapter jobInfoResult =
oper.queryJobInfo(submitResult.getUser(), submitResult.getJobID());
oper.queryJobStatus(
- jobInfoResult.getUser(), jobInfoResult.getJobID(),
jobInfoResult.getStrongerExecId());
+ submitResult.getUser(), submitResult.getJobID(),
submitResult.getStrongerExecId());
infoBuilder.setLength(0);
infoBuilder
.append("JobId:")
- .append(jobInfoResult.getJobID())
+ .append(submitResult.getJobID())
.append(System.lineSeparator())
.append("TaskId:")
- .append(jobInfoResult.getJobID())
+ .append(submitResult.getJobID())
.append(System.lineSeparator())
.append("ExecId:")
- .append(jobInfoResult.getStrongerExecId());
+ .append(submitResult.getStrongerExecId());
LoggerManager.getPlaintTextLogger().info(infoBuilder.toString());
infoBuilder.setLength(0);
@@ -137,7 +137,9 @@ public class InteractiveJob implements Job {
logRetriever.retrieveLogAsync();
// wait complete
- jobInfoResult = waitJobComplete(submitResult.getUser(),
submitResult.getJobID());
+ jobInfoResult =
+ waitJobComplete(
+ submitResult.getUser(), submitResult.getJobID(),
submitResult.getStrongerExecId());
logRetriever.waitIncLogComplete();
// get result-set
@@ -205,19 +207,19 @@ public class InteractiveJob implements Job {
return result;
}
- private LinkisOperResultAdapter waitJobComplete(String user, String jobId)
+ private LinkisOperResultAdapter waitJobComplete(String user, String jobId,
String execId)
throws LinkisClientRuntimeException {
int retryCnt = 0;
final int MAX_RETRY = 30;
LinkisOperResultAdapter jobInfoResult = oper.queryJobInfo(user, jobId);
- oper.queryJobStatus(user, jobId, jobInfoResult.getStrongerExecId());
+ oper.queryJobStatus(user, jobId, execId);
while (!jobInfoResult.getJobStatus().isJobFinishedState()) {
// query progress
try {
jobInfoResult = oper.queryJobInfo(user, jobId);
- oper.queryJobStatus(user, jobId, jobInfoResult.getStrongerExecId());
+ oper.queryJobStatus(user, jobId, execId);
} catch (Exception e) {
logger.warn("", e);
retryCnt++;
diff --git
a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/LinkisJobOper.java
b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/LinkisJobOper.java
index c4f7a3aad..f696c8674 100644
---
a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/LinkisJobOper.java
+++
b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/LinkisJobOper.java
@@ -127,7 +127,7 @@ public class LinkisJobOper implements JobOper {
// jobExecuteResult = client.execute(jobExecuteAction);
jobSubmitResult = client.submit(jobSubmitAction);
- logger.info("Response info from Linkis: \n{}",
CliUtils.GSON.toJson(jobSubmitAction));
+ logger.info("Response info from Linkis: \n{}",
CliUtils.GSON.toJson(jobSubmitResult));
} catch (Exception e) {
// must throw if exception
diff --git
a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESResultAdapter.java
b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESResultAdapter.java
index 6c746ff57..63fb004db 100644
---
a/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESResultAdapter.java
+++
b/linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESResultAdapter.java
@@ -162,6 +162,10 @@ public class UJESResultAdapter implements
LinkisOperResultAdapter {
return null;
}
String execId = null;
+
+ if (result instanceof JobSubmitResult) {
+ execId = ((JobSubmitResult) result).getExecID();
+ }
if (result instanceof JobInfoResult) {
if (result != null
&& ((JobInfoResult) result).getTask() != null
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
