Skip to content

Commit 17fabc9

Browse files
authored
Fix linkis cli npe error (#4919)
* #4907 Incorrect adjustment of log printing resource parameters * #4918 fix bug:linkis cli npe error
1 parent 2efef01 commit 17fabc9

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ public JobResult run() {
8888
LinkisOperResultAdapter jobInfoResult =
8989
oper.queryJobInfo(submitResult.getUser(), submitResult.getJobID());
9090
oper.queryJobStatus(
91-
jobInfoResult.getUser(), jobInfoResult.getJobID(), jobInfoResult.getStrongerExecId());
91+
submitResult.getUser(), submitResult.getJobID(), submitResult.getStrongerExecId());
9292
infoBuilder.setLength(0);
9393
infoBuilder
9494
.append("JobId:")
95-
.append(jobInfoResult.getJobID())
95+
.append(submitResult.getJobID())
9696
.append(System.lineSeparator())
9797
.append("TaskId:")
98-
.append(jobInfoResult.getJobID())
98+
.append(submitResult.getJobID())
9999
.append(System.lineSeparator())
100100
.append("ExecId:")
101-
.append(jobInfoResult.getStrongerExecId());
101+
.append(submitResult.getStrongerExecId());
102102
LoggerManager.getPlaintTextLogger().info(infoBuilder.toString());
103103
infoBuilder.setLength(0);
104104

@@ -137,7 +137,9 @@ public JobResult run() {
137137
logRetriever.retrieveLogAsync();
138138

139139
// wait complete
140-
jobInfoResult = waitJobComplete(submitResult.getUser(), submitResult.getJobID());
140+
jobInfoResult =
141+
waitJobComplete(
142+
submitResult.getUser(), submitResult.getJobID(), submitResult.getStrongerExecId());
141143
logRetriever.waitIncLogComplete();
142144

143145
// get result-set
@@ -205,19 +207,19 @@ private JobResult getResult(
205207
return result;
206208
}
207209

208-
private LinkisOperResultAdapter waitJobComplete(String user, String jobId)
210+
private LinkisOperResultAdapter waitJobComplete(String user, String jobId, String execId)
209211
throws LinkisClientRuntimeException {
210212
int retryCnt = 0;
211213
final int MAX_RETRY = 30;
212214

213215
LinkisOperResultAdapter jobInfoResult = oper.queryJobInfo(user, jobId);
214-
oper.queryJobStatus(user, jobId, jobInfoResult.getStrongerExecId());
216+
oper.queryJobStatus(user, jobId, execId);
215217

216218
while (!jobInfoResult.getJobStatus().isJobFinishedState()) {
217219
// query progress
218220
try {
219221
jobInfoResult = oper.queryJobInfo(user, jobId);
220-
oper.queryJobStatus(user, jobId, jobInfoResult.getStrongerExecId());
222+
oper.queryJobStatus(user, jobId, execId);
221223
} catch (Exception e) {
222224
logger.warn("", e);
223225
retryCnt++;

linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/LinkisJobOper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public LinkisOperResultAdapter submit(InteractiveJobDesc jobDesc)
127127
// jobExecuteResult = client.execute(jobExecuteAction);
128128

129129
jobSubmitResult = client.submit(jobSubmitAction);
130-
logger.info("Response info from Linkis: \n{}", CliUtils.GSON.toJson(jobSubmitAction));
130+
logger.info("Response info from Linkis: \n{}", CliUtils.GSON.toJson(jobSubmitResult));
131131

132132
} catch (Exception e) {
133133
// must throw if exception

linkis-computation-governance/linkis-client/linkis-cli/src/main/java/org/apache/linkis/cli/application/operator/ujes/UJESResultAdapter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ public String getStrongerExecId() {
162162
return null;
163163
}
164164
String execId = null;
165+
166+
if (result instanceof JobSubmitResult) {
167+
execId = ((JobSubmitResult) result).getExecID();
168+
}
165169
if (result instanceof JobInfoResult) {
166170
if (result != null
167171
&& ((JobInfoResult) result).getTask() != null

0 commit comments

Comments
 (0)