Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
0f5a2ca4
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
0f5a2ca4
编写于
11月 10, 2020
作者:
M
Medya Ghazizadeh
提交者:
GitHub
11月 10, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9641 from prezha/fix-kvm-minikube-net
Fix minikube-net network failures for KVM driver
上级
689b3db4
9e114139
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
104 addition
and
22 deletion
+104
-22
pkg/drivers/kvm/kvm.go
pkg/drivers/kvm/kvm.go
+13
-8
pkg/drivers/kvm/network.go
pkg/drivers/kvm/network.go
+91
-14
未找到文件。
pkg/drivers/kvm/kvm.go
浏览文件 @
0f5a2ca4
...
...
@@ -110,6 +110,8 @@ func (d *Driver) PreCommandCheck() error {
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"error connecting to libvirt socket. Have you added yourself to the libvirtd group?"
)
}
defer
conn
.
Close
()
libVersion
,
err
:=
conn
.
GetLibVersion
()
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"getting libvirt version"
)
...
...
@@ -240,14 +242,6 @@ func (d *Driver) Restart() error {
// Start a host
func
(
d
*
Driver
)
Start
()
(
err
error
)
{
// if somebody/something deleted the network in the meantime,
// we might need to recreate it. It's (nearly) a noop if the network exists.
log
.
Info
(
"Creating network..."
)
err
=
d
.
createNetwork
()
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"creating network"
)
}
// this call ensures that all networks are active
log
.
Info
(
"Ensuring networks are active..."
)
err
=
d
.
ensureNetwork
()
...
...
@@ -490,3 +484,14 @@ func (d *Driver) undefineDomain(conn *libvirt.Connect, dom *libvirt.Domain) erro
return
dom
.
Undefine
()
}
// lvErr will return libvirt Error struct containing specific libvirt error code, domain, message and level
func
lvErr
(
err
error
)
libvirt
.
Error
{
if
err
!=
nil
{
if
lverr
,
ok
:=
err
.
(
libvirt
.
Error
);
ok
{
return
lverr
}
return
libvirt
.
Error
{
Code
:
libvirt
.
ERR_INTERNAL_ERROR
,
Message
:
"internal error"
}
}
return
libvirt
.
Error
{
Code
:
libvirt
.
ERR_OK
,
Message
:
""
}
}
pkg/drivers/kvm/network.go
浏览文件 @
0f5a2ca4
...
...
@@ -26,10 +26,12 @@ import (
"io/ioutil"
"strings"
"text/template"
"time"
"github.com/docker/machine/libmachine/log"
libvirt
"github.com/libvirt/libvirt-go"
"github.com/pkg/errors"
"k8s.io/minikube/pkg/util/retry"
)
// Replace with hardcoded range with CIDR
...
...
@@ -53,6 +55,7 @@ func setupNetwork(conn *libvirt.Connect, name string) error {
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"checking network %s"
,
name
)
}
defer
func
()
{
_
=
n
.
Free
()
}()
// always ensure autostart is set on the network
autostart
,
err
:=
n
.
GetAutostart
()
...
...
@@ -75,7 +78,6 @@ func setupNetwork(conn *libvirt.Connect, name string) error {
return
errors
.
Wrapf
(
err
,
"starting network %s"
,
name
)
}
}
return
nil
}
...
...
@@ -99,8 +101,21 @@ func (d *Driver) ensureNetwork() error {
// Start the private network
log
.
Infof
(
"Ensuring network %s is active"
,
d
.
PrivateNetwork
)
// retry once to recreate the network, but only if is not used by another minikube instance
if
err
:=
setupNetwork
(
conn
,
d
.
PrivateNetwork
);
err
!=
nil
{
return
err
log
.
Debugf
(
"Network %s is inoperable, will try to recreate it: %v"
,
d
.
PrivateNetwork
,
err
)
if
err
:=
d
.
deleteNetwork
();
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"deleting inoperable network %s"
,
d
.
PrivateNetwork
)
}
log
.
Debugf
(
"Successfully deleted %s network"
,
d
.
PrivateNetwork
)
if
err
:=
d
.
createNetwork
();
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"recreating inoperable network %s"
,
d
.
PrivateNetwork
)
}
log
.
Debugf
(
"Successfully recreated %s network"
,
d
.
PrivateNetwork
)
if
err
:=
setupNetwork
(
conn
,
d
.
PrivateNetwork
);
err
!=
nil
{
return
err
}
log
.
Debugf
(
"Successfully activated %s network"
,
d
.
PrivateNetwork
)
}
return
nil
...
...
@@ -120,13 +135,16 @@ func (d *Driver) createNetwork() error {
// network: default
// It is assumed that the libvirt/kvm installation has already created this network
if
_
,
err
:=
conn
.
LookupNetworkByName
(
d
.
Network
);
err
!=
nil
{
netd
,
err
:=
conn
.
LookupNetworkByName
(
d
.
Network
)
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"network %s doesn't exist"
,
d
.
Network
)
}
defer
func
()
{
_
=
netd
.
Free
()
}()
// network: private
// Only create the private network if it does not already exist
if
_
,
err
:=
conn
.
LookupNetworkByName
(
d
.
PrivateNetwork
);
err
!=
nil
{
netp
,
err
:=
conn
.
LookupNetworkByName
(
d
.
PrivateNetwork
)
if
err
!=
nil
{
// create the XML for the private network from our networkTmpl
tmpl
:=
template
.
Must
(
template
.
New
(
"network"
)
.
Parse
(
networkTmpl
))
var
networkXML
bytes
.
Buffer
...
...
@@ -141,10 +159,26 @@ func (d *Driver) createNetwork() error {
}
// and finally create it
if
err
:=
network
.
Create
();
err
!=
nil
{
log
.
Debugf
(
"Trying to create network %s..."
,
d
.
PrivateNetwork
)
create
:=
func
()
error
{
if
err
:=
network
.
Create
();
err
!=
nil
{
return
err
}
active
,
err
:=
network
.
IsActive
()
if
err
==
nil
&&
active
{
return
nil
}
return
errors
.
Errorf
(
"retrying %v"
,
err
)
}
if
err
:=
retry
.
Local
(
create
,
10
*
time
.
Second
);
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"creating network %s"
,
d
.
PrivateNetwork
)
}
}
defer
func
()
{
if
netp
!=
nil
{
_
=
netp
.
Free
()
}
}()
return
nil
}
...
...
@@ -163,13 +197,13 @@ func (d *Driver) deleteNetwork() error {
log
.
Debugf
(
"Checking if network %s exists..."
,
d
.
PrivateNetwork
)
network
,
err
:=
conn
.
LookupNetworkByName
(
d
.
PrivateNetwork
)
if
err
!=
nil
{
if
l
ibvirtErr
,
ok
:=
err
.
(
libvirt
.
Error
);
ok
&&
libvirtErr
.
Code
==
libvirt
.
ERR_NO_NETWORK
{
if
l
vErr
(
err
)
.
Code
==
libvirt
.
ERR_NO_NETWORK
{
log
.
Warnf
(
"Network %s does not exist. Skipping deletion"
,
d
.
PrivateNetwork
)
return
nil
}
return
errors
.
Wrapf
(
err
,
"failed looking for network %s"
,
d
.
PrivateNetwork
)
}
defer
func
()
{
_
=
network
.
Free
()
}()
log
.
Debugf
(
"Network %s exists"
,
d
.
PrivateNetwork
)
err
=
d
.
checkDomains
(
conn
)
...
...
@@ -178,15 +212,58 @@ func (d *Driver) deleteNetwork() error {
}
// when we reach this point, it means it is safe to delete the network
// cannot destroy an inactive network - try to activate it first
log
.
Debugf
(
"Trying to reactivate network %s first (if needed)..."
,
d
.
PrivateNetwork
)
activate
:=
func
()
error
{
active
,
err
:=
network
.
IsActive
()
if
err
==
nil
&&
active
{
return
nil
}
if
err
!=
nil
{
return
err
}
// inactive, try to activate
if
err
:=
network
.
Create
();
err
!=
nil
{
return
err
}
return
errors
.
Errorf
(
"needs confirmation"
)
// confirm in the next cycle
}
if
err
:=
retry
.
Local
(
activate
,
10
*
time
.
Second
);
err
!=
nil
{
log
.
Debugf
(
"Reactivating network %s failed, will continue anyway..."
,
d
.
PrivateNetwork
)
}
log
.
Debugf
(
"Trying to destroy network %s..."
,
d
.
PrivateNetwork
)
err
=
network
.
Destroy
()
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"network destroy"
)
destroy
:=
func
()
error
{
if
err
:=
network
.
Destroy
();
err
!=
nil
{
return
err
}
active
,
err
:=
network
.
IsActive
()
if
err
==
nil
&&
!
active
{
return
nil
}
return
errors
.
Errorf
(
"retrying %v"
,
err
)
}
if
err
:=
retry
.
Local
(
destroy
,
10
*
time
.
Second
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"destroying network"
)
}
log
.
Debugf
(
"Trying to undefine network %s..."
,
d
.
PrivateNetwork
)
err
=
network
.
Undefine
()
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"network undefine"
)
undefine
:=
func
()
error
{
if
err
:=
network
.
Undefine
();
err
!=
nil
{
return
err
}
netp
,
err
:=
conn
.
LookupNetworkByName
(
d
.
PrivateNetwork
)
if
netp
!=
nil
{
_
=
netp
.
Free
()
}
if
lvErr
(
err
)
.
Code
==
libvirt
.
ERR_NO_NETWORK
{
return
nil
}
return
errors
.
Errorf
(
"retrying %v"
,
err
)
}
if
err
:=
retry
.
Local
(
undefine
,
10
*
time
.
Second
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"undefining network"
)
}
return
nil
...
...
@@ -272,7 +349,6 @@ func (d *Driver) lookupIP() (string, error) {
if
err
!=
nil
{
return
""
,
errors
.
Wrap
(
err
,
"getting connection and domain"
)
}
defer
conn
.
Close
()
libVersion
,
err
:=
conn
.
GetLibVersion
()
...
...
@@ -294,6 +370,7 @@ func (d *Driver) lookupIPFromStatusFile(conn *libvirt.Connect) (string, error) {
if
err
!=
nil
{
return
""
,
errors
.
Wrap
(
err
,
"looking up network by name"
)
}
defer
func
()
{
_
=
network
.
Free
()
}()
bridge
,
err
:=
network
.
GetBridgeName
()
if
err
!=
nil
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录