]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoKeyValueStore: fix return code of mkfs 7036/head
xiexingguo [Wed, 23 Dec 2015 14:49:59 +0000 (22:49 +0800)]
KeyValueStore: fix return code of mkfs

It shall return a negative result code instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #6988 from xiexingguo/xxg-wip-14134
David Zafman [Tue, 22 Dec 2015 18:02:37 +0000 (10:02 -0800)]
Merge pull request #6988 from xiexingguo/xxg-wip-14134

FileJournal: fix return code of create method

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #7005 from YankunLi/patch-4
Orit Wasserman [Tue, 22 Dec 2015 15:26:13 +0000 (16:26 +0100)]
Merge pull request #7005 from YankunLi/patch-4

delete default zone

9 years agoMerge pull request #7006 from YankunLi/patch-5
Orit Wasserman [Tue, 22 Dec 2015 15:18:52 +0000 (16:18 +0100)]
Merge pull request #7006 from YankunLi/patch-5

correct radosgw-admin command

9 years agoMerge pull request #6997 from zhouyuan/evict_check_range
Sage Weil [Tue, 22 Dec 2015 14:01:17 +0000 (09:01 -0500)]
Merge pull request #6997 from zhouyuan/evict_check_range

osd: cache tier: add config option for eviction check list size

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6990 from linuxbox2/master-fixes
Kefu Chai [Tue, 22 Dec 2015 13:55:07 +0000 (21:55 +0800)]
Merge pull request #6990 from linuxbox2/master-fixes

Fixes some small issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocorrect radosgw-admin command 7006/head
YankunLi [Tue, 22 Dec 2015 05:56:50 +0000 (13:56 +0800)]
correct radosgw-admin command

the command to disable users quota should be 'radosgw-admin quota disable --quota-scope=<user | bucket> --uid=<uid>'

9 years agodelete default zone 7005/head
YankunLi [Tue, 22 Dec 2015 05:46:13 +0000 (13:46 +0800)]
delete default zone

if the default zone exist, delete the default zone from both the east and west pools.

9 years agoMerge remote-tracking branch 'origin/jewel'
Josh Durgin [Tue, 22 Dec 2015 00:59:51 +0000 (16:59 -0800)]
Merge remote-tracking branch 'origin/jewel'

9 years agoMerge pull request #6926 from dachary/wip-14080-ceph-disk-udevadm
Sage Weil [Mon, 21 Dec 2015 17:58:32 +0000 (12:58 -0500)]
Merge pull request #6926 from dachary/wip-14080-ceph-disk-udevadm

ceph-disk: fix failures when preparing disks with udev > 214

On CentOS 7.1 and other operating systems with a version of udev greater or equal to 214,
running ceph-disk prepare triggered unexpected removal and addition of partitions on
the disk being prepared. That created problems ranging from the OSD not being activated
to failures because /dev/sdb1 does not exist although it should.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7002 from dillaman/wip-14092-jewel
Josh Durgin [Mon, 21 Dec 2015 15:31:57 +0000 (07:31 -0800)]
Merge pull request #7002 from dillaman/wip-14092-jewel

tests: flush op work queue prior to destroying MockImageCtx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6986 from xiexingguo/xxg-wip-14129
Jason Dillaman [Mon, 21 Dec 2015 15:29:33 +0000 (10:29 -0500)]
Merge pull request #6986 from xiexingguo/xxg-wip-14129

librbd: fix snap_exists API return code overflow

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: update test cases with the new snap_exists API 6986/head
xiexingguo [Sat, 19 Dec 2015 06:44:23 +0000 (14:44 +0800)]
test: update test cases with the new snap_exists API

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #6938 from wuxiangwei/wip-wxw-rbdfuserename
Jason Dillaman [Mon, 21 Dec 2015 14:55:08 +0000 (09:55 -0500)]
Merge pull request #6938 from wuxiangwei/wip-wxw-rbdfuserename

rbd-fuse: implement mv operation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: flush op work queue prior to destroying MockImageCtx 7002/head
Jason Dillaman [Mon, 21 Dec 2015 14:03:15 +0000 (09:03 -0500)]
tests: flush op work queue prior to destroying MockImageCtx

Fixes: #14092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoceph-disk: protect deactivate with activate lock 6926/head
Loic Dachary [Fri, 18 Dec 2015 23:53:03 +0000 (00:53 +0100)]
ceph-disk: protect deactivate with activate lock

When ceph-disk prepares the disk, it triggers udev events and each of
them ceph-disk activate. If systemctl stop ceph-osd@2 happens while
there still are ceph-disk activate in flight, the systemctl stop may be
cancelled by the systemctl enable issued by one of the pending ceph-disk
activate.

This only matters in a test environment where disks are destroyed
shortly after they are activated.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoceph-disk: use blkid instead of sgdisk -i
Loic Dachary [Fri, 18 Dec 2015 16:03:21 +0000 (17:03 +0100)]
ceph-disk: use blkid instead of sgdisk -i

sgdisk -i 1 /dev/vdb opens /dev/vdb in write mode which indirectly
triggers a BLKRRPART ioctl from udev (starting version 214 and up) when
the device is closed (see below for the udev release note). The
implementation of this ioctl by the kernel (even old kernels) removes
all partitions and adds them again (similar to what partprobe does
explicitly).

The side effects of partitions disappearing while ceph-disk is running
are devastating.

sgdisk is replaced by blkid which only opens the device in read mode and
will not trigger this unexpected behavior.

The problem does not show on Ubuntu 14.04 because it is running udev <
214 but shows on CentOS 7 which is running udev > 214.

git clone git://anonscm.debian.org/pkg-systemd/systemd.git
systemd/NEWS:
CHANGES WITH 214:

        * As an experimental feature, udev now tries to lock the
          disk device node (flock(LOCK_SH|LOCK_NB)) while it
          executes events for the disk or any of its partitions.
          Applications like partitioning programs can lock the
          disk device node (flock(LOCK_EX)) and claim temporary
          device ownership that way; udev will entirely skip all event
          handling for this disk and its partitions. If the disk
          was opened for writing, the close will trigger a partition
          table rescan in udev's "watch" facility, and if needed
          synthesize "change" events for the disk and all its partitions.
          This is now unconditionally enabled, and if it turns out to
          cause major problems, we might turn it on only for specific
          devices, or might need to disable it entirely. Device Mapper
          devices are excluded from this logic.

http://tracker.ceph.com/issues/14094 Fixes: #14094

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoceph-disk: dereference symlinks in destroy and zap
Loic Dachary [Wed, 16 Dec 2015 14:57:03 +0000 (15:57 +0100)]
ceph-disk: dereference symlinks in destroy and zap

The behavior of partprobe or sgdisk may be subtly different if given a
symbolic link to a device instead of an actual device. The debug output
is also more confusing when the symlink shows instead of the device it
points to.

Always dereference the symlink before running destroy and zap.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoceph-disk: increase partprobe / udevadm settle timeouts
Loic Dachary [Wed, 16 Dec 2015 11:33:25 +0000 (12:33 +0100)]
ceph-disk: increase partprobe / udevadm settle timeouts

The default of 120 seconds may be exceeded when the disk is very slow
which can happen in cloud environments. Increase it to 600 seconds
instead.

The partprobe command may fail for the same reason but it does not have
a timeout parameter. Instead, try a few times before failing.

The udevadm settle guarding partprobe are not necessary because
partprobe already does the same. However, partprobe does not provide a
way to control the timeout. Having a udevadm settle after another is
going to be a noop most of the time and not add any delay. It matters
when the udevadm settle run by partprobe fails with a timeout because
partprobe will silentely ignores the failure.

http://tracker.ceph.com/issues/14080 Fixes: #14080

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agotests: ceph-disk workunit increase verbosity
Loic Dachary [Wed, 16 Dec 2015 11:36:47 +0000 (12:36 +0100)]
tests: ceph-disk workunit increase verbosity

So that reading the teuthology log is enough in most cases to figure out
the cause of the error.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoceph-disk: fix typo
Loic Dachary [Wed, 16 Dec 2015 11:31:03 +0000 (12:31 +0100)]
ceph-disk: fix typo

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoceph-disk: log parted output
Loic Dachary [Wed, 16 Dec 2015 11:30:20 +0000 (12:30 +0100)]
ceph-disk: log parted output

Should parted output fail to parse, it is useful to get the full output
when running in verbose mode.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoceph-disk: do not discard stderr
Loic Dachary [Wed, 16 Dec 2015 11:29:17 +0000 (12:29 +0100)]
ceph-disk: do not discard stderr

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agocache-tier: Allow to config eviction check max size 6997/head
Yuan Zhou [Mon, 21 Dec 2015 07:30:44 +0000 (15:30 +0800)]
cache-tier: Allow to config eviction check max size

This patch adds the option for eviction check size in cache-tier.
On a busy setup, it's better to check bigger number of objects so
the eviction is faster.

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
9 years agoDispatcher.h: include assert.h 6990/head
Matt Benjamin [Sun, 20 Dec 2015 18:32:13 +0000 (13:32 -0500)]
Dispatcher.h: include assert.h

The inline ms_fast_dispatch implementation calls assert, which
puts asset.h in the interface.

The fact that many Dispatcher descendants don't implement
ms_fast_dispatch prevents making the method pure virtual--which
suggests that maybe there is a need for a FastDispatcher
interface that inherits Dispatcher and introduces ms_fast_dispatch
and related?

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoxio: avoid conversion warning w/xio_queue_depth
Matt Benjamin [Sun, 20 Dec 2015 18:14:41 +0000 (13:14 -0500)]
xio: avoid conversion warning w/xio_queue_depth

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoxio: remove static declspec on buffer::create_msg
Matt Benjamin [Sun, 20 Dec 2015 17:38:14 +0000 (12:38 -0500)]
xio: remove static declspec on buffer::create_msg

Likely an update missed from PR #6686.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoFileJournal: fix return code of create method 6988/head
xiexingguo [Sun, 20 Dec 2015 13:41:46 +0000 (21:41 +0800)]
FileJournal: fix return code of create method

Shall return negative error code instead.

Fixes: #14134
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorbd-fuse: discard space restriction for mv operation 6938/head
wuxiangwei [Sun, 20 Dec 2015 09:14:25 +0000 (04:14 -0500)]
rbd-fuse: discard space restriction for mv operation

discard space restriction for destination image name of
the mv operation.

Signed-off-by: Xiangwei Wu wuxiangwei@h3c.com
9 years agotools: replace snap_exists with a new safer version
xiexingguo [Sat, 19 Dec 2015 06:53:47 +0000 (14:53 +0800)]
tools: replace snap_exists with a new safer version

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agolibrbd: fix snap_exists API overflow issue
xiexingguo [Sun, 20 Dec 2015 08:19:59 +0000 (16:19 +0800)]
librbd: fix snap_exists API overflow issue

The original one may overflow and thus not be safe.

Fixes: #14129
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #6766 from xiexingguo/xxg-wip-cleanup
Sage Weil [Sat, 19 Dec 2015 19:02:02 +0000 (14:02 -0500)]
Merge pull request #6766 from xiexingguo/xxg-wip-cleanup

osd: fix wrongly placed assert and some cleanups

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6708 from xiaoxichen/shutdown_when_flipping
Sage Weil [Sat, 19 Dec 2015 19:01:31 +0000 (14:01 -0500)]
Merge pull request #6708 from xiaoxichen/shutdown_when_flipping

osd: shut down if we flap too many times in a short period

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5782 from ceph/wip-cxx11time
Sage Weil [Sat, 19 Dec 2015 19:00:37 +0000 (14:00 -0500)]
Merge pull request #5782 from ceph/wip-cxx11time

common: new timekeeping common code, and Objecter conversion

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6796 from dx9/wip-12406-sys_siglist
Sage Weil [Sat, 19 Dec 2015 18:59:55 +0000 (13:59 -0500)]
Merge pull request #6796 from dx9/wip-12406-sys_siglist

common: signal_handler: added support for using reentrant strsignal() implementations vs. sys_siglist[]

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6814 from stiopaa1/rem_inc
Sage Weil [Sat, 19 Dec 2015 18:59:27 +0000 (13:59 -0500)]
Merge pull request #6814 from stiopaa1/rem_inc

msg: removed unneeded includes from Dispatcher

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6815 from badone/wip-13993
Sage Weil [Sat, 19 Dec 2015 18:58:37 +0000 (13:58 -0500)]
Merge pull request #6815 from badone/wip-13993

common: log: Assign LOG_DEBUG priority to syslog calls

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6881 from wido/mon-codestyle-fix
Sage Weil [Sat, 19 Dec 2015 18:58:12 +0000 (13:58 -0500)]
Merge pull request #6881 from wido/mon-codestyle-fix

mon: fix coding-style on PG related Monitor files

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6921 from liewegas/wip-kv-log
Sage Weil [Sat, 19 Dec 2015 18:57:34 +0000 (13:57 -0500)]
Merge pull request #6921 from liewegas/wip-kv-log

osd,mon: log leveldb and rocksdb to ceph log

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6950 from mslovy/wip-optimaze-map
Sage Weil [Sat, 19 Dec 2015 18:57:02 +0000 (13:57 -0500)]
Merge pull request #6950 from mslovy/wip-optimaze-map

osd: misc optimization for map utilization

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6963 from liewegas/wip-memstore
Sage Weil [Sat, 19 Dec 2015 18:56:32 +0000 (13:56 -0500)]
Merge pull request #6963 from liewegas/wip-memstore

osd: memstore: fix two bugs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #6982 from dillaman/wip-librbd-valgrind
Josh Durgin [Fri, 18 Dec 2015 23:19:58 +0000 (15:19 -0800)]
Merge pull request #6982 from dillaman/wip-librbd-valgrind

librbd: uninitialized state in snap remove state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: uninitialized state in snap remove state machine 6982/head
Jason Dillaman [Fri, 18 Dec 2015 21:40:35 +0000 (16:40 -0500)]
librbd: uninitialized state in snap remove state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6979 from dillaman/wip-14123-jewel
Josh Durgin [Fri, 18 Dec 2015 21:25:35 +0000 (13:25 -0800)]
Merge pull request #6979 from dillaman/wip-14123-jewel

librbd: correct issues discovered when cache is disabled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6974 from dillaman/wip-14108-jewel
Josh Durgin [Fri, 18 Dec 2015 21:13:44 +0000 (13:13 -0800)]
Merge pull request #6974 from dillaman/wip-14108-jewel

librbd: correct issues discovered during teuthology testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6978 from trociny/fix-rbd-init-order
Jason Dillaman [Fri, 18 Dec 2015 20:42:24 +0000 (15:42 -0500)]
Merge pull request #6978 from trociny/fix-rbd-init-order

rbd: fix static initialization ordering issues

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotime: Update OSDC for C++11 Time 5782/head
Adam C. Emerson [Mon, 14 Sep 2015 16:19:58 +0000 (12:19 -0400)]
time: Update OSDC for C++11 Time

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agoosdc: Whitespace
Adam C. Emerson [Mon, 14 Sep 2015 16:19:50 +0000 (12:19 -0400)]
osdc: Whitespace

Since I'm making a pervasive change anyway, knock off end-of-line spaces
and wrap overly long lines.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agoperfcounters: Allow C++11 time increment/decrement
Adam C. Emerson [Mon, 14 Sep 2015 16:19:35 +0000 (12:19 -0400)]
perfcounters: Allow C++11 time increment/decrement

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agotimer: Another timer using new time/lock standards
Adam C. Emerson [Mon, 14 Sep 2015 16:19:23 +0000 (12:19 -0400)]
timer: Another timer using new time/lock standards

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agotime: Overload for std:chrono in Cond::TimedWait
Adam C. Emerson [Mon, 14 Sep 2015 16:19:13 +0000 (12:19 -0400)]
time: Overload for std:chrono in Cond::TimedWait

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agotime: Add basic support for std::chrono based time
Adam C. Emerson [Mon, 14 Sep 2015 16:18:57 +0000 (12:18 -0400)]
time: Add basic support for std::chrono based time

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agolibrbd: skip journal event if write/discard was no-op 6979/head
Jason Dillaman [Fri, 18 Dec 2015 20:14:34 +0000 (15:14 -0500)]
librbd: skip journal event if write/discard was no-op

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: object map ENOENT optimizations should complete asynchronously
Jason Dillaman [Fri, 18 Dec 2015 20:12:23 +0000 (15:12 -0500)]
librbd: object map ENOENT optimizations should complete asynchronously

This ensures a consistent lock ordering between the optimized path and
a librados callback. Remove the cache writebach handler's custom finisher
and re-use the op_work_queue.

Fixes: #14123
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6701 from XinzeChi/wip-batch-peek-journal
Sage Weil [Fri, 18 Dec 2015 20:09:21 +0000 (15:09 -0500)]
Merge pull request #6701 from XinzeChi/wip-batch-peek-journal

osd: FileJournal: support batch peak and pop from writeq

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6804 from ceph/putting-the-fail-in-assertion-failed
Sage Weil [Fri, 18 Dec 2015 20:08:22 +0000 (15:08 -0500)]
Merge pull request #6804 from ceph/putting-the-fail-in-assertion-failed

common: assert: abort() rather than throw

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6900 from liewegas/wip-13988
Sage Weil [Fri, 18 Dec 2015 20:07:49 +0000 (15:07 -0500)]
Merge pull request #6900 from liewegas/wip-13988

mon: fix reuse of osd ids (clear osd info on osd deletion)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6902 from XinzeChi/wip-pg_stat_t-encoding
Sage Weil [Fri, 18 Dec 2015 20:07:14 +0000 (15:07 -0500)]
Merge pull request #6902 from XinzeChi/wip-pg_stat_t-encoding

osd: utime_t, eversion_t, osd_stat_sum_t encoding optimization

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6909 from mslovy/wip-shared-cache
Sage Weil [Fri, 18 Dec 2015 20:06:14 +0000 (15:06 -0500)]
Merge pull request #6909 from mslovy/wip-shared-cache

common: improve shared_cache and simple_cache efficiency with hash table

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agorbd: fix "static initialization order fiasco" 6978/head
Mykola Golub [Fri, 18 Dec 2015 15:10:33 +0000 (17:10 +0200)]
rbd: fix "static initialization order fiasco"

The order in which static objects in different compilation units are
initialized is undefined. Use static functions as a workaround.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agolibrbd: update exclusive lock state when shutting down 6974/head
Jason Dillaman [Fri, 18 Dec 2015 19:15:10 +0000 (14:15 -0500)]
librbd: update exclusive lock state when shutting down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: extra request required if journal enabled w/ caching
Jason Dillaman [Fri, 18 Dec 2015 18:14:58 +0000 (13:14 -0500)]
librbd: extra request required if journal enabled w/ caching

Fixes: #14108
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: stop the copyup thread during shutdown
Jason Dillaman [Fri, 18 Dec 2015 18:04:20 +0000 (13:04 -0500)]
librbd: stop the copyup thread during shutdown

Fixes: #14107, #14108
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6968 from xiexingguo/xxg-wip-14118
Josh Durgin [Fri, 18 Dec 2015 17:00:45 +0000 (09:00 -0800)]
Merge pull request #6968 from xiexingguo/xxg-wip-14118

librbd: exit if parent's snap is gone during clone

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6972 from dillaman/wip-14106-jewel
Josh Durgin [Fri, 18 Dec 2015 16:46:55 +0000 (08:46 -0800)]
Merge pull request #6972 from dillaman/wip-14106-jewel

rbd: merge_diff test should use new --object-size parameter instead of --order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: exit if parent snap is gone during clone 6968/head
xiexingguo [Fri, 18 Dec 2015 10:37:06 +0000 (18:37 +0800)]
librbd: exit if parent snap is gone during clone

Fixes: #14118
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #6914 from x11562/x11562
Jason Dillaman [Fri, 18 Dec 2015 14:14:11 +0000 (09:14 -0500)]
Merge pull request #6914 from x11562/x11562

rbd: additional validation for striping parameters

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6958 from xiexingguo/patch-1
Jason Dillaman [Fri, 18 Dec 2015 14:06:03 +0000 (09:06 -0500)]
Merge pull request #6958 from xiexingguo/patch-1

librbd: return error if we fail to delete object_map head object

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6965 from kylinstorage/wip-rbd-default-order
Jason Dillaman [Fri, 18 Dec 2015 14:03:10 +0000 (09:03 -0500)]
Merge pull request #6965 from kylinstorage/wip-rbd-default-order

rbd: use default order from configuration when not specified

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6928 from HeyoQiang/heyongqiang1215
Loic Dachary [Fri, 18 Dec 2015 08:25:30 +0000 (09:25 +0100)]
Merge pull request #6928 from HeyoQiang/heyongqiang1215

Monitor: modify a dout level in OSDMonitor.cc

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agomon: modify the level of a log about OSD's condition in OSDMonitor.cc 6928/head
Yongqiang He [Thu, 17 Dec 2015 18:57:07 +0000 (13:57 -0500)]
mon: modify the level of a log about OSD's condition in OSDMonitor.cc

    In actual use, we replace old hard disk by new or do performance testing regularly and need to down OSDs manually, but there are some OSDs can not be marked down, and there is no obvious information.
The log { dout(5) << "can_mark_down current up_ratio " << up_ratio << " < min "<< g_conf->mon_osd_min_up_ratio<< ", will not mark osd." << i << "down" << dendl ; }" can explain  why it happened.
   In addition, we can change the value of mon_osd_min_up_ratio more reasonable in our operating environment.so it is necessary to adjust the log's level lower.

For example:
   There are 6 OSDs , wen have marked down 5 of them and the mon_osd_min_up_ratio = 0.3.
   In this situation, when we mark the last OSD to down, it will show "ceph-osd stop/waiting", but in actually, the OSD is still up.

Signed-off-by: Yongqiang He <he.yongqiang@h3c.com>
9 years agoqa/workunits/rbd: use --object-size instead of --order 6972/head
Jason Dillaman [Fri, 18 Dec 2015 08:03:20 +0000 (03:03 -0500)]
qa/workunits/rbd: use --object-size instead of --order

Fixes: #14106
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: process crushed, rbd creating with striping parameters
na xie [Tue, 15 Dec 2015 13:28:34 +0000 (21:28 +0800)]
rbd: process crushed, rbd creating with striping parameters

Signed-off-by: Na Xie <xie.na@h3c.com>
9 years agorbd: use default order value from g_conf 6965/head
Yunchuan Wen [Fri, 18 Dec 2015 07:16:20 +0000 (15:16 +0800)]
rbd: use default order value from g_conf

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
9 years agolog: Log.cc: Assign LOG_DEBUG priority to syslog calls 6815/head
Brad Hubbard [Mon, 7 Dec 2015 01:31:28 +0000 (11:31 +1000)]
log: Log.cc: Assign LOG_DEBUG priority to syslog calls

Fixes: #13993
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #6847 from oritwas/wip-fix-warning
Sage Weil [Thu, 17 Dec 2015 21:41:06 +0000 (16:41 -0500)]
Merge pull request #6847 from oritwas/wip-fix-warning

build: fix a few warnings

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6924 from stiopaa1/removefriend
Sage Weil [Thu, 17 Dec 2015 21:39:51 +0000 (16:39 -0500)]
Merge pull request #6924 from stiopaa1/removefriend

msg/simple: remove unneeded friend declarations

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6405 from jcsp/wip-9963
Sage Weil [Thu, 17 Dec 2015 20:38:17 +0000 (15:38 -0500)]
Merge pull request #6405 from jcsp/wip-9963

librados: new style (sharded) object listing

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/MemStore: fix use-after-free on iterator 6963/head
Sage Weil [Thu, 17 Dec 2015 15:29:31 +0000 (10:29 -0500)]
os/MemStore: fix use-after-free on iterator

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomemstore: fix loop in PageSetObject::clone()
Casey Bodley [Thu, 17 Dec 2015 15:15:50 +0000 (10:15 -0500)]
memstore: fix loop in PageSetObject::clone()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #6945 from jcsp/wip-blacklist-clear
Kefu Chai [Thu, 17 Dec 2015 14:17:26 +0000 (22:17 +0800)]
Merge pull request #6945 from jcsp/wip-blacklist-clear

mon: add `osd blacklist clear`

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #6959 from oritwas/wip-fix-run-cmake-check
Loic Dachary [Thu, 17 Dec 2015 14:04:38 +0000 (15:04 +0100)]
Merge pull request #6959 from oritwas/wip-fix-run-cmake-check

cmake: no need to run configure from run-cmake-check.sh

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6564 from branch-predictor/bp-fix-mon-kv-store
Sage Weil [Thu, 17 Dec 2015 13:59:33 +0000 (08:59 -0500)]
Merge pull request #6564 from branch-predictor/bp-fix-mon-kv-store

mon: fixes related to mondbstore->get() changes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6202 from cxwshawn/wip-ful-fix
Sage Weil [Thu, 17 Dec 2015 13:58:53 +0000 (08:58 -0500)]
Merge pull request #6202 from cxwshawn/wip-ful-fix

rados: implement rm --force option to force remove when full

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorbd: fix "was hidden" warning 6847/head
Orit Wasserman [Mon, 7 Dec 2015 14:07:15 +0000 (15:07 +0100)]
rbd: fix "was hidden" warning

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agonewstore: fix was hidden warning
Orit Wasserman [Mon, 7 Dec 2015 14:05:46 +0000 (15:05 +0100)]
newstore: fix was hidden warning

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: use unsigned long to print to log
Orit Wasserman [Mon, 7 Dec 2015 10:36:29 +0000 (11:36 +0100)]
rgw: use unsigned long to print to log

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #6956 from somnathr/wip-conditional-drive-metadata-collection
Sage Weil [Thu, 17 Dec 2015 13:35:52 +0000 (08:35 -0500)]
Merge pull request #6956 from somnathr/wip-conditional-drive-metadata-collection

osd: FileStore: conditional collection of drive metadata

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6929 from clever215/mon-log
Joao Eduardo Luis [Thu, 17 Dec 2015 13:27:41 +0000 (13:27 +0000)]
Merge pull request #6929 from clever215/mon-log

mon: degrade a log message to level 2

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agocmake: no need to run configure from run-cmake-check.sh 6959/head
Orit Wasserman [Thu, 17 Dec 2015 13:03:15 +0000 (14:03 +0100)]
cmake: no need to run configure from run-cmake-check.sh

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #6864 from scienceluo/wip-cleanup
Loic Dachary [Thu, 17 Dec 2015 06:52:19 +0000 (07:52 +0100)]
Merge pull request #6864 from scienceluo/wip-cleanup

osdmap: remove unused local variables

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agolibrbd: return error if we fail to delete object_map head object 6958/head
xiexingguo [Thu, 17 Dec 2015 06:13:01 +0000 (14:13 +0800)]
librbd: return error if we fail to delete object_map head object

Fixes: #14098
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosdmap: remove unused local variables 6864/head
scienceluo [Tue, 8 Dec 2015 12:40:53 +0000 (20:40 +0800)]
osdmap: remove unused local variables

Signed-off-by: luo kexue <luo.kexue@zte.com.cn>
9 years agoMerge pull request #6904 from wuxiangwei/wip-wxw-rbdadminsocket
Josh Durgin [Thu, 17 Dec 2015 01:21:19 +0000 (17:21 -0800)]
Merge pull request #6904 from wuxiangwei/wip-wxw-rbdadminsocket

rbd: add pool name to disambiguate rbd admin socket commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6942 from x11562/stripe
Josh Durgin [Thu, 17 Dec 2015 01:18:08 +0000 (17:18 -0800)]
Merge pull request #6942 from x11562/stripe

rbd: striping parameters should support 64bit integers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoFileStore: Conditional collection of drive metadata 6956/head
Somnath Roy [Fri, 20 Nov 2015 03:06:17 +0000 (22:06 -0500)]
FileStore: Conditional collection of drive metadata

get_device_by_uuid->blkid_find_dev_with_tag() call from
FileStore::collect_metadata() is hanging for ~3min before returning
EINVAL in case the drive is visible but reserved for some other host.
This is probably is bug within blkid* calls. fdisk/lsblk call is coming
out immediately saying device is inaccessible. This call is now
protected by config option filestore_collect_device_partition_information

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
9 years agodoc/release-notes: v10.0.1
Sage Weil [Wed, 16 Dec 2015 18:03:45 +0000 (13:03 -0500)]
doc/release-notes: v10.0.1

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 16 Dec 2015 15:48:15 +0000 (10:48 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #6932 from aiicore/test_fix
Sage Weil [Wed, 16 Dec 2015 13:46:50 +0000 (08:46 -0500)]
Merge pull request #6932 from aiicore/test_fix

tests: allow object corpus readable test to skip specific incompat instances

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomon: add `osd blacklist clear` 6945/head
John Spray [Tue, 15 Dec 2015 17:19:30 +0000 (17:19 +0000)]
mon: add `osd blacklist clear`

This is just like 'blacklist rm' except it removes
everything.  Useful if you've got a whole bunch of
things in your blacklist and you don't want to wait
for N "blacklist rm" commands to run.

Signed-off-by: John Spray <john.spray@redhat.com>