Change in vdsm[master]: vdsm: vdsm_hooks replace/remove too generic except handlers

vfeenstr at redhat.com vfeenstr at redhat.com
Wed Aug 7 10:07:04 UTC 2013


Vinzenz Feenstra has uploaded a new change for review.

Change subject: vdsm: vdsm_hooks replace/remove too generic except handlers
......................................................................

vdsm: vdsm_hooks replace/remove too generic except handlers

Change-Id: I64d51a8b1150f2dd4f9e7711926e5406228c8355
Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>
---
M vdsm_hooks/checkimages/before_vm_start.py
M vdsm_hooks/directlun/after_vm_destroy.py
M vdsm_hooks/directlun/before_vm_migrate_destination.py
M vdsm_hooks/directlun/before_vm_start.py
M vdsm_hooks/fileinject/before_vm_start.py
M vdsm_hooks/floppy/before_vm_start.py
M vdsm_hooks/hostusb/after_vm_destroy.py
M vdsm_hooks/hostusb/before_vm_start.py
M vdsm_hooks/hugepages/after_vm_destroy.py
M vdsm_hooks/hugepages/before_vm_migrate_destination.py
M vdsm_hooks/hugepages/before_vm_start.py
M vdsm_hooks/isolatedprivatevlan/before_vm_start.py
M vdsm_hooks/numa/before_vm_start.py
M vdsm_hooks/openstacknet/after_device_create.py
M vdsm_hooks/openstacknet/before_device_create.py
M vdsm_hooks/pincpu/before_vm_start.py
M vdsm_hooks/promisc/after_vm_start.py
M vdsm_hooks/promisc/before_vm_destroy.py
M vdsm_hooks/qemucmdline/before_vm_start.py
M vdsm_hooks/qos/before_vm_start.py
M vdsm_hooks/scratchpad/after_vm_destroy.py
M vdsm_hooks/scratchpad/before_vm_start.py
M vdsm_hooks/smbios/before_vm_start.py
M vdsm_hooks/sriov/after_vm_destroy.py
M vdsm_hooks/sriov/before_vm_start.py
M vdsm_hooks/vmdisk/before_vm_start.py
M vdsm_hooks/vmfex/before_vm_migrate_destination.py
M vdsm_hooks/vmfex/before_vm_start.py
28 files changed, 28 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/17759/1

diff --git a/vdsm_hooks/checkimages/before_vm_start.py b/vdsm_hooks/checkimages/before_vm_start.py
index 0fb1d85..14f1ae5 100755
--- a/vdsm_hooks/checkimages/before_vm_start.py
+++ b/vdsm_hooks/checkimages/before_vm_start.py
@@ -133,7 +133,7 @@
                 sys.stderr.write('checkimages: Checking image %s. ' %
                                  disk_image)
                 checkImage(disk_image, image_timeout)
-    except:
+    except Exception:
         sys.stderr.write('checkimages [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/directlun/after_vm_destroy.py b/vdsm_hooks/directlun/after_vm_destroy.py
index ce51469..d3a0056 100755
--- a/vdsm_hooks/directlun/after_vm_destroy.py
+++ b/vdsm_hooks/directlun/after_vm_destroy.py
@@ -42,7 +42,7 @@
             removeDeviceNode(devpath)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('directlun after_vm_destroy: [unexpected error]: '
                          '%s\n' % traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/directlun/before_vm_migrate_destination.py b/vdsm_hooks/directlun/before_vm_migrate_destination.py
index b80e60d..1c94559 100755
--- a/vdsm_hooks/directlun/before_vm_migrate_destination.py
+++ b/vdsm_hooks/directlun/before_vm_migrate_destination.py
@@ -99,7 +99,7 @@
             cloneDeviceNode(srcpath, devpath)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('directlun before_vm_migration_destination: '
                          '[unexpected error]: %s\n' % traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/directlun/before_vm_start.py b/vdsm_hooks/directlun/before_vm_start.py
index bde62a2..f7b71fa 100755
--- a/vdsm_hooks/directlun/before_vm_start.py
+++ b/vdsm_hooks/directlun/before_vm_start.py
@@ -161,7 +161,7 @@
             devices.appendChild(diskdev)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('directlun: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/fileinject/before_vm_start.py b/vdsm_hooks/fileinject/before_vm_start.py
index 0f571e8..19beab4 100755
--- a/vdsm_hooks/fileinject/before_vm_start.py
+++ b/vdsm_hooks/fileinject/before_vm_start.py
@@ -114,7 +114,7 @@
                                  'path not exists: %s\n' %
                                  os.path.dirname(filepath))
             sys.exit(2)
-    except:
+    except Exception:
         sys.stderr.write('fileinject: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/floppy/before_vm_start.py b/vdsm_hooks/floppy/before_vm_start.py
index 7616ac6..e2846ed 100755
--- a/vdsm_hooks/floppy/before_vm_start.py
+++ b/vdsm_hooks/floppy/before_vm_start.py
@@ -50,7 +50,7 @@
 
         hooking.write_domxml(domxml)
 
-    except:
+    except Exception:
         sys.stderr.write('floppy: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/hostusb/after_vm_destroy.py b/vdsm_hooks/hostusb/after_vm_destroy.py
index 8c18a53..7ccc516 100755
--- a/vdsm_hooks/hostusb/after_vm_destroy.py
+++ b/vdsm_hooks/hostusb/after_vm_destroy.py
@@ -84,7 +84,7 @@
                 sys.exit(2)
             chown(vendorid, productid)
 
-    except:
+    except Exception:
         sys.stderr.write('hostusb after_vm_destroy: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/hostusb/before_vm_start.py b/vdsm_hooks/hostusb/before_vm_start.py
index 266df60..16c6e23 100755
--- a/vdsm_hooks/hostusb/before_vm_start.py
+++ b/vdsm_hooks/hostusb/before_vm_start.py
@@ -132,7 +132,7 @@
             chown(vendorid, productid)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('hostusb: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/hugepages/after_vm_destroy.py b/vdsm_hooks/hugepages/after_vm_destroy.py
index 2fb5e85..61584ff 100755
--- a/vdsm_hooks/hugepages/after_vm_destroy.py
+++ b/vdsm_hooks/hugepages/after_vm_destroy.py
@@ -22,7 +22,7 @@
         pages = int(os.environ.get('hugepages'))
 
         removeSysHugepages(pages)
-    except:
+    except Exception:
         sys.stderr.write('hugepages: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/hugepages/before_vm_migrate_destination.py b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
index d076398..69bb55d 100755
--- a/vdsm_hooks/hugepages/before_vm_migrate_destination.py
+++ b/vdsm_hooks/hugepages/before_vm_migrate_destination.py
@@ -51,7 +51,7 @@
         pages = int(os.environ.get('hugepages'))
 
         addSysHugepages(pages)
-    except:
+    except Exception:
         sys.stderr.write('hugepages before_vm_migraton_destination: '
                          '[unexpected error]: %s\n' % traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/hugepages/before_vm_start.py b/vdsm_hooks/hugepages/before_vm_start.py
index cddf475..1b6c166 100755
--- a/vdsm_hooks/hugepages/before_vm_start.py
+++ b/vdsm_hooks/hugepages/before_vm_start.py
@@ -98,7 +98,7 @@
         sys.stderr.write('hugepages: adding hugepages tag\n')
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('hugepages: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
index 6f839ed..4ab08c7 100755
--- a/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
+++ b/vdsm_hooks/isolatedprivatevlan/before_vm_start.py
@@ -45,7 +45,7 @@
 
         hooking.write_domxml(domxml)
 
-    except:
+    except Exception:
         sys.stderr.write('isolated-privatevlan: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/numa/before_vm_start.py b/vdsm_hooks/numa/before_vm_start.py
index cefdb6f..84c8a48 100755
--- a/vdsm_hooks/numa/before_vm_start.py
+++ b/vdsm_hooks/numa/before_vm_start.py
@@ -47,7 +47,7 @@
         else:
             sys.stderr.write('numa: numa already exists in domain xml')
             sys.exit(2)
-    except:
+    except Exception:
         sys.stderr.write('numa: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/openstacknet/after_device_create.py b/vdsm_hooks/openstacknet/after_device_create.py
index e90d759..df3bdce 100755
--- a/vdsm_hooks/openstacknet/after_device_create.py
+++ b/vdsm_hooks/openstacknet/after_device_create.py
@@ -63,6 +63,6 @@
 if __name__ == '__main__':
     try:
         main()
-    except:
+    except Exception:
         hooking.exit_hook('openstacknet hook: [unexpected error]: %s\n' %
                           traceback.format_exc())
diff --git a/vdsm_hooks/openstacknet/before_device_create.py b/vdsm_hooks/openstacknet/before_device_create.py
index 6a9e6d1..dc56073 100755
--- a/vdsm_hooks/openstacknet/before_device_create.py
+++ b/vdsm_hooks/openstacknet/before_device_create.py
@@ -129,6 +129,6 @@
             test(useOvs)
         else:
             main()
-    except:
+    except Exception:
         hooking.exit_hook('openstacknet hook: [unexpected error]: %s\n' %
                           traceback.format_exc())
diff --git a/vdsm_hooks/pincpu/before_vm_start.py b/vdsm_hooks/pincpu/before_vm_start.py
index 6ea4528..2a72795 100755
--- a/vdsm_hooks/pincpu/before_vm_start.py
+++ b/vdsm_hooks/pincpu/before_vm_start.py
@@ -28,7 +28,7 @@
         else:
             sys.stderr.write('pincpu: cpuset attribute is present in vcpu, '
                              'doing nothing\n')
-    except:
+    except Exception:
         sys.stderr.write('pincpu: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/promisc/after_vm_start.py b/vdsm_hooks/promisc/after_vm_start.py
index 30f04eb..fbf4097 100755
--- a/vdsm_hooks/promisc/after_vm_start.py
+++ b/vdsm_hooks/promisc/after_vm_start.py
@@ -126,7 +126,7 @@
                     #the vm interface
                         captureNetwork(ifaceName, network, mode)
 
-    except:
+    except Exception:
         sys.stderr.write('promisc: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/promisc/before_vm_destroy.py b/vdsm_hooks/promisc/before_vm_destroy.py
index d041c19..c9075ba 100755
--- a/vdsm_hooks/promisc/before_vm_destroy.py
+++ b/vdsm_hooks/promisc/before_vm_destroy.py
@@ -44,7 +44,7 @@
                              'mode %s\n' % (network, mode))
             removeMirrorNetwork(network)
 
-    except:
+    except Exception:
         sys.stderr.write('promisc: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/qemucmdline/before_vm_start.py b/vdsm_hooks/qemucmdline/before_vm_start.py
index b3b9214..74fb829 100755
--- a/vdsm_hooks/qemucmdline/before_vm_start.py
+++ b/vdsm_hooks/qemucmdline/before_vm_start.py
@@ -74,7 +74,7 @@
         injectQemuCmdLine(domxml, qemu_cmdline)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('qemu_cmdline: [unexpected error]: %s\n'
                          % traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/qos/before_vm_start.py b/vdsm_hooks/qos/before_vm_start.py
index 7cdf46f..0eac730 100755
--- a/vdsm_hooks/qos/before_vm_start.py
+++ b/vdsm_hooks/qos/before_vm_start.py
@@ -87,7 +87,7 @@
             update_interface(iface, arr[1], domxml)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('qos hook: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/scratchpad/after_vm_destroy.py b/vdsm_hooks/scratchpad/after_vm_destroy.py
index 474bff5..fb392d9 100755
--- a/vdsm_hooks/scratchpad/after_vm_destroy.py
+++ b/vdsm_hooks/scratchpad/after_vm_destroy.py
@@ -15,7 +15,7 @@
             else:
                 sys.stderr.write('scratchpad after_vm_destroy: '
                                  'cannot find image file %s\n' % arr[1])
-    except:
+    except Exception:
         sys.stderr.write('scratchpad after_vm_destroy: '
                          '[unexpected error]: %s\n' % traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/scratchpad/before_vm_start.py b/vdsm_hooks/scratchpad/before_vm_start.py
index 2f2fe3f..47dc0e0 100755
--- a/vdsm_hooks/scratchpad/before_vm_start.py
+++ b/vdsm_hooks/scratchpad/before_vm_start.py
@@ -129,7 +129,7 @@
 
         hooking.write_domxml(domxml)
 
-    except:
+    except Exception:
         sys.stderr.write('scratchpad: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/smbios/before_vm_start.py b/vdsm_hooks/smbios/before_vm_start.py
index 55635a9..26d68c0 100755
--- a/vdsm_hooks/smbios/before_vm_start.py
+++ b/vdsm_hooks/smbios/before_vm_start.py
@@ -102,7 +102,7 @@
 
         hooking.write_domxml(domxml)
 
-    except:
+    except Exception:
         sys.stderr.write('smbios: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/sriov/after_vm_destroy.py b/vdsm_hooks/sriov/after_vm_destroy.py
index e82dab0..6cf5120 100755
--- a/vdsm_hooks/sriov/after_vm_destroy.py
+++ b/vdsm_hooks/sriov/after_vm_destroy.py
@@ -35,7 +35,7 @@
                                  'virtual function reservation file of %s'
                                  'that should be at %s\n' % (nic, vfFilePath))
 
-    except:
+    except Exception:
         sys.stderr.write('sriov after_vm_destroy: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/sriov/before_vm_start.py b/vdsm_hooks/sriov/before_vm_start.py
index c23797b..41d7df3 100755
--- a/vdsm_hooks/sriov/before_vm_start.py
+++ b/vdsm_hooks/sriov/before_vm_start.py
@@ -154,7 +154,7 @@
                 sys.exit(2)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('sriov: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/vmdisk/before_vm_start.py b/vdsm_hooks/vmdisk/before_vm_start.py
index 0d3ee0a..8ff0f3d 100755
--- a/vdsm_hooks/vmdisk/before_vm_start.py
+++ b/vdsm_hooks/vmdisk/before_vm_start.py
@@ -90,7 +90,7 @@
             devices.appendChild(diskdev)
 
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('vmdisk: [unexpected error]: %s\n' %
                          traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/vmfex/before_vm_migrate_destination.py b/vdsm_hooks/vmfex/before_vm_migrate_destination.py
index 9ea7c28..0315bb7 100755
--- a/vdsm_hooks/vmfex/before_vm_migrate_destination.py
+++ b/vdsm_hooks/vmfex/before_vm_migrate_destination.py
@@ -133,6 +133,6 @@
         conn = libvirtconnection.get()
         handleDirectPool(conn)
 
-    except:
+    except Exception:
         sys.stderr.write('vmfex: ERROR: %s\n' % traceback.format_exc())
         sys.exit(2)
diff --git a/vdsm_hooks/vmfex/before_vm_start.py b/vdsm_hooks/vmfex/before_vm_start.py
index 0e98419..b050626 100755
--- a/vdsm_hooks/vmfex/before_vm_start.py
+++ b/vdsm_hooks/vmfex/before_vm_start.py
@@ -193,6 +193,6 @@
                 parameters.setAttribute('profileid', profile)
                 virtualport.appendChild(parameters)
         hooking.write_domxml(domxml)
-    except:
+    except Exception:
         sys.stderr.write('vmfex: ERROR %s\n' % traceback.format_exc())
         sys.exit(2)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64d51a8b1150f2dd4f9e7711926e5406228c8355
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr at redhat.com>


More information about the vdsm-patches mailing list