Skip to content

Commit 6ea958a

Browse files
committed
Adjust the order to inspect the savepoint path defined first
1 parent b5659fc commit 6ea958a

File tree

1 file changed

+12
-3
lines changed
  • streamis-jobmanager/streamis-job-manager/streamis-job-manager-service/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/manager/service

1 file changed

+12
-3
lines changed

streamis-jobmanager/streamis-job-manager/streamis-job-manager-service/src/main/scala/com/webank/wedatasphere/streamis/jobmanager/manager/service/DefaultStreamJobInspectService.scala

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired
1010
import org.springframework.stereotype.Service
1111
import org.springframework.transaction.annotation.Transactional
1212

13+
import java.net.URI
1314
import java.util
1415

1516
@Service
@@ -83,8 +84,13 @@ class DefaultStreamJobInspectService extends StreamJobInspectService with Loggin
8384
* @return
8485
*/
8586
private def snapshotInspect(streamJob: StreamJob): JobSnapshotInspectVo = {
86-
this.streamJobConfMapper.getRawConfValue(streamJob.getId, JobConfKeyConstants.START_AUTO_RESTORE_SWITCH.getValue) match {
87-
case "ON" =>
87+
Option(this.streamJobConfMapper.getRawConfValue(streamJob.getId, JobConfKeyConstants.SAVEPOINT.getValue + "path")) match {
88+
case Some(path) =>
89+
val inspectVo = new JobSnapshotInspectVo
90+
inspectVo.setPath(new URI(path).toString)
91+
inspectVo
92+
case _ => this.streamJobConfMapper.getRawConfValue(streamJob.getId, JobConfKeyConstants.START_AUTO_RESTORE_SWITCH.getValue) match {
93+
case "ON" =>
8894
Option(this.streamTaskService.getStateInfo(streamTaskMapper
8995
.getLatestLaunchedById(streamJob.getId))) match {
9096
case Some(jobState) =>
@@ -93,7 +99,10 @@ class DefaultStreamJobInspectService extends StreamJobInspectService with Loggin
9399
inspectVo
94100
case _ => null
95101
}
96-
case _ => null
102+
case _ => null
103+
}
97104
}
105+
98106
}
107+
99108
}

0 commit comments

Comments
 (0)