Change in vdsm[master]: vdsm: Remove unreachable code

mbetak at redhat.com mbetak at redhat.com
Tue Feb 2 11:25:56 UTC 2016


Martin Betak has uploaded a new change for review.

Change subject: vdsm: Remove unreachable code
......................................................................

vdsm: Remove unreachable code

Change-Id: I919ca97f7b1077be2415287a43b9a9372e1fa593
Signed-off-by: Martin Betak <mbetak at redhat.com>
---
M lib/vdsm/utils.py
M tests/schemaValidationTest.py
M vdsm/API.py
M vdsm_hooks/hugepages/before_vm_migrate_destination.py
4 files changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/52980/1

diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py
index 3863d2b..13a8bc1 100644
--- a/lib/vdsm/utils.py
+++ b/lib/vdsm/utils.py
@@ -295,7 +295,6 @@
             if e.args[0] == os.errno.EINTR:
                 continue
             raise
-        break
 
 
 class CommandStream(object):
diff --git a/tests/schemaValidationTest.py b/tests/schemaValidationTest.py
index 97fcd86..601aa5a 100644
--- a/tests/schemaValidationTest.py
+++ b/tests/schemaValidationTest.py
@@ -111,7 +111,6 @@
                 except KeyError:
                     raise AssertionError('Missing method %s.%s' % (
                                          spec_class, method_name))
-                    continue
 
                 # inspect apiobj and gather args and default args
                 args = ctorArgs + self._get_args(method_obj)
diff --git a/vdsm/API.py b/vdsm/API.py
index adb20a2..d23b09d 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -256,7 +256,6 @@
                                        'message': 'Failed to create '
                                                   'sysprep floppy image. '
                                                   'No space on /tmp?'}}
-                    return errCode['createErr']
 
             if not graphics.isSupportedDisplayType(vmParams):
                 return {'status': {'code': errCode['createErr']
diff --git a/vdsm_hooks/hugepages/before_vm_migrate_destination.py b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
index af1c4af..bdcd8d9 100755
--- a/vdsm_hooks/hugepages/before_vm_migrate_destination.py
+++ b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
@@ -52,11 +52,3 @@
         sys.stderr.write('hugepages before_vm_migraton_destination: '
                          '[unexpected error]: %s\n' % traceback.format_exc())
         sys.exit(2)
-
-        # Add system hugepages
-        allocatedPages = addSysHugepages(pages)
-        if allocatedPages != pages:
-            freeSysHugepages(allocatedPages)
-            sys.stderr.write('hugepages before_vm_migraton_destination: cannot'
-                             ' allocate enough pages\n')
-            sys.exit(2)


-- 
To view, visit https://gerrit.ovirt.org/52980
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I919ca97f7b1077be2415287a43b9a9372e1fa593
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Betak <mbetak at redhat.com>


More information about the vdsm-patches mailing list