Remove previous mdadm bug 523334 workaorund

Since we are no longer stopping / re-starting mdraid container arrays, we
no longer need the workaround for the mdadm --stop on containers bug
in the MDRaidArrayDevice teardown method.

1 files changed, 1 insertions, 12 deletions

diff --git a/storage/devices.py b/storage/devices.py
index 28e031c87..bc8951f90 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -2527,18 +2527,7 @@ class MDRaidArrayDevice(StorageDevice):
         # file exists, we want to deactivate it. mdraid has too many
         # states.
         if self.exists and os.path.exists(self.path):
-            try:
-                mdraid.mddeactivate(self.path)
-            except MDRaidError:
-                # Sometimes mdadm --stop reports failure, but the array stops
-                # after a while never the less, this happens with container
-                # members, see bug rh523334
-                if self.devices[0].type == "mdcontainer":
-                    time.sleep(1)
-                    if self.status:
-                        raise
-                else:
-                    raise
+            mdraid.mddeactivate(self.path)
 
         if recursive:
             self.teardownParents(recursive=recursive)