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
a317b5ff
Commit
a317b5ff
authored
Jun 26, 2015
by
Sami Wagiaalla
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iscsi plugin: print error messages not just exit status.
Signed-off-by:
Sami Wagiaalla
<
swagiaal@redhat.com
>
parent
712f3033
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
iscsi_util.go
pkg/volume/iscsi/iscsi_util.go
+6
-6
No files found.
pkg/volume/iscsi/iscsi_util.go
View file @
a317b5ff
...
...
@@ -83,15 +83,15 @@ func (util *ISCSIUtil) AttachDisk(iscsi iscsiDisk) error {
exist
:=
waitForPathToExist
(
devicePath
,
1
)
if
exist
==
false
{
// discover iscsi target
_
,
err
:=
iscsi
.
plugin
.
execCommand
(
"iscsiadm"
,
[]
string
{
"-m"
,
"discovery"
,
"-t"
,
"sendtargets"
,
"-p"
,
iscsi
.
portal
})
out
,
err
:=
iscsi
.
plugin
.
execCommand
(
"iscsiadm"
,
[]
string
{
"-m"
,
"discovery"
,
"-t"
,
"sendtargets"
,
"-p"
,
iscsi
.
portal
})
if
err
!=
nil
{
glog
.
Errorf
(
"iscsi: failed to sendtargets to portal %s error:
%v"
,
iscsi
.
portal
,
err
)
glog
.
Errorf
(
"iscsi: failed to sendtargets to portal %s error:
%s"
,
iscsi
.
portal
,
string
(
out
)
)
return
err
}
// login to iscsi target
_
,
err
=
iscsi
.
plugin
.
execCommand
(
"iscsiadm"
,
[]
string
{
"-m"
,
"node"
,
"-p"
,
iscsi
.
portal
,
"-T"
,
iscsi
.
iqn
,
"--login"
})
out
,
err
=
iscsi
.
plugin
.
execCommand
(
"iscsiadm"
,
[]
string
{
"-m"
,
"node"
,
"-p"
,
iscsi
.
portal
,
"-T"
,
iscsi
.
iqn
,
"--login"
})
if
err
!=
nil
{
glog
.
Errorf
(
"iscsi: failed to attach disk:Error: %
v"
,
err
)
glog
.
Errorf
(
"iscsi: failed to attach disk:Error: %
s (%v)"
,
string
(
out
)
,
err
)
return
err
}
exist
=
waitForPathToExist
(
devicePath
,
10
)
...
...
@@ -146,9 +146,9 @@ func (util *ISCSIUtil) DetachDisk(iscsi iscsiDisk, mntPath string) error {
iqn
:=
device
[
ind1
+
len
(
"-iscsi-"
)
:
ind
]
glog
.
Infof
(
"iscsi: log out target %s iqn %s"
,
portal
,
iqn
)
_
,
err
=
iscsi
.
plugin
.
execCommand
(
"iscsiadm"
,
[]
string
{
"-m"
,
"node"
,
"-p"
,
portal
,
"-T"
,
iqn
,
"--logout"
})
out
,
err
:
=
iscsi
.
plugin
.
execCommand
(
"iscsiadm"
,
[]
string
{
"-m"
,
"node"
,
"-p"
,
portal
,
"-T"
,
iqn
,
"--logout"
})
if
err
!=
nil
{
glog
.
Errorf
(
"iscsi: failed to detach disk Error: %
v"
,
err
)
glog
.
Errorf
(
"iscsi: failed to detach disk Error: %
s"
,
string
(
out
)
)
}
}
}
...
...
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