Commit Graph

28 Commits

Author SHA1 Message Date
Sage Weil
2ae297ccb8 ceph-disk: ignore udevadm settle return code
If we time out, just continue and let the next step fail.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-27 16:30:48 -07:00
Sage Weil
b8160018bd Merge pull request #144 from dalgaaf/wip-da-ceph-disk
Fix some issues in ceph-dsk

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-26 12:06:41 -07:00
Gary Lowell
9eda8e5d5a ceph-disk: udevadm settle before partprobe
After changing the partition table, allow the udev event to be
processed before calling partprobe.  This helps prevent partprobe
from getting a resource busy error on some platforms.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-26 11:31:16 -07:00
Danny Al-Gaaf
b7d7e6894c ceph-disk: rename some local variabels in list_*partitions
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 17:45:32 +01:00
Danny Al-Gaaf
0b5fcfffe6 ceph-disk: fix naming of a local variable in find_cluster_by_uuid
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 16:24:00 +01:00
Danny Al-Gaaf
8a999ded08 ceph-disk: rename some constants to upper case variable names
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 16:18:17 +01:00
Danny Al-Gaaf
86e55f5448 ceph-disk: add some more docstrings
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 16:15:29 +01:00
Danny Al-Gaaf
543327b1f2 ceph-disk: print subprocess.CalledProcessError on error
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 14:36:41 +01:00
Danny Al-Gaaf
2d26bcc071 ceph-disk: fix indention
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 13:55:56 +01:00
Sage Weil
6d63752c8f ceph-disk: re-add python 2.7 dependency comment
FIXME!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 10:09:55 -07:00
Danny Al-Gaaf
87691dc46e ceph-disk: cast output of subprocess.Popen() to str()
Cast output of subprocess.Popen() to str() to be able to use
str.split() and str.splitlines() without warnings from pylint.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 14:36:58 +01:00
Danny Al-Gaaf
3575feb7d2 ceph-disk: fix adjust_symlink() replace 'journal' with 'target'
Replace 'journal' variable with 'target' since journal doesn't
exist in this function.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 14:02:28 +01:00
Danny Al-Gaaf
a27cb85b21 ceph-disk: fix adjust_symlink() replace 'canonical' with 'path'
Replace 'canonical' variable with 'path' since canonical doesn't
exist in this function.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 14:01:02 +01:00
Danny Al-Gaaf
6d3247b5c0 ceph-disk: there is no os.path.lstat use os.lstat
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 13:56:23 +01:00
Danny Al-Gaaf
97b4f8d66b ceph-disk: remove unused variable key from prepare_journal_dev()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 13:30:21 +01:00
Danny Al-Gaaf
9daf6cfce2 ceph-disk: fix except to catch OSError
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 13:27:27 +01:00
Danny Al-Gaaf
0ada43f79d ceph-disk: add missing space after >> operator
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 13:15:36 +01:00
Danny Al-Gaaf
d3c60dc8ca fix: Redefining name 'uuid' from outer scope (line 14)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 12:33:09 +01:00
Danny Al-Gaaf
6a8120d4b0 ceph-disk: remove unused variables from list_partitions()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 12:17:45 +01:00
Danny Al-Gaaf
3af7a1ac5b ceph-disk: fix /dev/dm-[0-9] handling list_all_partitions()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-20 12:10:22 +01:00
Danny Al-Gaaf
9bcf5b64f4 ceph-disk: rename local variable shadowing builtin
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-19 22:07:36 +01:00
Danny Al-Gaaf
4adf088107 ceph-disk: remove twice defined identical function unmount
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-19 22:05:23 +01:00
Danny Al-Gaaf
ea26ea0d81 ceph-disk: remove twice defined function mount
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-19 22:02:49 +01:00
Danny Al-Gaaf
c57daa3c6e ceph-disk: remove double defined function get_conf
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-19 22:00:41 +01:00
Danny Al-Gaaf
57dde5c8b1 ceph-disk: rename local variable shadowing builtin
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-19 21:51:54 +01:00
Sage Weil
f287c6f90a ceph-disk: simplify command dispatch
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-19 12:52:23 -07:00
Sage Weil
a019753bd3 ceph-disk: consolidate exceptions
Use a single exception type, and catch it at the top level.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-19 12:52:23 -07:00
Sage Weil
20e4ba5ceb ceph-disk: consolidate ceph-disk-* into a single binary
ceph-disk prepare ...
 ceph-disk activate ...
 ceph-disk ...

This let's us share code (we were already duplicating a bunch of stuff!)
and to add new commands easily.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-19 12:52:23 -07:00