Change in vdsm[master]: Take care of 'No devices found' when calling dmsetup status

Yeela Kaplan has uploaded a new change for review.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Take care of 'No devices found' when calling dmsetup status

When there are no devices dmsetup status
will return only: 'No devices found'

Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=881947
Signed-off-by: Yeela Kaplan 
---
M vdsm/storage/devicemapper.py
1 file changed, 8 insertions(+), 1 deletion(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/10035/1

diff --git a/vdsm/storage/devicemapper.py b/vdsm/storage/devicemapper.py
index a1651e0..9263a4b 100644
--- a/vdsm/storage/devicemapper.py
+++ b/vdsm/storage/devicemapper.py
@@ -176,7 +176,14 @@

res = {}
     for statusLine in out:
-        devName, statusLine = statusLine.split(":", 1)
+        try:
+            devName, statusLine = statusLine.split(":", 1)
+        except ValueError:
+            if len(out) == 1:
+                return res
+            else:
+                raise
+
         for m in PATH_STATUS_RE.finditer(statusLine):
             devNum, status = m.groups()
             physdevName = findDev(*[int(i) for i in devNum.split(":")])

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/333/ (1/2)

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/367/ (2/2)

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/333/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/367/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: oVirt Jenkins CI Server

Yeela Kaplan has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1: Verified

Checked on a machine with no devices.

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Ayal Baron has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1: (1 inline comment)

....................................................
File vdsm/storage/devicemapper.py
Line 179:         try:
Line 180:             devName, statusLine = statusLine.split(":", 1)
Line 181:         except ValueError:
Line 182:             if len(out) == 1:
Line 183:                 return res
how is 'No devices found' handled in calling methods?
Line 184:             else:
Line 185:                 raise
Line 186: 
Line 187:         for m in PATH_STATUS_RE.finditer(statusLine):

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Eduardo has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1: Looks good to me, but someone else must approve

(1 inline comment)

....................................................
File vdsm/storage/devicemapper.py
Line 178:     for statusLine in out:
Line 179:         try:
Line 180:             devName, statusLine = statusLine.split(":", 1)
Line 181:         except ValueError:
Line 182:             if len(out) == 1:
Add a comment "No devices found" here please.
Line 183:                 return res
Line 184:             else:
Line 185:                 raise
Line 186:

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1: I would prefer that you didn't submit this

marking -1 for unanswered question and request.

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Yeela Kaplan has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 1: (2 inline comments)

....................................................
File vdsm/storage/devicemapper.py
Line 178:     for statusLine in out:
Line 179:         try:
Line 180:             devName, statusLine = statusLine.split(":", 1)
Line 181:         except ValueError:
Line 182:             if len(out) == 1:
Done
Line 183:                 return res
Line 184:             else:
Line 185:                 raise
Line 186:

Line 179:         try:
Line 180:             devName, statusLine = statusLine.split(":", 1)
Line 181:         except ValueError:
Line 182:             if len(out) == 1:
Line 183:                 return res
No devices found will be handled with the: 
'if len(out) == 1' - it will return an empty list.
Otherwise, we have an exception that won't be caught cause we have an output from 'dmsetup status' that is not in the standard format and we don't know how to handle it.
Line 184:             else:
Line 185:                 raise
Line 186: 
Line 187:         for m in PATH_STATUS_RE.finditer(statusLine):

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/363/ (2/2)

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/397/ (1/2)

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Yeela Kaplan has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 2: Verified

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/363/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/397/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Shu Ming has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 2: I would prefer that you didn't submit this

(1 inline comment)

....................................................
File vdsm/storage/devicemapper.py
Line 184:                 return an empty list when status output is: No devices found
Line 185:                 """
Line 186:                 return res
Line 187:             else:
Line 188:                 raise
Why not return the same Exception as the above?

raise Exception("Could not get device statuses")
Line 189: 
Line 190:         for m in PATH_STATUS_RE.finditer(statusLine):
Line 191:             devNum, status = m.groups()
Line 192:             physdevName = findDev(*[int(i) for i in devNum.split(":")])

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Yeela Kaplan has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 2: (1 inline comment)

....................................................
File vdsm/storage/devicemapper.py
Line 184:                 return an empty list when status output is: No devices found
Line 185:                 """
Line 186:                 return res
Line 187:             else:
Line 188:                 raise
This is a different case.
When the rc!=0 'dmsetup status' failed, not vdsm.
When there's a ValueError we want to see in the log exactly what happened in the parsing of the output and what caused vdsm to fail, we don't want a general exception.
and generally: we did get the device statuses, we just weren't able to parse them.
Line 189: 
Line 190:         for m in PATH_STATUS_RE.finditer(statusLine):
Line 191:             devNum, status = m.groups()
Line 192:             physdevName = findDev(*[int(i) for i in devNum.split(":")])

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 3:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/367/ (2/2)

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 3:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/401/ (1/2)

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 3:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/367/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/401/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Ayal Baron has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 3: Looks good to me, approved

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

Yeela Kaplan has posted comments on this change.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Patch Set 3: Verified

Verified for negative and positive flow.

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Take care of 'No devices found' when calling dmsetup status
......................................................................

Take care of 'No devices found' when calling dmsetup status

When there are no devices dmsetup status
will return only: 'No devices found'

Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=881947
Signed-off-by: Yeela Kaplan 
---
M vdsm/storage/devicemapper.py
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Ayal Baron: Looks good to me, approved
  Yeela Kaplan: Verified
  Dan Kenigsberg:

--
To view, visit http://gerrit.ovirt.org/10035
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eduardo 
Gerrit-Reviewer: Federico Simoncelli 
Gerrit-Reviewer: Shu Ming 
Gerrit-Reviewer: Yeela Kaplan 
Gerrit-Reviewer: oVirt Jenkins CI Server