Change in vdsm[master]: asyncproc: Return None when no data could be read

Saggi Mizrahi has uploaded a new change for review.

Change subject: asyncproc: Return None when no data could be read
......................................................................

asyncproc: Return None when no data could be read

According to http://docs.python.org/2/library/io.html#io.RawIOBase
we need to return None when a non-blocking call couldn't produce any
data and not an empty strings.

Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
---
M lib/vdsm/utils.py
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/22265/1

diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py
index 6bed6c5..2758f22 100644
--- a/lib/vdsm/utils.py
+++ b/lib/vdsm/utils.py
@@ -340,10 +340,16 @@
                 if self._stream.pos == self._stream.len:
                     self._stream.truncate(0)
 
-            return res
+            if res == "" and not self._streamClosed:
+                return None
+            else:
+                return res
 
         def readinto(self, b):
             data = self.read(len(b))
+            if data is None:
+                return None
+
             bytesRead = len(data)
             b[:bytesRead] = data
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Antoni Segura Puimedon has posted comments on this change.

Change subject: asyncproc: Return None when no data could be read
......................................................................


Patch Set 2: Verified+1

Verified the tip of the branch.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Yaniv Bronhaim has posted comments on this change.

Change subject: asyncproc: Return None when no data could be read
......................................................................


Patch Set 2: Code-Review+1

uts?

When I'll add more spare time I add myself. but if you want to push it faster please
take care of testing the ret val of read

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Antoni Segura Puimedon has posted comments on this change.

Change subject: asyncproc: Return None when no data could be read
......................................................................


Patch Set 2: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: asyncproc: Return None when no data could be read
......................................................................


Patch Set 2:

Build Successful 

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5227/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6115/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: asyncproc: Return None when no data could be read
......................................................................


asyncproc: Return None when no data could be read

According to http://docs.python.org/2/library/io.html#io.RawIOBase
we need to return None when a non-blocking call couldn't produce any
data and not an empty strings.

Originally we returned an empty string and that confuses other IO
subsystems in python which assume this behaviour is correct.

Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/22265
Reviewed-by: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
Reviewed-by: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Tested-by: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
---
M lib/vdsm/utils.py
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Antoni Segura Puimedon: Verified; Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: asyncproc: Return None when no data could be read
......................................................................


Patch Set 2: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: asyncproc: Return None when no data could be read
......................................................................


Patch Set 1:

Build Successful 

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

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/5224/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/6112/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I6329a8651c936789169bd35f26f69580958ef2cd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No