Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b3050bbd
Commit
b3050bbd
authored
Nov 14, 2016
by
Jan Safranek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve error logging in glusterfs provisioner
parent
5c21cc89
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
glusterfs.go
pkg/volume/glusterfs/glusterfs.go
+16
-16
No files found.
pkg/volume/glusterfs/glusterfs.go
View file @
b3050bbd
...
...
@@ -526,8 +526,8 @@ func (p *glusterfsVolumeProvisioner) CreateVolume() (r *api.GlusterfsVolumeSourc
glog
.
V
(
1
)
.
Infof
(
"glusterfs: volume with size: %d and name: %s created"
,
volume
.
Size
,
volume
.
Name
)
clusterinfo
,
err
:=
cli
.
ClusterInfo
(
volume
.
Cluster
)
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: failed to get cluster details
"
)
return
nil
,
0
,
fmt
.
Errorf
(
"failed to get cluster details %v"
,
err
)
glog
.
Errorf
(
"glusterfs: failed to get cluster details
: %v"
,
err
)
return
nil
,
0
,
fmt
.
Errorf
(
"failed to get cluster details
:
%v"
,
err
)
}
// For the above dynamically provisioned volume, we gather the list of node IPs
// of the cluster on which provisioned volume belongs to, as there can be multiple
...
...
@@ -536,16 +536,16 @@ func (p *glusterfsVolumeProvisioner) CreateVolume() (r *api.GlusterfsVolumeSourc
for
_
,
node
:=
range
clusterinfo
.
Nodes
{
nodei
,
err
:=
cli
.
NodeInfo
(
string
(
node
))
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: failed to get hostip
%v
"
,
err
)
return
nil
,
0
,
fmt
.
Errorf
(
"failed to get hostip %v"
,
err
)
glog
.
Errorf
(
"glusterfs: failed to get hostip
: %v
"
,
err
)
return
nil
,
0
,
fmt
.
Errorf
(
"failed to get hostip
:
%v"
,
err
)
}
ipaddr
:=
dstrings
.
Join
(
nodei
.
NodeAddRequest
.
Hostnames
.
Storage
,
""
)
dynamicHostIps
=
append
(
dynamicHostIps
,
ipaddr
)
}
glog
.
V
(
3
)
.
Infof
(
"glusterfs: hostlist :%v"
,
dynamicHostIps
)
if
len
(
dynamicHostIps
)
==
0
{
glog
.
Errorf
(
"glusterfs: no hosts found
%v
"
,
err
)
return
nil
,
0
,
fmt
.
Errorf
(
"no hosts found %v"
,
err
)
glog
.
Errorf
(
"glusterfs: no hosts found
: %v
"
,
err
)
return
nil
,
0
,
fmt
.
Errorf
(
"no hosts found
:
%v"
,
err
)
}
// The 'endpointname' is created in form of 'gluster-dynamic-<claimname>'.
...
...
@@ -556,7 +556,7 @@ func (p *glusterfsVolumeProvisioner) CreateVolume() (r *api.GlusterfsVolumeSourc
epNamespace
:=
p
.
options
.
PVC
.
Namespace
endpoint
,
service
,
err
:=
p
.
createEndpointService
(
epNamespace
,
epServiceName
,
dynamicHostIps
,
p
.
options
.
PVC
.
Name
)
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: failed to create endpoint/service
"
)
glog
.
Errorf
(
"glusterfs: failed to create endpoint/service
: %v"
,
err
)
err
=
cli
.
VolumeDelete
(
volume
.
Id
)
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: error when deleting the volume :%v , manual deletion required"
,
err
)
...
...
@@ -596,8 +596,8 @@ func (p *glusterfsVolumeProvisioner) createEndpointService(namespace string, epS
err
=
nil
}
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: failed to create endpoint %v"
,
err
)
return
nil
,
nil
,
fmt
.
Errorf
(
"error creating endpoint %v"
,
err
)
glog
.
Errorf
(
"glusterfs: failed to create endpoint
:
%v"
,
err
)
return
nil
,
nil
,
fmt
.
Errorf
(
"error creating endpoint
:
%v"
,
err
)
}
service
=
&
api
.
Service
{
ObjectMeta
:
api
.
ObjectMeta
{
...
...
@@ -616,8 +616,8 @@ func (p *glusterfsVolumeProvisioner) createEndpointService(namespace string, epS
err
=
nil
}
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs: failed to create service %v"
,
err
)
return
nil
,
nil
,
fmt
.
Errorf
(
"error creating service %v"
,
err
)
glog
.
Errorf
(
"glusterfs: failed to create service
:
%v"
,
err
)
return
nil
,
nil
,
fmt
.
Errorf
(
"error creating service
:
%v"
,
err
)
}
return
endpoint
,
service
,
nil
}
...
...
@@ -625,10 +625,10 @@ func (p *glusterfsVolumeProvisioner) createEndpointService(namespace string, epS
func
(
d
*
glusterfsVolumeDeleter
)
deleteEndpointService
(
namespace
string
,
epServiceName
string
)
(
err
error
)
{
err
=
d
.
plugin
.
host
.
GetKubeClient
()
.
Core
()
.
Services
(
namespace
)
.
Delete
(
epServiceName
,
nil
)
if
err
!=
nil
{
glog
.
Errorf
(
"glusterfs:
failed to delete service %s in namespace %s error %v"
,
epServiceName
,
namespac
e
,
err
)
return
fmt
.
Errorf
(
"error deleting service %
v in namespace [%s]"
,
err
,
namespace
)
glog
.
Errorf
(
"glusterfs:
error deleting service %s/%s: %v"
,
namespace
,
epServiceNam
e
,
err
)
return
fmt
.
Errorf
(
"error deleting service %
s/%s: %v"
,
namespace
,
epServiceName
,
err
)
}
glog
.
V
(
1
)
.
Infof
(
"glusterfs: service/endpoint
[%s] in namespace [%s] deleted successfully"
,
epServiceName
,
namespac
e
)
glog
.
V
(
1
)
.
Infof
(
"glusterfs: service/endpoint
%s/%s deleted successfully"
,
namespace
,
epServiceNam
e
)
return
nil
}
...
...
@@ -636,8 +636,8 @@ func (d *glusterfsVolumeDeleter) deleteEndpointService(namespace string, epServi
func
parseSecret
(
namespace
,
secretName
string
,
kubeClient
clientset
.
Interface
)
(
string
,
error
)
{
secretMap
,
err
:=
volutil
.
GetSecretForPV
(
namespace
,
secretName
,
glusterfsPluginName
,
kubeClient
)
if
err
!=
nil
{
glog
.
Errorf
(
"failed to get secret
from [%q/%q]"
,
namespace
,
secretName
)
return
""
,
fmt
.
Errorf
(
"failed to get secret
from [%q/%q]"
,
namespace
,
secretName
)
glog
.
Errorf
(
"failed to get secret
%s/%s: %v"
,
namespace
,
secretName
,
err
)
return
""
,
fmt
.
Errorf
(
"failed to get secret
%s/%s: %v"
,
namespace
,
secretName
,
err
)
}
if
len
(
secretMap
)
==
0
{
return
""
,
fmt
.
Errorf
(
"empty secret map"
)
...
...
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