Clean up handling of OSD dump command

node-daemon/pvcd/CephInstance.py

@@ -213,6 +213,7 @@ def remove_osd(zk_conn, logger, osd_id, osd_obj):
         logger.out('Flushing OSD disk with ID {}'.format(osd_id), state='i')
         osd_string = str()
         while True:
+            try:
                 retcode, stdout, stderr = common.run_os_command('ceph pg dump osds --format json')
                 dump_string = json.loads(stdout)
                 for osd in dump_string:
@@ -222,6 +223,8 @@ def remove_osd(zk_conn, logger, osd_id, osd_obj):
                 if num_pgs > 0:
                    time.sleep(5)
                 else:
+                   raise
+            except:
                 break
 
         # 3. Stop the OSD process and wait for it to be terminated