Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
81b2a2c7
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
81b2a2c7
编写于
1月 14, 2016
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
qemu: Refactor qemuProcessRecoverMigration
Signed-off-by:
N
Jiri Denemark
<
jdenemar@redhat.com
>
上级
f6ea8a9f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
110 addition
and
96 deletion
+110
-96
src/qemu/qemu_process.c
src/qemu/qemu_process.c
+110
-96
未找到文件。
src/qemu/qemu_process.c
浏览文件 @
81b2a2c7
...
...
@@ -3134,113 +3134,122 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm)
}
static
int
qemuProcessRecoverMigration
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virConnectPtr
conn
,
qemuDomainAsyncJob
job
,
qemuMigrationJobPhase
phase
,
virDomainState
state
,
int
reason
)
qemuProcessRecoverMigrationIn
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virConnectPtr
conn
,
qemuMigrationJobPhase
phase
,
virDomainState
state
,
int
reason
ATTRIBUTE_UNUSED
)
{
if
(
job
==
QEMU_ASYNC_JOB_MIGRATION_IN
)
{
switch
(
phase
)
{
case
QEMU_MIGRATION_PHASE_NONE
:
case
QEMU_MIGRATION_PHASE_PERFORM2
:
case
QEMU_MIGRATION_PHASE_BEGIN3
:
case
QEMU_MIGRATION_PHASE_PERFORM3
:
case
QEMU_MIGRATION_PHASE_PERFORM3_DONE
:
case
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
:
case
QEMU_MIGRATION_PHASE_CONFIRM3
:
case
QEMU_MIGRATION_PHASE_LAST
:
break
;
switch
(
phase
)
{
case
QEMU_MIGRATION_PHASE_NONE
:
case
QEMU_MIGRATION_PHASE_PERFORM2
:
case
QEMU_MIGRATION_PHASE_BEGIN3
:
case
QEMU_MIGRATION_PHASE_PERFORM3
:
case
QEMU_MIGRATION_PHASE_PERFORM3_DONE
:
case
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
:
case
QEMU_MIGRATION_PHASE_CONFIRM3
:
case
QEMU_MIGRATION_PHASE_LAST
:
/* N/A for incoming migration */
break
;
case
QEMU_MIGRATION_PHASE_PREPARE
:
VIR_DEBUG
(
"Killing unfinished incoming migration for domain %s"
,
vm
->
def
->
name
);
return
-
1
;
case
QEMU_MIGRATION_PHASE_PREPARE
:
VIR_DEBUG
(
"Killing unfinished incoming migration for domain %s"
,
vm
->
def
->
name
);
case
QEMU_MIGRATION_PHASE_FINISH2
:
/* source domain is already killed so let's just resume the domain
* and hope we are all set */
VIR_DEBUG
(
"Incoming migration finished, resuming domain %s"
,
vm
->
def
->
name
);
if
(
qemuProcessStartCPUs
(
driver
,
vm
,
conn
,
VIR_DOMAIN_RUNNING_UNPAUSED
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
{
VIR_WARN
(
"Could not resume domain %s"
,
vm
->
def
->
name
);
}
break
;
case
QEMU_MIGRATION_PHASE_FINISH3
:
/* migration finished, we started resuming the domain but didn't
* confirm success or failure yet; killing it seems safest unless
* we already started guest CPUs */
if
(
state
!=
VIR_DOMAIN_RUNNING
)
{
VIR_DEBUG
(
"Killing migrated domain %s"
,
vm
->
def
->
name
);
return
-
1
;
}
break
;
}
case
QEMU_MIGRATION_PHASE_FINISH2
:
/* source domain is already killed so let's just resume the domain
* and hope we are all set */
VIR_DEBUG
(
"Incoming migration finished, resuming domain %s"
,
vm
->
def
->
name
);
if
(
qemuProcessStartCPUs
(
driver
,
vm
,
conn
,
VIR_DOMAIN_RUNNING_UNPAUSED
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
{
VIR_WARN
(
"Could not resume domain %s"
,
vm
->
def
->
name
);
}
break
;
return
0
;
}
case
QEMU_MIGRATION_PHASE_FINISH3
:
/* migration finished, we started resuming the domain but didn't
* confirm success or failure yet; killing it seems safest unless
* we already started guest CPUs */
if
(
state
!=
VIR_DOMAIN_RUNNING
)
{
VIR_DEBUG
(
"Killing migrated domain %s"
,
vm
->
def
->
name
);
return
-
1
;
}
break
;
static
int
qemuProcessRecoverMigrationOut
(
virQEMUDriverPtr
driver
,
virDomainObjPtr
vm
,
virConnectPtr
conn
,
qemuMigrationJobPhase
phase
,
virDomainState
state
,
int
reason
)
{
switch
(
phase
)
{
case
QEMU_MIGRATION_PHASE_NONE
:
case
QEMU_MIGRATION_PHASE_PREPARE
:
case
QEMU_MIGRATION_PHASE_FINISH2
:
case
QEMU_MIGRATION_PHASE_FINISH3
:
case
QEMU_MIGRATION_PHASE_LAST
:
/* N/A for outgoing migration */
break
;
case
QEMU_MIGRATION_PHASE_BEGIN3
:
/* nothing happened so far, just forget we were about to migrate the
* domain */
break
;
case
QEMU_MIGRATION_PHASE_PERFORM2
:
case
QEMU_MIGRATION_PHASE_PERFORM3
:
/* migration is still in progress, let's cancel it and resume the
* domain */
VIR_DEBUG
(
"Cancelling unfinished migration of domain %s"
,
vm
->
def
->
name
);
if
(
qemuMigrationCancel
(
driver
,
vm
)
<
0
)
{
VIR_WARN
(
"Could not cancel ongoing migration of domain %s"
,
vm
->
def
->
name
);
}
}
else
if
(
job
==
QEMU_ASYNC_JOB_MIGRATION_OUT
)
{
switch
(
phase
)
{
case
QEMU_MIGRATION_PHASE_NONE
:
case
QEMU_MIGRATION_PHASE_PREPARE
:
case
QEMU_MIGRATION_PHASE_FINISH2
:
case
QEMU_MIGRATION_PHASE_FINISH3
:
case
QEMU_MIGRATION_PHASE_LAST
:
break
;
goto
resume
;
case
QEMU_MIGRATION_PHASE_BEGIN3
:
/* nothing happen so far, just forget we were about to migrate the
* domain */
break
;
case
QEMU_MIGRATION_PHASE_PERFORM3_DONE
:
/* migration finished but we didn't have a chance to get the result
* of Finish3 step; third party needs to check what to do next
*/
break
;
case
QEMU_MIGRATION_PHASE_PERFORM2
:
case
QEMU_MIGRATION_PHASE_PERFORM3
:
/* migration is still in progress, let's cancel it and resume the
* domain */
if
(
qemuMigrationCancel
(
driver
,
vm
)
<
0
)
return
-
1
;
/* resume the domain but only if it was paused as a result of
* migration */
if
(
state
==
VIR_DOMAIN_PAUSED
&&
(
reason
==
VIR_DOMAIN_PAUSED_MIGRATION
||
reason
==
VIR_DOMAIN_PAUSED_UNKNOWN
))
{
if
(
qemuProcessStartCPUs
(
driver
,
vm
,
conn
,
VIR_DOMAIN_RUNNING_UNPAUSED
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
{
VIR_WARN
(
"Could not resume domain %s"
,
vm
->
def
->
name
);
}
}
break
;
case
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
:
/* Finish3 failed, we need to resume the domain */
VIR_DEBUG
(
"Resuming domain %s after failed migration"
,
vm
->
def
->
name
);
goto
resume
;
case
QEMU_MIGRATION_PHASE_PERFORM3_DONE
:
/* migration finished but we didn't have a chance to get the result
* of Finish3 step; third party needs to check what to do next
*/
break
;
case
QEMU_MIGRATION_PHASE_CONFIRM3
:
/* migration completed, we need to kill the domain here */
return
-
1
;
}
case
QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED
:
/* Finish3 failed, we need to resume the domain */
VIR_DEBUG
(
"Resuming domain %s after failed migration"
,
vm
->
def
->
name
);
if
(
state
==
VIR_DOMAIN_PAUSED
&&
(
reason
==
VIR_DOMAIN_PAUSED_MIGRATION
||
reason
==
VIR_DOMAIN_PAUSED_UNKNOWN
))
{
if
(
qemuProcessStartCPUs
(
driver
,
vm
,
conn
,
VIR_DOMAIN_RUNNING_UNPAUSED
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
{
VIR_WARN
(
"Could not resume domain %s"
,
vm
->
def
->
name
);
}
}
break
;
return
0
;
case
QEMU_MIGRATION_PHASE_CONFIRM3
:
/* migration completed, we need to kill the domain here */
return
-
1
;
resume:
/* resume the domain but only if it was paused as a result of
* migration
*/
if
(
state
==
VIR_DOMAIN_PAUSED
&&
(
reason
==
VIR_DOMAIN_PAUSED_MIGRATION
||
reason
==
VIR_DOMAIN_PAUSED_UNKNOWN
))
{
if
(
qemuProcessStartCPUs
(
driver
,
vm
,
conn
,
VIR_DOMAIN_RUNNING_UNPAUSED
,
QEMU_ASYNC_JOB_NONE
)
<
0
)
{
VIR_WARN
(
"Could not resume domain %s"
,
vm
->
def
->
name
);
}
}
return
0
;
}
...
...
@@ -3258,9 +3267,14 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver,
switch
(
job
->
asyncJob
)
{
case
QEMU_ASYNC_JOB_MIGRATION_OUT
:
if
(
qemuProcessRecoverMigrationOut
(
driver
,
vm
,
conn
,
job
->
phase
,
state
,
reason
)
<
0
)
return
-
1
;
break
;
case
QEMU_ASYNC_JOB_MIGRATION_IN
:
if
(
qemuProcessRecoverMigration
(
driver
,
vm
,
conn
,
job
->
asyncJob
,
job
->
phase
,
state
,
reason
)
<
0
)
if
(
qemuProcessRecoverMigration
In
(
driver
,
vm
,
conn
,
job
->
phase
,
state
,
reason
)
<
0
)
return
-
1
;
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录