Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
2ba5f873
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2ba5f873
编写于
7月 20, 2017
作者:
S
Stefan Richter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[hotfix] Backwards compatible deserialization of RocksDB backend UUIDs
上级
4341c8a3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
17 deletion
+14
-17
flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointV2Serializer.java
...k/runtime/checkpoint/savepoint/SavepointV2Serializer.java
+11
-1
flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
...rg/apache/flink/runtime/testingUtils/TestingCluster.scala
+3
-16
未找到文件。
flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/savepoint/SavepointV2Serializer.java
浏览文件 @
2ba5f873
...
...
@@ -39,6 +39,7 @@ import java.io.ByteArrayOutputStream;
import
java.io.DataInputStream
;
import
java.io.DataOutputStream
;
import
java.io.IOException
;
import
java.nio.charset.StandardCharsets
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
...
...
@@ -391,8 +392,17 @@ class SavepointV2Serializer implements SavepointSerializer<SavepointV2> {
Map
<
StateHandleID
,
StreamStateHandle
>
sharedStates
=
deserializeStreamStateHandleMap
(
dis
);
Map
<
StateHandleID
,
StreamStateHandle
>
privateStates
=
deserializeStreamStateHandleMap
(
dis
);
UUID
uuid
;
try
{
uuid
=
UUID
.
fromString
(
backendId
);
}
catch
(
Exception
ex
)
{
// compatibility with old format pre FLINK-6964:
uuid
=
UUID
.
nameUUIDFromBytes
(
backendId
.
getBytes
(
StandardCharsets
.
UTF_8
));
}
return
new
IncrementalKeyedStateHandle
(
UUID
.
fromString
(
backendId
)
,
uuid
,
keyGroupRange
,
checkpointId
,
sharedStates
,
...
...
flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala
浏览文件 @
2ba5f873
...
...
@@ -378,12 +378,6 @@ class TestingCluster(
def
requestCheckpoint
(
jobId
:
JobID
,
options
:
CheckpointOptions
)
:
String
=
{
val
jobManagerGateway
=
getLeaderGateway
(
timeout
)
// wait until the cluster is ready to take a checkpoint.
val
allRunning
=
jobManagerGateway
.
ask
(
TestingJobManagerMessages
.
WaitForAllVerticesToBeRunning
(
jobId
),
timeout
)
Await
.
ready
(
allRunning
,
timeout
)
// trigger checkpoint
val
result
=
Await
.
result
(
jobManagerGateway
.
ask
(
CheckpointRequest
(
jobId
,
options
),
timeout
),
timeout
)
...
...
@@ -395,16 +389,9 @@ class TestingCluster(
// failed because tasks were not ready.This would not be required if
// TestingJobManagerMessages.WaitForAllVerticesToBeRunning(...) works
// properly.
if
(
fail
.
cause
!=
null
)
{
val
innerCause
=
fail
.
cause
.
getCause
if
(
innerCause
!=
null
&&
innerCause
.
getMessage
.
contains
(
"tasks not ready"
))
{
// retry if the tasks are not ready yet.
Thread
.
sleep
(
50
)
return
requestCheckpoint
(
jobId
,
options
)
}
}
throw
new
IOException
(
fail
.
cause
)
LOG
.
info
(
"Test checkpoint attempt failed. Retry ..."
,
fail
.
cause
)
Thread
.
sleep
(
50
)
requestCheckpoint
(
jobId
,
options
)
}
case
_
=>
throw
new
IllegalStateException
(
"Trigger checkpoint failed"
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录