Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
2bf5fd5e
Commit
2bf5fd5e
authored
Jun 13, 2022
by
gaogao110
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Fix-596][admin] NPE on running yarn per-job app
parent
406657e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Task.java
dlink-admin/src/main/java/com/dlink/model/Task.java
+5
-2
TaskServiceImpl.java
...src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+1
-1
No files found.
dlink-admin/src/main/java/com/dlink/model/Task.java
View file @
2bf5fd5e
...
@@ -108,8 +108,11 @@ public class Task extends SuperEntity {
...
@@ -108,8 +108,11 @@ public class Task extends SuperEntity {
map
.
put
(
item
.
get
(
"key"
),
item
.
get
(
"value"
));
map
.
put
(
item
.
get
(
"key"
),
item
.
get
(
"value"
));
}
}
}
}
return
new
JobConfig
(
type
,
step
,
false
,
false
,
useRemote
,
clusterId
,
clusterConfigurationId
,
jarId
,
getId
(),
int
jid
=
Asserts
.
isNull
(
jarId
)
?
0
:
jarId
;
alias
,
fragment
,
statementSet
,
batchModel
,
checkPoint
,
parallelism
,
savePointStrategy
,
savePointPath
,
map
);
boolean
fg
=
Asserts
.
isNull
(
fragment
)
?
false
:
fragment
;
boolean
sts
=
Asserts
.
isNull
(
statementSet
)
?
false
:
statementSet
;
return
new
JobConfig
(
type
,
step
,
false
,
false
,
useRemote
,
clusterId
,
clusterConfigurationId
,
jid
,
getId
(),
alias
,
fg
,
sts
,
batchModel
,
checkPoint
,
parallelism
,
savePointStrategy
,
savePointPath
,
map
);
}
}
}
}
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @
2bf5fd5e
...
@@ -525,7 +525,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -525,7 +525,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
private
JobConfig
buildJobConfig
(
Task
task
)
{
private
JobConfig
buildJobConfig
(
Task
task
)
{
boolean
isJarTask
=
Dialect
.
FLINKJAR
.
equalsVal
(
task
.
getDialect
());
boolean
isJarTask
=
Dialect
.
FLINKJAR
.
equalsVal
(
task
.
getDialect
());
if
(!
isJarTask
&&
task
.
getFragment
()
)
{
if
(!
isJarTask
&&
Asserts
.
isNotNull
(
task
.
getFragment
())?
task
.
getFragment
():
false
)
{
String
flinkWithSql
=
dataBaseService
.
getEnabledFlinkWithSql
();
String
flinkWithSql
=
dataBaseService
.
getEnabledFlinkWithSql
();
if
(
Asserts
.
isNotNullString
(
flinkWithSql
))
{
if
(
Asserts
.
isNotNullString
(
flinkWithSql
))
{
task
.
setStatement
(
flinkWithSql
+
"\r\n"
+
task
.
getStatement
());
task
.
setStatement
(
flinkWithSql
+
"\r\n"
+
task
.
getStatement
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment