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
0bef2d49
Commit
0bef2d49
authored
Mar 09, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化 PerJob 和 Application 作业的JID提交检测
parent
be150742
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
2 deletions
+34
-2
TaskWorker.java
...mon/src/main/java/com/dlink/daemon/entity/TaskWorker.java
+2
-2
KubernetesApplicationGateway.java
...link/gateway/kubernetes/KubernetesApplicationGateway.java
+9
-0
YarnApplicationGateway.java
...n/java/com/dlink/gateway/yarn/YarnApplicationGateway.java
+11
-0
YarnPerJobGateway.java
...c/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java
+9
-0
Welcome.tsx
dlink-web/src/pages/Welcome.tsx
+3
-0
No files found.
dlink-daemon/src/main/java/com/dlink/daemon/entity/TaskWorker.java
View file @
0bef2d49
...
...
@@ -17,7 +17,7 @@ public class TaskWorker implements Runnable {
@Override
public
void
run
()
{
log
.
info
(
"TaskWorker run"
);
//
log.info("TaskWorker run");
while
(
running
)
{
DaemonTask
daemonTask
=
queue
.
dequeue
();
if
(
daemonTask
!=
null
)
{
...
...
@@ -31,7 +31,7 @@ public class TaskWorker implements Runnable {
}
public
void
shutdown
()
{
log
.
info
(
Thread
.
currentThread
().
getName
()
+
"TaskWorker shutdown"
);
//
log.info(Thread.currentThread().getName() + "TaskWorker shutdown");
running
=
false
;
}
}
dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java
View file @
0bef2d49
...
...
@@ -53,6 +53,15 @@ public class KubernetesApplicationGateway extends KubernetesGateway {
ClusterClientProvider
<
String
>
clusterClientProvider
=
kubernetesClusterDescriptor
.
deployApplicationCluster
(
clusterSpecification
,
applicationConfiguration
);
ClusterClient
<
String
>
clusterClient
=
clusterClientProvider
.
getClusterClient
();
Collection
<
JobStatusMessage
>
jobStatusMessages
=
clusterClient
.
listJobs
().
get
();
int
counts
=
10
;
while
(
jobStatusMessages
.
size
()
==
0
&&
counts
>
0
)
{
Thread
.
sleep
(
1000
);
counts
--;
jobStatusMessages
=
clusterClient
.
listJobs
().
get
();
if
(
jobStatusMessages
.
size
()
>
0
)
{
break
;
}
}
if
(
jobStatusMessages
.
size
()
>
0
)
{
List
<
String
>
jids
=
new
ArrayList
<>();
for
(
JobStatusMessage
jobStatusMessage
:
jobStatusMessages
)
{
...
...
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java
View file @
0bef2d49
...
...
@@ -8,6 +8,7 @@ import com.dlink.gateway.exception.GatewayException;
import
com.dlink.gateway.result.GatewayResult
;
import
com.dlink.gateway.result.YarnResult
;
import
com.dlink.utils.LogUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.flink.client.deployment.ClusterSpecification
;
import
org.apache.flink.client.deployment.application.ApplicationConfiguration
;
import
org.apache.flink.client.program.ClusterClient
;
...
...
@@ -67,12 +68,22 @@ public class YarnApplicationGateway extends YarnGateway {
applicationConfiguration
);
ClusterClient
<
ApplicationId
>
clusterClient
=
clusterClientProvider
.
getClusterClient
();
Collection
<
JobStatusMessage
>
jobStatusMessages
=
clusterClient
.
listJobs
().
get
();
int
counts
=
10
;
while
(
jobStatusMessages
.
size
()
==
0
&&
counts
>
0
)
{
Thread
.
sleep
(
1000
);
counts
--;
jobStatusMessages
=
clusterClient
.
listJobs
().
get
();
if
(
jobStatusMessages
.
size
()
>
0
)
{
break
;
}
}
if
(
jobStatusMessages
.
size
()
>
0
)
{
List
<
String
>
jids
=
new
ArrayList
<>();
for
(
JobStatusMessage
jobStatusMessage
:
jobStatusMessages
)
{
jids
.
add
(
jobStatusMessage
.
getJobId
().
toHexString
());
}
result
.
setJids
(
jids
);
logger
.
info
(
"JIDS ="
+
StringUtils
.
join
(
jids
,
","
));
}
ApplicationId
applicationId
=
clusterClient
.
getClusterId
();
result
.
setAppId
(
applicationId
.
toString
());
...
...
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java
View file @
0bef2d49
...
...
@@ -56,6 +56,15 @@ public class YarnPerJobGateway extends YarnGateway {
result
.
setAppId
(
applicationId
.
toString
());
result
.
setWebURL
(
clusterClient
.
getWebInterfaceURL
());
Collection
<
JobStatusMessage
>
jobStatusMessages
=
clusterClient
.
listJobs
().
get
();
int
counts
=
10
;
while
(
jobStatusMessages
.
size
()
==
0
&&
counts
>
0
)
{
Thread
.
sleep
(
1000
);
counts
--;
jobStatusMessages
=
clusterClient
.
listJobs
().
get
();
if
(
jobStatusMessages
.
size
()
>
0
)
{
break
;
}
}
if
(
jobStatusMessages
.
size
()
>
0
)
{
List
<
String
>
jids
=
new
ArrayList
<>();
for
(
JobStatusMessage
jobStatusMessage
:
jobStatusMessages
)
{
...
...
dlink-web/src/pages/Welcome.tsx
View file @
0bef2d49
...
...
@@ -710,6 +710,9 @@ export default (): React.ReactNode => {
<
li
>
<
Link
>
优化 K8S Application 提交配置
</
Link
>
</
li
>
<
li
>
<
Link
>
优化 PerJob 和 Application 作业的JID提交检测
</
Link
>
</
li
>
</
ul
>
</
Paragraph
>
</
Timeline
.
Item
>
...
...
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