summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* rgw: iterate usage entries from correct entrywip-5152Yehuda Sadeh2013-05-221-3/+16
| | | | | | | | | | | | Fixes: #5152 When iterating through usage entries, and when user id was provided, we started at the user's first entry and not from the entry indexed by the request start time. This commit fixes the issue. Backport: bobtail Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
* mon: be a bit more verbose about osd mark down eventsSage Weil2013-05-221-0/+1
| | | | | | | | Put these in the cluster log; they are interesting. This is a backport of 87767fb1fb9a52d11b11f0b641cebbd9998f089e. Signed-off-by: Sage Weil <sage@inktank.com>
* rgw: protect ops log socket formatterYehuda Sadeh2013-05-212-1/+4
| | | | | | | | | Fixes: #4905 Ops log (through the unix domain socket) uses a formatter, which wasn't protected. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> (cherry picked from commit d48f1edb07a4d8727ac956f70e663c1b4e33e1dd)
* librbd: make image creation defaults configurableJosh Durgin2013-05-165-8/+142
| | | | | | | | | | | | | | | Programs using older versions of the image creation functions can't set newer parameters like image format and fancier striping. Setting these options lets them use all the new functionality without being patched and recompiled to use e.g. rbd_create3(). This is particularly useful for things like qemu-img, which does not know how to create format 2 images yet. Refs: #5067 backport: cuttlefish, bobtail Signed-off-by: Josh Durgin <josh.durgin@inktank.com> (cherry picked from commit aacc9adc4e9ca90bbe73ac153cc754a3a5b2c0a1)
* rbd.py: fix stripe_unit() and stripe_count()Josh Durgin2013-05-161-0/+20
| | | | | | | | | These matched older versions of the functions, but would segfault using the current versions. backport: cuttlefish, bobtail Signed-off-by: Josh Durgin <josh.durgin@inktank.com> (cherry picked from commit 53ee6f965e8f06c7256848210ad3c4f89d0cb5a0)
* cls_rbd: make sure stripe_unit is not larger than object sizeJosh Durgin2013-05-162-2/+12
| | | | | | | | Test a few other cases too. backport: cuttlefish, bobtail Signed-off-by: Josh Durgin <josh.durgin@inktank.com> (cherry picked from commit 810306a2a76eec1c232fd28ec9c351e827fa3031)
* mon: fix validatation of mds ids in mon commandsSage Weil2013-05-142-14/+40
| | | | | | | | | | Fixes: #4996 Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 5c305d63043762027323052b4bb3ae3063665c6f) Conflicts: src/mon/MDSMonitor.cc
* v0.56.6v0.56.6Gary Lowell2013-05-032-1/+7
|
* ceph.spec.in: Fix platform dependeciesGary Lowell2013-05-031-5/+0
| | | | | | Picked up an incorrect dependency merging the rbd udev rules update. Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
* rgw: don't send tail to gc if copying object to itselfYehuda Sadeh2013-05-032-2/+6
| | | | | | | | | | | Fixes: #4776 Backport: bobtail Need to make sure that when copying an object into itself we don't send the tail to the garbage collection. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Greg Farnum <greg@inktank.com> (cherry picked from commit de5d1da810732ee48f41e8be18257053d862301b)
* ceph_common.sh: re-sync get_name_list with masterSage Weil2013-05-031-9/+9
| | | | | | We backported various items but didn't catch all the changes! :( Signed-off-by: Sage Weil <sage@inktank.com>
* v0.56.5v0.56.5Gary Lowell2013-05-022-1/+7
|
* ceph.spec.in: fix udev rules.d files handlingDanny Al-Gaaf2013-05-021-2/+5
| | | | | | | | Move 50-rbd.rules into the ceph base package since the related ceph-rbdnamer binary is part of this package. Use correct install pattern. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
* debian: only start/stop upstart jobs if upstart is presentSage Weil2013-05-024-3/+45
| | | | | | | | | | This avoids errors on non-upstart distros (like wheezy). Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 030bf8aaa15837f898e453161eeaf1d52fc5779d) Conflicts: debian/ceph-mds.postinst
* debian: stop ceph-mds before uninstalling ceph-mdsSage Weil2013-05-021-0/+5
| | | | | | Fixes: #4384 Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 9eb0d91b867ab980135d7c6ff6347d69d0a8a794)
* Makefile.am: Add -lpthread to fix build on newer ld in Raring RingtailDan Mick2013-05-011-4/+4
| | | | | | | | | Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> (cherry picked from commit 98f532e8000af281fa03b24da9ad2fda81755270) Conflicts: src/Makefile.am
* Merge remote-tracking branch 'gh/bobtail-deploy' into bobtail-nextSage Weil2013-05-0117-1144/+2056
|\
| * Fix journal partition creationAlexandre Marangone2013-04-291-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With OSD sharing data and journal, the previous code created the journal partiton from the end of the device. A uint32_t is used in sgdisk to get the last sector, with large HD, uint32_t is too small. The journal partition will be created backwards from the a sector in the midlle of the disk leaving space before and after it. The data partition will use whichever of these spaces is greater. The remaining will not be used. This patch creates the journal partition from the start as a workaround. Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com> (cherry picked from commit 56619ab91732bd2eacbef388311954f4e0230a30)
| * ceph.spec.in: put ceph-disk-* et al in correct sbindirSage Weil2013-04-261-4/+4
| | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * debian: fix ceph.installSage Weil2013-04-261-4/+4
| | | | | | | | | | | | This got out of sync somewhere in cherry-picking all of these patches. Signed-off-by: Sage Weil <sage@inktank.com>
| * Makefile.am: install ceph-* python scripts to /usr/bin directlyDanny Al-Gaaf2013-04-261-2/+7
| | | | | | | | | | | | | | | | | | Install ceph-* scripts directly to $(prefix)$(sbindir) (which normaly would be /usr/sbin) instead of moving it around after installation in SPEC file or debian files. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 4d16f38f48e276497190c8bc03abc55c40e18eed)
| * ceph-disk: CalledProcessError has no output keyword on 2.6Gary Lowell2013-04-261-2/+4
| | | | | | | | | | Signed-off-by: Gary Lowell <gary.lowell@inktank.com> (cherry picked from commit a793853850ee135de14b9237f7023cadcdb8575c)
| * ceph-disk: fix some (local) variable namesDanny Al-Gaaf2013-04-261-36/+37
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit c4eb7e6ddd593cd45ab8343da01355be7382723e)
| * ceph-disk: fix naming of local variable in is_mounted()Danny Al-Gaaf2013-04-261-4/+4
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 3dd8b461219e64bb0f7a210dba5a9ab7c644f014)
| * ceph-disk: merge twice defined function is_mounted(dev)Danny Al-Gaaf2013-04-261-21/+11
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit eaf31bf9f90ba9709a57a6870dbafa21142dae2c)
| * ceph-disk: define exception typeDanny Al-Gaaf2013-04-261-2/+2
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 4c6d6442a89adc5b56e99cb4d2ed572f2ad192c9)
| * ceph-disk: fix Redefining name 'uuid' from outer scopeDanny Al-Gaaf2013-04-261-6/+6
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 058eb923c5b7dab611901fdd1724ce2a7c180827)
| * ceph-disk: add missing space after commaDanny Al-Gaaf2013-04-261-2/+2
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 0080d1df7c7950e051840a543fc4bdabe6cc53e5)
| * ceph-disk list: say 'unknown cluster $UUID' when cluster is unknownSage Weil2013-04-261-0/+2
| | | | | | | | | | | | | | This makes it clearer that an old osd is in fact old. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit e9b3f2e6e93426d631d4f8101fb431a523b0d88a)
| * ceph-disk: handle missing journal_uuid field gracefullySage Weil2013-04-261-5/+7
| | | | | | | | | | | | | | Only lower if we know it's not None. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 562e1716bd4b5372716e502a5e4dd872d381bfb7)
| * ceph-disk: implement 'list'Sage Weil2013-04-261-9/+178
| | | | | | | | | | | | | | | | | | | | | | | | This is based on Sandon's initial patch, but much-modified. Mounts ceph data volumes temporarily to see what is inside. Attempts to associated journals with osds. Resolves: #3120 Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Dan Mick <dan.mick@inktank.com> (cherry picked from commit 6a65b9131c444041d16b880c6a7f332776063a78)
| * ceph-disk: reimplement list_all_partitionsSage Weil2013-04-261-18/+15
| | | | | | | | | | | | | | | | Use /dev/disk/by-id to list disks and their partitions. This is more accurate and correct than the previous (as-yet unused) implementation. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit d3e49047ff405573aa41f45864cf315be23f5c50)
| * ceph-disk: reimplement is_partitionSage Weil2013-04-261-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Previously we were assuming any device that ended in a digit was a partition, but this is not at all correct (e.g., /dev/sr0, /dev/rbd1). Instead, look in /dev/disk/by-id and see if there is a symlink that ends in -partNN that links to our device. There is probably still a better way... Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 20d594a889d62110ad03b761d8703f79f8eea6ad)
| * ceph-disk: conditionally remove mount pathSage Weil2013-04-261-2/+3
| | | | | | | | | | | | | | umount removes it on success; only remove it here if it is still there. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 4362934a94c5a6f7521f06aa1255e111094e1d88)
| * ceph-disk: ignore udevadm settle return codeSage Weil2013-04-261-3/+3
| | | | | | | | | | | | | | If we time out, just continue and let the next step fail. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 2ae297ccb812c00204ec0c4dc614821c506062b9)
| * ceph-disk: rename some local variabels in list_*partitionsDanny Al-Gaaf2013-04-261-14/+14
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit b7d7e6894c550a7afa8dfb5bfa2bc54b5d331178)
| * ceph-disk: fix naming of a local variable in find_cluster_by_uuidDanny Al-Gaaf2013-04-261-3/+3
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 0b5fcfffe6d2f69bd4318cc93ef73195d948b9c5)
| * ceph-disk: rename some constants to upper case variable namesDanny Al-Gaaf2013-04-261-41/+41
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 8a999ded088e688fd3f4a7c27127b7c06f0b2f66)
| * ceph-disk: add some more docstringsDanny Al-Gaaf2013-04-261-1/+64
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 86e55f5448c4b5b46b74d2d89b01d1e64b1ea826)
| * ceph-disk: print subprocess.CalledProcessError on errorDanny Al-Gaaf2013-04-261-3/+3
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 543327b1f2a9efe8083bb196433c4bcf83883269)
| * ceph-disk: fix indentionDanny Al-Gaaf2013-04-261-1/+1
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 2d26bcc07162a5176cdbc1748b829e3f39653697)
| * ceph-disk: udevadm settle before partprobeGary Lowell2013-04-261-0/+24
| | | | | | | | | | | | | | | | | | 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> (cherry picked from commit 9eda8e5d5abf0743a2ad484806cfb2018243515f)
| * ceph-disk: re-add python 2.7 dependency commentSage Weil2013-04-261-0/+1
| | | | | | | | | | | | | | FIXME! Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 6d63752c8fde91cdab306d1ca689690b269fe977)
| * ceph-disk: cast output of subprocess.Popen() to str()Danny Al-Gaaf2013-04-261-3/+3
| | | | | | | | | | | | | | | | 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> (cherry picked from commit 87691dc46edfba11c370592dbb533772190be4b2)
| * ceph-disk: fix adjust_symlink() replace 'journal' with 'target'Danny Al-Gaaf2013-04-261-1/+1
| | | | | | | | | | | | | | | | Replace 'journal' variable with 'target' since journal doesn't exist in this function. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 3575feb7d2e5f4e35c5df193a1f8c9f08f88fcf4)
| * ceph-disk: fix adjust_symlink() replace 'canonical' with 'path'Danny Al-Gaaf2013-04-261-7/+7
| | | | | | | | | | | | | | | | Replace 'canonical' variable with 'path' since canonical doesn't exist in this function. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit a27cb85b21610b4a9f8eb24f8f6cd04902349728)
| * ceph-disk: there is no os.path.lstat use os.lstatDanny Al-Gaaf2013-04-261-1/+1
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 6d3247b5c02c39a66666a5833106dbc23044e436)
| * ceph-disk: remove unused variable key from prepare_journal_dev()Danny Al-Gaaf2013-04-261-1/+0
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 97b4f8d66bef2328fa53f9e508eb38f8b8d49632)
| * ceph-disk: fix except to catch OSErrorDanny Al-Gaaf2013-04-261-3/+3
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 9daf6cfce2d57509d896eae28bb97146a682a306)
| * ceph-disk: add missing space after >> operatorDanny Al-Gaaf2013-04-261-1/+1
| | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 0ada43f79d2b1f9f84367e558c6d1a3e90e5c9b2)
View Lorry Controller Status