Commit Graph

46894 Commits

Author SHA1 Message Date
Sage Weil
44a3dbb96e Merge pull request #6572 from liewegas/wip-crush-chooseleaf-stable
crush: add chooseleaf_stable tunable

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-23 17:05:23 -05:00
Josh Durgin
5657f5bfa2 Merge pull request #7041 from dillaman/wip-14165
qa/workunits: merge_diff shouldn't attempt to use striping 

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-23 10:51:17 -08:00
David Zafman
14933e7a9e Merge pull request #7036 from xiexingguo/xxg-wip-kvstore
KeyValueStore: fix return code of mkfs

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-12-23 10:47:01 -08:00
Josh Durgin
9bb9b85411 Merge pull request #7020 from chenyehua11692/master
doc:adding "--allow-shrink" in decreasing the size of the rbd block to distinguish from the increasing option

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-23 10:45:27 -08:00
Jason Dillaman
8e095dedfa qa/workunits: merge_diff shouldn't attempt to use striping v2
Fixes: #14165
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-23 12:54:47 -05:00
xiexingguo
a069ea994d KeyValueStore: fix return code of mkfs
It shall return a negative result code instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-12-23 22:49:59 +08:00
John Spray
0c17b613f0 Merge pull request #6996 from H3C/wip-mds-f11322
mds: we should wait messenger when MDSDaemon suicide

Reviewed-by: John Spray <john.spray@redhat.com>
2015-12-23 13:49:14 +00:00
Kefu Chai
e0833f2cbc Merge pull request #7015 from chipitsine/master
ceph-fuse: fix double free of args

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-23 21:39:36 +08:00
Sage Weil
d812e03b79 Merge pull request #7004 from jazeltq/master
doc: fix typo

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-23 08:36:26 -05:00
Sage Weil
8ca07f44ad Merge pull request #6870 from mslovy/wip-pgmeta-object
osd: os: skip checking pg_meta object existance in FileStore

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-23 08:28:50 -05:00
Sage Weil
0b675268a9 Merge pull request #6744 from majianpeng/scrub-fix
osd: release related sources when scrub is interrupted

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-23 08:27:35 -05:00
Sage Weil
328a96f3e5 Merge pull request #6961 from liewegas/wip-lockdep-max
common/lockdep: increase max lock names

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-23 08:26:43 -05:00
Wei Feng
fff49412c5 mds: we should wait messenger when MDSDaemon suicide
Signed-off-by: Wei Feng <feng.wei@h3c.com>
2015-12-23 07:48:04 -05:00
Loic Dachary
bea2e10a00 Merge pull request #7025 from tchaikov/wip-ceph-detect-init-py3
ceph-detect-init: fix py3 test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-23 11:59:58 +01:00
Kefu Chai
80c770e115 ceph-detect-init: fix py3 test
* in python3, None can not be compared with a str. and
  we should always set codename with a non empty str, so update
  TestCephDetectInit.test_debian so it always set a code name.
  and assert(codename and distroname) in choose_init().

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-12-23 16:35:12 +08:00
Loic Dachary
03f930772c Merge pull request #7023 from tchaikov/wip-doc-cachemode
doc: document "readforward" and "readproxy" cache mode

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-23 09:12:49 +01:00
Kefu Chai
d821acada3 doc: document "readforward" and "readproxy" cache mode
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-12-23 13:43:36 +08:00
Yehua
777564c870 doc:adding "--allow-shrink" in decreasing the size of the rbd block to distinguish from the increasing option
In the original file, the increasing and decreaing of the size of the rbd block shares the same option:
    "rbd resize --size 2048 foo".
However, it is not proper, as the "--allow-shrink" needs to be added while decreasing the size of the rbd block.
As a result, it is necessary to make a distinguish between these two options as follows:
    "rbd resize --size 2048 foo (to increase)"
    "rbd resize --size 2048 foo --allow-shrink (to decrease)"

Signed-off-by: Yehua <chen.yehua@h3c.com>
2015-12-23 13:13:04 +08:00
litianqing
877f332f57 ceph doc fix slip of pen
mon client hung interval -> mon client hunt interval

Signed-off-by: tianqing <tianqing@unitedstack.com>
2015-12-23 10:56:19 +08:00
Ilya Shipitsin
eb8057c6f4 ceph-fuse: fix double free of args
Checking src/ceph_fuse.cc...
[src/ceph_fuse.cc:55]: (error) Memory pointed to by 'argv' is freed twice.
[src/ceph_fuse.cc:55]: (error) Deallocating a deallocated pointer: argv

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
2015-12-23 01:28:06 +05:00
David Zafman
f14fe56d0c Merge pull request #6988 from xiexingguo/xxg-wip-14134
FileJournal: fix return code of create method

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-12-22 10:02:37 -08:00
Orit Wasserman
cacc38e9cc Merge pull request #7005 from YankunLi/patch-4
delete default zone
2015-12-22 16:26:13 +01:00
Orit Wasserman
cc1edf3af1 Merge pull request #7006 from YankunLi/patch-5
correct radosgw-admin command
2015-12-22 16:18:52 +01:00
Sage Weil
714c9e3e6e 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>
2015-12-22 09:01:17 -05:00
Kefu Chai
7b3e5bfe07 Merge pull request #6990 from linuxbox2/master-fixes
Fixes some small issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-22 21:55:07 +08:00
YankunLi
4dd86ca93e correct radosgw-admin command
the command to disable users quota should be 'radosgw-admin quota disable --quota-scope=<user | bucket> --uid=<uid>'
2015-12-22 13:56:50 +08:00
YankunLi
b1df12c000 delete default zone
if the default zone exist, delete the default zone from both the east and west pools.
2015-12-22 13:46:13 +08:00
Josh Durgin
09a3f69e6f Merge remote-tracking branch 'origin/jewel' 2015-12-21 16:59:51 -08:00
Sage Weil
e8dccacacd 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>
2015-12-21 12:58:32 -05:00
Josh Durgin
df9ff2522f 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>
2015-12-21 07:31:57 -08:00
Jason Dillaman
b87269728d Merge pull request #6986 from xiexingguo/xxg-wip-14129
librbd: fix snap_exists API return code overflow

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-21 10:29:33 -05:00
xiexingguo
6a45bbc863 test: update test cases with the new snap_exists API
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-12-21 23:13:28 +08:00
Jason Dillaman
fbac8172fc Merge pull request #6938 from wuxiangwei/wip-wxw-rbdfuserename
rbd-fuse: implement mv operation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-21 09:55:08 -05:00
Jason Dillaman
e8911cfee7 tests: flush op work queue prior to destroying MockImageCtx
Fixes: #14092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-21 09:03:15 -05:00
Loic Dachary
6395bf856b 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>
2015-12-21 11:37:37 +01:00
Loic Dachary
9dce05a8cd 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>
2015-12-21 11:37:37 +01:00
Loic Dachary
fe71647bc9 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>
2015-12-21 11:31:25 +01:00
Loic Dachary
730b5d62d3 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>
2015-12-21 11:31:25 +01:00
Loic Dachary
fd7fe8c497 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>
2015-12-21 11:31:25 +01:00
Loic Dachary
b271a06b6a ceph-disk: fix typo
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-12-21 11:31:25 +01:00
Loic Dachary
f5d36b9ac2 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>
2015-12-21 11:31:25 +01:00
Loic Dachary
5fa35ba10e ceph-disk: do not discard stderr
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-12-21 11:31:25 +01:00
Yuan Zhou
845f4a1cb1 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>
2015-12-21 15:33:21 +08:00
Matt Benjamin
cd2947d7e9 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>
2015-12-20 13:32:13 -05:00
Matt Benjamin
c2a2499263 xio: avoid conversion warning w/xio_queue_depth
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2015-12-20 13:14:41 -05:00
Matt Benjamin
34bb892ac0 xio: remove static declspec on buffer::create_msg
Likely an update missed from PR #6686.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2015-12-20 12:42:28 -05:00
xiexingguo
9287e980ff 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>
2015-12-20 21:41:46 +08:00
wuxiangwei
71eb4f9f09 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
2015-12-20 04:14:35 -05:00
xiexingguo
084f22ce15 tools: replace snap_exists with a new safer version
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-12-20 16:23:48 +08:00
xiexingguo
c97b1a68ae 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>
2015-12-20 16:23:48 +08:00