]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agotest/rados/misc.cc: add long locator key and namespace tests 8496/head
Samuel Just [Fri, 8 Apr 2016 21:56:51 +0000 (14:56 -0700)]
test/rados/misc.cc: add long locator key and namespace tests

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex: use chain_getxattr_buf
Samuel Just [Fri, 8 Apr 2016 18:38:06 +0000 (11:38 -0700)]
LFNIndex: use chain_getxattr_buf

LFN attrs can be longer than these hard coded limits, let's just do
buffer doubling everywhere.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agochain_xattr: add chain_getxattr_buf
Samuel Just [Fri, 8 Apr 2016 18:32:37 +0000 (11:32 -0700)]
chain_xattr: add chain_getxattr_buf

Otherwise callers need to implement buffer doubling in a lot of cases,
which is error prone.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex::lfn_parse_object_name: return int rather than bool
Samuel Just [Fri, 8 Apr 2016 18:10:18 +0000 (11:10 -0700)]
LFNIndex::lfn_parse_object_name: return int rather than bool

All current callers (except list_objects) already expect
ret < 0 for error.  Adjust list_objects to skip on EINVAL
instead of 0.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex::list_objects: lfn_translate does not set errno
Samuel Just [Fri, 8 Apr 2016 17:45:45 +0000 (10:45 -0700)]
LFNIndex::list_objects: lfn_translate does not set errno

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoFileStore::set_xattr_limits_via_conf: add warning if max xattr size smaller than...
Samuel Just [Mon, 4 Apr 2016 23:48:28 +0000 (16:48 -0700)]
FileStore::set_xattr_limits_via_conf: add warning if max xattr size smaller than max name

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agotest/objectstore/chain_xattr.cc: add test for ensure_single_attr
Samuel Just [Sat, 2 Apr 2016 00:50:37 +0000 (17:50 -0700)]
test/objectstore/chain_xattr.cc: add test for ensure_single_attr

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex: ensure that lfn and directory attrs are written atomically
Samuel Just [Fri, 1 Apr 2016 23:57:48 +0000 (16:57 -0700)]
LFNIndex: ensure that lfn and directory attrs are written atomically

We leave skip_chain_cleanup = false since the object may have been
written using code that split the lfn attr over multiple attrs.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agochain_[f]getxattr: always use size, no reaon to consider CHAIN_XATTR_MAX_BLOCK_LEN
Samuel Just [Fri, 8 Apr 2016 20:01:07 +0000 (13:01 -0700)]
chain_[f]getxattr: always use size, no reaon to consider CHAIN_XATTR_MAX_BLOCK_LEN

Users of setxattr can now set attrs larger than that size.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agochain_xattr: s/onechunk/skip_chain_cleanup, add ensure_single_attr
Samuel Just [Fri, 1 Apr 2016 23:56:43 +0000 (16:56 -0700)]
chain_xattr: s/onechunk/skip_chain_cleanup, add ensure_single_attr

onechunk was a deceptive name since it didn't actually ensure that
a single chunk would be used.  Rename to ensure_single_attr.  Also,
add a parameter to ensure that we use a single attribute.  We need
these to be distinct since we have LFN attrs which have been split
over 254 byte xattrs since after hammer which we need to correctly
clean up.  However, we need to ensure going forward that those attrs
are never split over more than one chunk -- it's not atomic.
Further, skip_chain_cleanup should imply ensure_single_attr, so make
them template params and add a static check to make sure we don't
mess this up in the future.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoos/,osd/: restructure the rados name length check
Samuel Just [Fri, 1 Apr 2016 23:24:42 +0000 (16:24 -0700)]
os/,osd/: restructure the rados name length check

Enforce locator length vs the max name length and also
introduce a namespace length limit.

In addition to these checks, also pass the head object to the
ObjectStore implementation to validate.  This allows LFNIndex to account
for the idiosyncracies of its filename escaping and for different xattr
value max sizes.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8378 from liewegas/wip-pgls-pgid
Sage Weil [Mon, 4 Apr 2016 20:53:51 +0000 (16:53 -0400)]
Merge pull request #8378 from liewegas/wip-pgls-pgid

osdc/Objecter: use full pgid hash in PGNLS ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8069 from somnathr/wip-dyn-throttle-doc
Samuel Just [Mon, 4 Apr 2016 19:54:32 +0000 (12:54 -0700)]
Merge pull request #8069 from somnathr/wip-dyn-throttle-doc

Adding documentation on how to use new dynamic throttle scheme

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8429 from ErwanAliasr1/evelu-broken-cephtool-test-mon
Sage Weil [Mon, 4 Apr 2016 19:48:10 +0000 (15:48 -0400)]
Merge pull request #8429 from ErwanAliasr1/evelu-broken-cephtool-test-mon

tests: Fixing broken test/cephtool-test-mon.sh test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8411 from theanalyst/rgw/unused-var
Orit Wasserman [Mon, 4 Apr 2016 18:22:43 +0000 (20:22 +0200)]
Merge pull request #8411 from theanalyst/rgw/unused-var

rgw_admin: remove unused parent_period arg
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8426 from dillaman/wip-striper-logs
Josh Durgin [Mon, 4 Apr 2016 17:01:52 +0000 (10:01 -0700)]
Merge pull request #8426 from dillaman/wip-striper-logs

Striper: reduce assemble_result log level

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8421 from tchaikov/wip-noexcept
Kefu Chai [Mon, 4 Apr 2016 15:44:43 +0000 (23:44 +0800)]
Merge pull request #8421 from tchaikov/wip-noexcept

os/ObjectStore: add noexcept to ensure move ctor is used

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agotests: Fixing broken test/cephtool-test-mon.sh test 8429/head
Erwan Velu [Mon, 4 Apr 2016 14:55:08 +0000 (16:55 +0200)]
tests: Fixing broken test/cephtool-test-mon.sh test

Since the merge of pr #7693, 'ceph command' to get the help is invalid.
As a result, 'test/cephtool-test-mon.sh' test was broken

This patch simply change the 'ceph command' by a 'ceph --help command'

Since this change the test is passing again.

Signed-off-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #8422 from ceph/wip-fix-cmake
Casey Bodley [Mon, 4 Apr 2016 14:35:20 +0000 (10:35 -0400)]
Merge pull request #8422 from ceph/wip-fix-cmake

CMake: For CMake version <= 2.8.11, use LINK_PRIVATE

9 years agoMerge pull request #8410 from theanalyst/rgw/help-args
Casey Bodley [Mon, 4 Apr 2016 14:28:38 +0000 (10:28 -0400)]
Merge pull request #8410 from theanalyst/rgw/help-args

rgw: add a few more help options in admin interface

9 years agoMerge pull request #8393 from jcsp/wip-15309-2
Sage Weil [Mon, 4 Apr 2016 13:42:57 +0000 (09:42 -0400)]
Merge pull request #8393 from jcsp/wip-15309-2

qa: update rest test cephfs calls (part 2)

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8402 from ilc/master
Sage Weil [Mon, 4 Apr 2016 13:32:12 +0000 (09:32 -0400)]
Merge pull request #8402 from ilc/master

configure: Add -D_LARGEFILE64_SOURCE to Linux build.

9 years agoMerge pull request #8420 from dzafman/wip-15347
Sage Weil [Mon, 4 Apr 2016 12:56:23 +0000 (08:56 -0400)]
Merge pull request #8420 from dzafman/wip-15347

test: Fix test to run with btrfs which has snap_### dirs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8423 from wjin/fix
Sage Weil [Mon, 4 Apr 2016 12:55:53 +0000 (08:55 -0400)]
Merge pull request #8423 from wjin/fix

osdmap: rm nonused variable

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoqa/workunits/rbd: qemu tests need to wait for image to be createdReviewe
Sage Weil [Mon, 4 Apr 2016 12:55:14 +0000 (08:55 -0400)]
qa/workunits/rbd: qemu tests need to wait for image to be createdReviewe

qa/workunits/rbd: qemu tests need to wait for image to be created

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8427 from ghxandsky/master
Sage Weil [Mon, 4 Apr 2016 12:54:11 +0000 (08:54 -0400)]
Merge pull request #8427 from ghxandsky/master

set 128MB tcmalloc cache size by bytes

9 years agoset 128MB tcmalloc cache size by bytes 8427/head
Star Guo [Mon, 4 Apr 2016 05:41:52 +0000 (13:41 +0800)]
set 128MB tcmalloc cache size by bytes

Signed-off-by: Star Guo <star.guo@mevoco.com>
9 years agoMerge pull request #8314 from dx9/wip-unittest-erasure-code-plugin
Sage Weil [Sun, 3 Apr 2016 22:13:28 +0000 (18:13 -0400)]
Merge pull request #8314 from dx9/wip-unittest-erasure-code-plugin

unittest_erasure_code_plugin: fix deadlock (Alpine)

9 years agoMerge pull request #7693 from aclamk/auto_complete_python
Sage Weil [Sun, 3 Apr 2016 22:12:03 +0000 (18:12 -0400)]
Merge pull request #7693 from aclamk/auto_complete_python

ceph: bash auto complete for CLI based on mon command descriptions

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8366 from yangdongsheng/trival
Sage Weil [Sun, 3 Apr 2016 22:11:18 +0000 (18:11 -0400)]
Merge pull request #8366 from yangdongsheng/trival

build: fix compiling warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Sun, 3 Apr 2016 18:28:23 +0000 (14:28 -0400)]
Merge remote-tracking branch 'gh/jewel'

9 years agoStriper: reduce assemble_result log level 8426/head
Jason Dillaman [Sun, 3 Apr 2016 14:52:10 +0000 (10:52 -0400)]
Striper: reduce assemble_result log level

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: qemu tests need to wait for image to be created 8425/head
Jason Dillaman [Sun, 3 Apr 2016 14:29:38 +0000 (10:29 -0400)]
qa/workunits/rbd: qemu tests need to wait for image to be created

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoceph_test_rados_api_tier: parse env 8378/head
Sage Weil [Sun, 3 Apr 2016 13:49:07 +0000 (09:49 -0400)]
ceph_test_rados_api_tier: parse env

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph_test_rados_api_list: parse env
Sage Weil [Sun, 3 Apr 2016 13:45:23 +0000 (09:45 -0400)]
ceph_test_rados_api_list: parse env

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/ReplicatedPG: tolerate pgls commands with full hash
Sage Weil [Sun, 3 Apr 2016 13:35:03 +0000 (09:35 -0400)]
osd/ReplicatedPG: tolerate pgls commands with full hash

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/ReplicatedPG: discard pgnls op that is outside pg bounds
Sage Weil [Thu, 31 Mar 2016 14:23:36 +0000 (10:23 -0400)]
osd/ReplicatedPG: discard pgnls op that is outside pg bounds

This should only happen with a buggy client, but we should avoid crashing,
and send a polite error message back.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: use full hash value for pg[n]ls ops
Sage Weil [Wed, 30 Mar 2016 15:55:55 +0000 (11:55 -0400)]
osdc/Objecter: use full hash value for pg[n]ls ops

Normal ops do this so they can behave when racing with split; pgnls ops
are no different.

In particular, this fixes a bug where we have an old OSDMap that doesn't
reflect a split, and the OSD replies with a 'next' value of the PG's new
max.  If we resend the same value to that PG, it'll be out of bounds,
and BlueStore will notice.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/ReplicatedPG: fix typo
Sage Weil [Wed, 30 Mar 2016 15:43:01 +0000 (11:43 -0400)]
osd/ReplicatedPG: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8380 from dillaman/wip-cls-fadvise
Sage Weil [Sun, 3 Apr 2016 13:13:31 +0000 (09:13 -0400)]
Merge pull request #8380 from dillaman/wip-cls-fadvise

cls_rbd: pass WILLNEED fadvise flags during object map update

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoosdmap: rm nonused variable 8423/head
Wei Jin [Sun, 3 Apr 2016 06:20:16 +0000 (14:20 +0800)]
osdmap: rm nonused variable

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
9 years agoCMake: For CMake version <= 2.8.11, use LINK_PRIVATE 8422/head
Haomai Wang [Sun, 3 Apr 2016 05:31:07 +0000 (13:31 +0800)]
CMake: For CMake version <= 2.8.11, use LINK_PRIVATE

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoos/ObjectStore: add noexcept to ensure move ctor is used 8421/head
Kefu Chai [Sat, 2 Apr 2016 19:33:15 +0000 (03:33 +0800)]
os/ObjectStore: add noexcept to ensure move ctor is used

otherwise vector::push_back() will use the copy ctor if it resizes,
to enforce its strong exception guarantee.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge branch 'wip-cycles'
Josh Durgin [Sat, 2 Apr 2016 19:35:09 +0000 (12:35 -0700)]
Merge branch 'wip-cycles'

common/Cycles: Do not initialize Cycles globally

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agocommon/Cycles: Do not initialize Cycles globally.
Richard W.M. Jones [Mon, 21 Mar 2016 14:24:35 +0000 (14:24 +0000)]
common/Cycles: Do not initialize Cycles globally.

Move initialization to the few tests that actually use it.

Fixes: http://tracker.ceph.com/issues/15225
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
9 years agounittest_erasure_code_plugin: fix deadlock caused by locked mutex in cancelled thread 8314/head
John Coyle [Sat, 26 Mar 2016 03:05:41 +0000 (23:05 -0400)]
unittest_erasure_code_plugin: fix deadlock caused by locked mutex in cancelled thread

Added unlock when thread is cancelled.

Signed-off-by: John Coyle <dx9err@gmail.com>
9 years agoMerge pull request #8193 from liewegas/wip-bluestore
Sage Weil [Fri, 1 Apr 2016 21:52:47 +0000 (17:52 -0400)]
Merge pull request #8193 from liewegas/wip-bluestore

os/bluestore: a few fixes

9 years agotest: Fix test to run with btrfs which has snap_### dirs 8420/head
David Zafman [Fri, 1 Apr 2016 21:33:14 +0000 (14:33 -0700)]
test: Fix test to run with btrfs which has snap_### dirs

Fixes: http://tracker.ceph.com/issues/15347
Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #8404 from cbodley/wip-rgw-realm-pull-fix
Orit Wasserman [Fri, 1 Apr 2016 18:22:51 +0000 (20:22 +0200)]
Merge pull request #8404 from cbodley/wip-rgw-realm-pull-fix

radosgw-admin: fix for 'realm pull'
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8417 from dillaman/wip-librbd-mirroring-unsupported
Josh Durgin [Fri, 1 Apr 2016 17:54:02 +0000 (10:54 -0700)]
Merge pull request #8417 from dillaman/wip-librbd-mirroring-unsupported

librbd: avoid throwing error if mirroring is unsupported

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8325 from trociny/wip-rbd-mirror-test-misc
Josh Durgin [Fri, 1 Apr 2016 16:55:20 +0000 (09:55 -0700)]
Merge pull request #8325 from trociny/wip-rbd-mirror-test-misc

test: rbd-mirror: script improvements for manual testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8413 from runsisi/wip-fix-eexist
Jason Dillaman [Fri, 1 Apr 2016 16:16:12 +0000 (11:16 -0500)]
Merge pull request #8413 from runsisi/wip-fix-eexist

cls_journal: fix -EEXIST checking

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: avoid throwing error if mirroring is unsupported 8417/head
Jason Dillaman [Fri, 1 Apr 2016 16:08:12 +0000 (12:08 -0400)]
librbd: avoid throwing error if mirroring is unsupported

Attempting to remove an image will remove the image from the mirroring
directory.  However, if the OSD is older and doesn't support this
new feature, avoid throwing an error.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: add exclusive flag to set_as_default() 8404/head
Casey Bodley [Thu, 31 Mar 2016 21:19:12 +0000 (17:19 -0400)]
rgw: add exclusive flag to set_as_default()

this dodges the race in RGWRealm::create() and RGWZoneParams::create()
that decides whether to set the new object as a default. by calling
set_as_default() with exclusive=true, it will fail with EEXIST if a
default is already set

it also fixes an issue with 'realm pull' on a secondary zone, where a
'default' zone may be created but never actually set_as_default()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add exclusive flag to RGWRealm::create_control
Casey Bodley [Thu, 31 Mar 2016 16:16:08 +0000 (12:16 -0400)]
rgw: add exclusive flag to RGWRealm::create_control

this was causing failures in 'radosgw-admin realm pull':

  ERROR creating control for new realm realm0: (17) File exists

'realm pull' calls RGWRealm::create() with exclusive=false, but
RGWRealm::create_control() was using exclusive=true

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw_admin: improve the orphans find help 8410/head
Abhishek Lekshmanan [Fri, 1 Apr 2016 11:46:30 +0000 (13:46 +0200)]
rgw_admin: improve the orphans find help

Adding  a few missing commandline switches and improve the help message

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #8406 from dmick/jewel
Kefu Chai [Fri, 1 Apr 2016 14:26:26 +0000 (22:26 +0800)]
Merge pull request #8406 from dmick/jewel

debian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8324 from tchaikov/wip-mon-cleanup
Kefu Chai [Fri, 1 Apr 2016 14:19:46 +0000 (22:19 +0800)]
Merge pull request #8324 from tchaikov/wip-mon-cleanup

mon: remove remove_legacy_versions()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agorgw: add a few missing cmdline switches in help
Abhishek Lekshmanan [Fri, 1 Apr 2016 11:45:09 +0000 (13:45 +0200)]
rgw: add a few missing cmdline switches in help

Add a few missing commandlien switches for zone
operations (zone_id,source_zone,read_only) to the help options

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agocls_journal: fix -EEXIST checking 8413/head
runsisi [Fri, 1 Apr 2016 12:56:26 +0000 (20:56 +0800)]
cls_journal: fix -EEXIST checking

Signed-off-by: runsisi <runsisi@zte.com.cn>
9 years agorgw_admin: remove unused parent_period arg 8411/head
Abhishek Lekshmanan [Fri, 1 Apr 2016 12:40:12 +0000 (14:40 +0200)]
rgw_admin: remove unused parent_period arg

This variable seems to be unused, removing from help and code

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agodebian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base 8406/head
Dan Mick [Fri, 1 Apr 2016 03:30:00 +0000 (20:30 -0700)]
debian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base

When the package name changed from ceph to ceph-base, dh_installinit
started installing the init script into /etc/init.d/ceph-base.  Fix
this by using --name ceph with dh_installinit, which requires
1) naming the .init file ceph-base.ceph.init, and
2) calling dh_installinit separately for each package

Fixes: http://tracker.ceph.com/issues/15329
Signed-off-by: Dan Mick <dan.mick@redhat.com>
9 years agoMerge pull request #8371 from runsisi/wip-fix-eexist
Jason Dillaman [Thu, 31 Mar 2016 18:34:26 +0000 (13:34 -0500)]
Merge pull request #8371 from runsisi/wip-fix-eexist

cls_rbd: fix -EEXIST checking in cls::rbd::image_set

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoconfigure: Add -D_LARGEFILE64_SOURCE to Linux build. 8402/head
Ira Cooper [Thu, 31 Mar 2016 16:30:45 +0000 (12:30 -0400)]
configure: Add -D_LARGEFILE64_SOURCE to Linux build.

Without -D_LARGEFILE64_SOURCE we can't build against libxfs,
because off64_t must be defined.

Signed-off-by: Ira Cooper <ira@redhat.com>
9 years agoMerge pull request #8400 from qhjindev/fix_mon
Sage Weil [Thu, 31 Mar 2016 15:21:50 +0000 (11:21 -0400)]
Merge pull request #8400 from qhjindev/fix_mon

mon: remove unnecessary comment for update_from_paxos

9 years agoMerge pull request #8399 from oritwas/wip-cmake-mirrorwatcher
Casey Bodley [Thu, 31 Mar 2016 15:05:14 +0000 (11:05 -0400)]
Merge pull request #8399 from oritwas/wip-cmake-mirrorwatcher

cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc

9 years agomon: remove unnecessary comment for update_from_paxos 8400/head
Qinghua Jin [Thu, 31 Mar 2016 14:37:12 +0000 (22:37 +0800)]
mon: remove unnecessary comment for update_from_paxos

The return value comment for update_from_paxos is unnecessary.

Signed-off-by: Qinghua Jin <qhjin_dev@163.com>
9 years agocmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc 8399/head
Orit Wasserman [Thu, 31 Mar 2016 13:59:32 +0000 (15:59 +0200)]
cmake: add missing librbd/MirrorWatcher.cc and librd/ObjectWatcher.cc

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8394 from xiexingguo/xxg-wip-compile
Orit Wasserman [Thu, 31 Mar 2016 13:57:55 +0000 (15:57 +0200)]
Merge pull request #8394 from xiexingguo/xxg-wip-compile

rgw: fix compiling error

9 years agoMerge pull request #8358 from dachary/wip-releases
Loic Dachary [Thu, 31 Mar 2016 13:16:29 +0000 (15:16 +0200)]
Merge pull request #8358 from dachary/wip-releases

releases: what is merged where and when ?

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoreleases: what is merged where and when ? 8358/head
Loic Dachary [Tue, 29 Mar 2016 17:17:14 +0000 (19:17 +0200)]
releases: what is merged where and when ?

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoreleases: update understanding the release cycle
Loic Dachary [Tue, 29 Mar 2016 17:16:31 +0000 (19:16 +0200)]
releases: update understanding the release cycle

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agorelease-notes: v10.0.5 release notes
Loic Dachary [Tue, 29 Mar 2016 16:16:53 +0000 (18:16 +0200)]
release-notes: v10.0.5 release notes

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #7875 from badone/wip-coverity-rgw_file-unused
Orit Wasserman [Thu, 31 Mar 2016 12:52:02 +0000 (14:52 +0200)]
Merge pull request #7875 from badone/wip-coverity-rgw_file-unused

[rgw] Check return code in RGWFileHandle::write

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: fix compiling error 8394/head
xie xingguo [Thu, 31 Mar 2016 11:48:38 +0000 (19:48 +0800)]
rgw: fix compiling error

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8200 from H3C/wip-rgw-bugfixb
Orit Wasserman [Thu, 31 Mar 2016 11:43:49 +0000 (13:43 +0200)]
Merge pull request #8200 from H3C/wip-rgw-bugfixb

rgw/rgw_admin:fix bug about list and stats command
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoqa/workunits/rbd: use cluster1/2 instead local/remote as cluster names 8325/head
Mykola Golub [Thu, 31 Mar 2016 10:57:17 +0000 (13:57 +0300)]
qa/workunits/rbd: use cluster1/2 instead local/remote as cluster names

After adding tests that start daemons in both clusters, local/remote
names look confusing.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoqa/workunits/rbd: add helper to determine rbd-mirror local cluster
Mykola Golub [Thu, 31 Mar 2016 10:34:30 +0000 (13:34 +0300)]
qa/workunits/rbd: add helper to determine rbd-mirror local cluster

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoqa: update rest test cephfs calls (part 2) 8393/head
John Spray [Wed, 30 Mar 2016 10:43:22 +0000 (11:43 +0100)]
qa: update rest test cephfs calls (part 2)

"mds stat" now gives fsmap output rather than
mdsmap.  Update the rest api test's expectations.

Fixes: http://tracker.ceph.com/issues/15309
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8373 from wjwithagen/patch-4
Loic Dachary [Thu, 31 Mar 2016 10:21:56 +0000 (12:21 +0200)]
Merge pull request #8373 from wjwithagen/patch-4

ceph-detect-init/run-tox.sh: FreeBSD: No init detect

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #8387 from dreamhost/wip-mp-listpartresult-etag
Orit Wasserman [Thu, 31 Mar 2016 09:55:13 +0000 (11:55 +0200)]
Merge pull request #8387 from dreamhost/wip-mp-listpartresult-etag

rgw: Multipart ListPartsResult ETag quotes

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoqa/workunits/rbd: improvements for manual testing
Mykola Golub [Thu, 31 Mar 2016 08:42:13 +0000 (11:42 +0300)]
qa/workunits/rbd: improvements for manual testing

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agobash_completion: now bash completion uses improved "ceph --completion" 7693/head
Adam Kupczyk [Thu, 31 Mar 2016 08:08:07 +0000 (10:08 +0200)]
bash_completion: now bash completion uses improved "ceph --completion"
Signed-off-by: Adam Kupczyk <a.kupczyk@mirantis.com>
9 years agotools: Auto complete feature for CLI.
Adam Kupczyk [Thu, 18 Feb 2016 09:47:56 +0000 (10:47 +0100)]
tools: Auto complete feature for CLI.

Now logic moved from bash to python.
Not bind to bash yet. Use as 'ceph --comp osd ls'.
Able to fulfill commands and print command line help.
Signed-off-by: Adam Kupczyk <a.kupczyk@mirantis.com>
9 years agorgw: Multipart ListPartsResult ETag quotes 8387/head
Robin H. Johnson [Thu, 31 Mar 2016 06:24:40 +0000 (06:24 +0000)]
rgw: Multipart ListPartsResult ETag quotes

ListPartsResult output has always missed quotes on the ETag since it was
first committed.

Fixes: #15334
Backports: hammer, infernalis
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agoMerge pull request #8372 from jcsp/wip-15309
Sage Weil [Thu, 31 Mar 2016 05:15:38 +0000 (01:15 -0400)]
Merge pull request #8372 from jcsp/wip-15309

qa: update rest test cephfs calls

9 years agoMerge pull request #8258 from asheplyakov/bug-12065
Sage Weil [Thu, 31 Mar 2016 05:14:22 +0000 (01:14 -0400)]
Merge pull request #8258 from asheplyakov/bug-12065

monclient: avoid key renew storm on clock skew

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8348 from xiexingguo/xxg-wip-failurepending
Sage Weil [Thu, 31 Mar 2016 05:13:58 +0000 (01:13 -0400)]
Merge pull request #8348 from xiexingguo/xxg-wip-failurepending

osd: fix failure report handling during ms_handle_connect()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8369 from xiexingguo/xxg-wip-tick
Sage Weil [Thu, 31 Mar 2016 05:08:01 +0000 (01:08 -0400)]
Merge pull request #8369 from xiexingguo/xxg-wip-tick

osd: fix tick relevant issues

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8354 from tchaikov/wip-missing-cls
Sage Weil [Thu, 31 Mar 2016 05:07:17 +0000 (01:07 -0400)]
Merge pull request #8354 from tchaikov/wip-missing-cls

osd/ClassHandler: only dlclose() the classes not missing

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/filestore: fix a -Wunused-label warning in compiling. 8366/head
Dongsheng Yang [Wed, 30 Mar 2016 02:51:31 +0000 (22:51 -0400)]
os/filestore: fix a -Wunused-label warning in compiling.

os/filestore/FileStore.cc: In member function ‘int FileStore::_zero(const coll_t&, const ghobject_t&, uint64_t, size_t)’:
os/filestore/FileStore.cc:3328:2: warning: label ‘out’ defined but not used [-Wunused-label]
  out:
  ^

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
9 years agotest/objectstore: fix a -Wsign-compare warning in compiling.
Dongsheng Yang [Wed, 30 Mar 2016 02:36:49 +0000 (22:36 -0400)]
test/objectstore: fix a -Wsign-compare warning in compiling.

In file included from test/objectstore/store_test.cc:33:0:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int]’:
../src/gmock/gtest/include/gtest/gtest.h:1524:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<true>::Compare(const char*, const char*, const T1&, const T2&, typename testing::internal::EnableIf<(! testing::internal::is_pointer<T2>::value)>::type*) [with T1 = unsigned int; T2 = int; typename testing::internal::EnableIf<(! testing::internal::is_pointer<T2>::value)>::type = void]’
test/objectstore/store_test.cc:1088:285:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (expected == actual) {
                ^

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
9 years agotest/system: fix a -Wsign-compare warning in compiling.
Dongsheng Yang [Wed, 30 Mar 2016 02:28:45 +0000 (22:28 -0400)]
test/system: fix a -Wsign-compare warning in compiling.

test/system/st_rados_create_pool.cc: In function ‘std::__cxx11::string get_temp_pool_name(const char*)’:
test/system/st_rados_create_pool.cc:128:9: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   assert(ret < sizeof(poolname));
         ^

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
9 years agoMerge pull request #8355 from dillaman/wip-15029
Josh Durgin [Thu, 31 Mar 2016 01:46:11 +0000 (18:46 -0700)]
Merge pull request #8355 from dillaman/wip-15029

librbd: send notifications for mirroring status updates

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agocls_rbd: fix -EEXIST checking in cls::rbd::image_set 8371/head
runsisi [Wed, 30 Mar 2016 10:25:50 +0000 (18:25 +0800)]
cls_rbd: fix -EEXIST checking in cls::rbd::image_set

Signed-off-by: runsisi <runsisi@hust.edu.cn>
9 years agolibrados_test_stub: add new cls_cxx_read2/write2 methods 8380/head
Jason Dillaman [Wed, 30 Mar 2016 22:43:50 +0000 (18:43 -0400)]
librados_test_stub: add new cls_cxx_read2/write2 methods

Fixes: http://tracker.ceph.com/issues/15332
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_rbd: pass WILLNEED fadvise flag for object map update ops
Jason Dillaman [Wed, 30 Mar 2016 20:18:10 +0000 (16:18 -0400)]
cls_rbd: pass WILLNEED fadvise flag for object map update ops

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoobjclass: add cls_cxx_read2/cls_cxx_write2
Jason Dillaman [Wed, 30 Mar 2016 20:13:51 +0000 (16:13 -0400)]
objclass: add cls_cxx_read2/cls_cxx_write2

These new methods support passing op flags (e.g. cache hints).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8382 from athanatos/wip-15241
Sage Weil [Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)]
Merge pull request #8382 from athanatos/wip-15241

osd: fix epoch check in handle_pg_create

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoOSD::handle_pg_create: check same_primary_since 8382/head
Samuel Just [Tue, 22 Mar 2016 21:20:12 +0000 (14:20 -0700)]
OSD::handle_pg_create: check same_primary_since

Rather than add a flag to handle_pg_peering_evt, check
same_primary_since here and pass the create event to
handle_pg_peering_evt as if it originated at the current epoch (the
project_pg_history checks in handle_pg_peering_evt will be noops).

Fixes: tracker.ceph.com/issues/15241
Signed-off-by: Samuel Just <sjust@redhat.com>