]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agocommon/cmdparse,msg/async: remove unnecessary std::move() 11638/head
Kefu Chai [Tue, 25 Oct 2016 08:25:39 +0000 (16:25 +0800)]
common/cmdparse,msg/async: remove unnecessary std::move()

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agotest/encoding: fix the build with clang
Kefu Chai [Tue, 25 Oct 2016 04:26:20 +0000 (12:26 +0800)]
test/encoding: fix the build with clang

put the overloaded operator<<() into namespace std, so clang's name
resolution is able to find it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: add definitions for glibc
Kefu Chai [Tue, 25 Oct 2016 04:20:51 +0000 (12:20 +0800)]
cmake: add definitions for glibc

"-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" is not for gcc, it's for glibc
actually. so enable it on LINUX.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoinclude/denc: cast (possible) ints to bool in enable_if
Sage Weil [Fri, 21 Oct 2016 22:15:46 +0000 (18:15 -0400)]
include/denc: cast (possible) ints to bool in enable_if

This makes clang happy.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11036 from tomy-ac/wip-tc-rados_append
Yuri Weinstein [Mon, 24 Oct 2016 21:45:42 +0000 (14:45 -0700)]
Merge pull request #11036 from tomy-ac/wip-tc-rados_append

Added append functionality to rados tool.

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11221 from stiopaa1/osd_osdmap_removeUseOfCount
Yuri Weinstein [Mon, 24 Oct 2016 21:45:00 +0000 (14:45 -0700)]
Merge pull request #11221 from stiopaa1/osd_osdmap_removeUseOfCount

osd/OSDMap.cc: remove unneeded use of count

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11388 from ukernel/wip-17177
Yuri Weinstein [Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)]
Merge pull request #11388 from ukernel/wip-17177

os/ObjectStore: properly clear object map when replaying OP_REMOVE

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11143 from kylinstorage/wip-fix-write-hang
Kefu Chai [Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)]
Merge pull request #11143 from kylinstorage/wip-fix-write-hang

osd: fix rados write op hang

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #11532 from javeme/run_in_thread-return
Kefu Chai [Mon, 24 Oct 2016 16:15:30 +0000 (00:15 +0800)]
Merge pull request #11532 from javeme/run_in_thread-return

pybind: avoid "exception 'int' object is not iterable"

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11610 from liewegas/wip-mon-forward-features
Sage Weil [Mon, 24 Oct 2016 16:10:54 +0000 (11:10 -0500)]
Merge pull request #11610 from liewegas/wip-mon-forward-features

messages/MForward: reencode forwarded message if target has differing features

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomsg/Message: fix set_middle vs throttler 11610/head
Sage Weil [Sun, 23 Oct 2016 23:10:00 +0000 (18:10 -0500)]
msg/Message: fix set_middle vs throttler

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomsg: adjust byte_throttler from Message::encode
Sage Weil [Sun, 23 Oct 2016 23:40:57 +0000 (18:40 -0500)]
msg: adjust byte_throttler from Message::encode

Normally we never call encode on a message that has a byte_throttler set
because we only use it for messages we received.  However, for forwarded
messages that we clear_payload() before resending, we *do* reencode, and in
that case we need to retake the appropriate number of bytes from the
throttler--just like we release them in clear_payload().

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomessages/MForward: reencode forwarded message if target has differing features
Sage Weil [Sat, 22 Oct 2016 18:01:34 +0000 (14:01 -0400)]
messages/MForward: reencode forwarded message if target has differing features

This ensures we reencode the payload with the
appropriate set of features if the client, us, or the
target do not have identical features.  Otherwise we
may forward an encoding with more features than the
target can handle.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11595 from liewegas/wip-move-ranges
Sage Weil [Mon, 24 Oct 2016 16:08:06 +0000 (11:08 -0500)]
Merge pull request #11595 from liewegas/wip-move-ranges

os: fix offsets for move_ranges operation

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11160 from VictorDenisov/consistency_groups_namespaces
Jason Dillaman [Mon, 24 Oct 2016 15:55:48 +0000 (11:55 -0400)]
Merge pull request #11160 from VictorDenisov/consistency_groups_namespaces

librbd: add support for snapshot namespaces

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agomds: fix compile error from merges
John Spray [Mon, 24 Oct 2016 12:36:32 +0000 (13:36 +0100)]
mds: fix compile error from merges

Two patches both added these definitions
in slightly different places, so git let them
merge without a conflict.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge remote-tracking branch 'ukernel/wip-mdstypes-split'
John Spray [Mon, 24 Oct 2016 11:02:48 +0000 (12:02 +0100)]
Merge remote-tracking branch 'ukernel/wip-mdstypes-split'

8 years agoMerge pull request #11576 from ukernel/wip-17636-debug
John Spray [Mon, 24 Oct 2016 11:00:48 +0000 (12:00 +0100)]
Merge pull request #11576 from ukernel/wip-17636-debug

mds: add debug assertion for issue #17636

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11578 from jcsp/wip-backtrace-repair
John Spray [Mon, 24 Oct 2016 10:53:47 +0000 (11:53 +0100)]
Merge pull request #11578 from jcsp/wip-backtrace-repair

mds: repair backtraces during scrub

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11596 from liewegas/wip-osdmap-features
Sage Weil [Mon, 24 Oct 2016 10:28:44 +0000 (05:28 -0500)]
Merge pull request #11596 from liewegas/wip-osdmap-features

mon/OSDMonitor: encode OSDMap::Incremental with same features as OSDMap

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agounittest_bluestore_types: fix csum const name
Sage Weil [Fri, 21 Oct 2016 16:46:11 +0000 (12:46 -0400)]
unittest_bluestore_types: fix csum const name

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge branch 'wip-bluestore-per-pool-compress2' of https://github.com/ifed01/ceph
Sage Weil [Mon, 24 Oct 2016 09:57:34 +0000 (04:57 -0500)]
Merge branch 'wip-bluestore-per-pool-compress2' of https://github.com/ifed01/ceph

8 years agoMerge pull request #8751 from flyd1005/wip-fix-typo
Kefu Chai [Mon, 24 Oct 2016 03:15:12 +0000 (11:15 +0800)]
Merge pull request #8751 from flyd1005/wip-fix-typo

doc: fix typos

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #10955 from objoo/YD-mailmap-updates-Sept
Loic Dachary [Sun, 23 Oct 2016 21:32:34 +0000 (23:32 +0200)]
Merge pull request #10955 from objoo/YD-mailmap-updates-Sept

mailmap updates sept

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11607 from xiexingguo/xxg-wip-bluestore-1022
Sage Weil [Sat, 22 Oct 2016 14:54:54 +0000 (09:54 -0500)]
Merge pull request #11607 from xiexingguo/xxg-wip-bluestore-1022

os/bluestore: simplify can_split_at()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: literal changes 11607/head
xie xingguo [Sat, 22 Oct 2016 06:14:41 +0000 (14:14 +0800)]
os/bluestore: literal changes
1. drop redundant semicolon
2. fix wrong output message

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agocls_rbd: Allow snapshots with the same name in different namespaces 11160/head
Victor Denisov [Thu, 20 Oct 2016 00:31:31 +0000 (17:31 -0700)]
cls_rbd: Allow snapshots with the same name in different namespaces

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
8 years agorbd: Use user snapshot namespace in rbd_mirror for now
Victor Denisov [Wed, 21 Sep 2016 04:36:26 +0000 (21:36 -0700)]
rbd: Use user snapshot namespace in rbd_mirror for now

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
8 years agolibrbd: By default create snapshots in UserNamespace
Victor Denisov [Wed, 21 Sep 2016 04:35:30 +0000 (21:35 -0700)]
librbd: By default create snapshots in UserNamespace

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
8 years agocls_rbd: Add snapshot namespaces data structures
Victor Denisov [Wed, 21 Sep 2016 04:30:56 +0000 (21:30 -0700)]
cls_rbd: Add snapshot namespaces data structures

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
8 years agoos/bluestore: simplify can_split_at()
xie xingguo [Sat, 22 Oct 2016 02:33:20 +0000 (10:33 +0800)]
os/bluestore: simplify can_split_at()

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11026 from jcsp/wip-pg-files
Gregory Farnum [Fri, 21 Oct 2016 21:48:31 +0000 (14:48 -0700)]
Merge pull request #11026 from jcsp/wip-pg-files

tools/cephfs: add pg_files command

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11456 from tchaikov/wip-17558
Gregory Farnum [Fri, 21 Oct 2016 21:40:46 +0000 (14:40 -0700)]
Merge pull request #11456 from tchaikov/wip-17558

mon: send updated monmap to its subscribers

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11599 from tanghaodong25/wip-2q-cache
Sage Weil [Fri, 21 Oct 2016 20:14:45 +0000 (15:14 -0500)]
Merge pull request #11599 from tanghaodong25/wip-2q-cache

os/bluestore: make 2q cache kin/kout size tunable

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11603 from liewegas/wip-bluestore-obj-remove
Sage Weil [Fri, 21 Oct 2016 19:45:08 +0000 (14:45 -0500)]
Merge pull request #11603 from liewegas/wip-bluestore-obj-remove

os/bluestore: clear extent map on object removal

8 years agoMerge pull request #11597 from ifed01/wip-bluestore-reshard-fix
Sage Weil [Fri, 21 Oct 2016 19:43:16 +0000 (14:43 -0500)]
Merge pull request #11597 from ifed01/wip-bluestore-reshard-fix

os/bluestore: fix lack of resharding

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: clear extent map on object removal 11603/head
Sage Weil [Fri, 21 Oct 2016 19:42:19 +0000 (15:42 -0400)]
os/bluestore: clear extent map on object removal

Clear ExtentMap (esp shards, etc.) when an object is removed.  Otherwise
if we recreate it we will have stale state (like the shards vector or
inline_bl) that are bogus.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11230 from yehudasa/wip-rgw-resharding
Orit Wasserman [Fri, 21 Oct 2016 17:49:41 +0000 (19:49 +0200)]
Merge pull request #11230 from yehudasa/wip-rgw-resharding

rgw: bucket resharding
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoos/bluestore: make 2q cache kin/kout size tunable 11599/head
haodong [Fri, 21 Oct 2016 06:05:56 +0000 (14:05 +0800)]
os/bluestore: make 2q cache kin/kout size tunable

default kin/hot queue size is 50% of max buffer size.
50% is a better choice for the number of page slot in kout.
we make it tunable.

Signed-off-by: Haodong Tang <haodong.tang@intel.com>
8 years agoos/bluestore: fix black of resharding 11597/head
Igor Fedotov [Fri, 21 Oct 2016 16:30:36 +0000 (16:30 +0000)]
os/bluestore: fix black of resharding

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agomon/OSDMonitor: encode OSDMap::Incremental with same features as OSDMap 11596/head
Sage Weil [Fri, 21 Oct 2016 16:25:08 +0000 (12:25 -0400)]
mon/OSDMonitor: encode OSDMap::Incremental with same features as OSDMap

The Incremental encode stashes encode_features, which is
what we use later to reencode the updated OSDMap.  Use
the same features so that the encoding will match!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos: fix offsets in move_ranges 11595/head
Sage Weil [Fri, 21 Oct 2016 16:07:05 +0000 (12:07 -0400)]
os: fix offsets in move_ranges

This simplifies the interface, and avoids problems in
bluestore with alignment.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11566 from oritwas/wip-rgw-put-acl-underscore
Casey Bodley [Fri, 21 Oct 2016 16:00:53 +0000 (12:00 -0400)]
Merge pull request #11566 from oritwas/wip-rgw-put-acl-underscore

rgw: fix put_acls for objects starting and ending with underscore

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #11591 from liewegas/wip-bluestore-test-dev
Sage Weil [Fri, 21 Oct 2016 15:57:26 +0000 (10:57 -0500)]
Merge pull request #11591 from liewegas/wip-bluestore-test-dev

ceph_test_objectstore: smaller device

8 years agoMerge pull request #11444 from cbodley/wip-rgw-get-system-obj
Orit Wasserman [Fri, 21 Oct 2016 15:25:17 +0000 (17:25 +0200)]
Merge pull request #11444 from cbodley/wip-rgw-get-system-obj

rgw: get_system_obj does not use result of get_system_obj_state
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11588 from xiexingguo/wip-fix-fastinfo-id
Sage Weil [Fri, 21 Oct 2016 13:56:08 +0000 (08:56 -0500)]
Merge pull request #11588 from xiexingguo/wip-fix-fastinfo-id

osd: fix duplicated id of incompat feature "fastinfo"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoceph_test_objectstore: smaller device 11591/head
Sage Weil [Fri, 21 Oct 2016 13:17:30 +0000 (09:17 -0400)]
ceph_test_objectstore: smaller device

This is faster.  The bitmap has to be scanned during
startup and fsck and that's slow.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomds: repair backtraces during scrub 11578/head
John Spray [Thu, 20 Oct 2016 10:49:42 +0000 (11:49 +0100)]
mds: repair backtraces during scrub

Fixes: http://tracker.ceph.com/issues/17639
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11575 from ceph/wip-17260
Kefu Chai [Fri, 21 Oct 2016 03:54:53 +0000 (11:54 +0800)]
Merge pull request #11575 from ceph/wip-17260

cmake: link tests against static librados

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #10490 from Yan-waller/yj-wip-msgtest-0729
xiexingguo [Fri, 21 Oct 2016 03:01:32 +0000 (11:01 +0800)]
Merge pull request #10490 from Yan-waller/yj-wip-msgtest-0729

msg/test: fix the guided compile-command to ceph_test_msgr

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd: fix duplicated id of incompat feature "fastinfo" 11588/head
xie xingguo [Fri, 21 Oct 2016 02:38:23 +0000 (10:38 +0800)]
osd: fix duplicated id of incompat feature "fastinfo"

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11436 from chhabaramesh/master
Sage Weil [Fri, 21 Oct 2016 01:26:16 +0000 (20:26 -0500)]
Merge pull request #11436 from chhabaramesh/master

kv/MemDB: making memdb code adapt to generic maps

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11455 from stiopaa1/mds_mutation_simplifyConstructors
John Spray [Thu, 20 Oct 2016 21:55:17 +0000 (23:55 +0200)]
Merge pull request #11455 from stiopaa1/mds_mutation_simplifyConstructors

mds/Mutation.h: simplify constructors

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11509 from stiopaa1/mds_fsmapuser_makeAssignCopyDefault
John Spray [Thu, 20 Oct 2016 21:43:58 +0000 (23:43 +0200)]
Merge pull request #11509 from stiopaa1/mds_fsmapuser_makeAssignCopyDefault

mds/FSMapUser.h: remove copy ctr and assign op

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #10359 from songbaisen/b11
Yuri Weinstein [Thu, 20 Oct 2016 21:34:34 +0000 (14:34 -0700)]
Merge pull request #10359 from songbaisen/b11

mon:  paxos add the timeout function when peon recovery

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
8 years agoMerge pull request #11165 from xiexingguo/xxg-wip-throttle-0921
Yuri Weinstein [Thu, 20 Oct 2016 21:33:08 +0000 (14:33 -0700)]
Merge pull request #11165 from xiexingguo/xxg-wip-throttle-0921

common/throttle: simplify Throttle::_wait()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11583 from stiopaa1/mds_snapserver_addOverride
John Spray [Thu, 20 Oct 2016 21:21:28 +0000 (23:21 +0200)]
Merge pull request #11583 from stiopaa1/mds_snapserver_addOverride

mds/SnapServer.h: add override to virtual functs

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11523 from stiopaa1/mds_migrator_removeUnneededCount
John Spray [Thu, 20 Oct 2016 21:14:58 +0000 (23:14 +0200)]
Merge pull request #11523 from stiopaa1/mds_migrator_removeUnneededCount

mds/Migrator.cc: remove unneeded use of count

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11543 from batrick/cdir-unique-ptr
John Spray [Thu, 20 Oct 2016 21:14:26 +0000 (23:14 +0200)]
Merge pull request #11543 from batrick/cdir-unique-ptr

mds: use unique_ptr to simplify resource mgmt

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11581 from yehudasa/wip-17635
Casey Bodley [Thu, 20 Oct 2016 21:14:06 +0000 (17:14 -0400)]
Merge pull request #11581 from yehudasa/wip-17635

rgw: handle empty POST condition

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #11565 from stiopaa1/mds_sessionmap_removeUnneededFunction
John Spray [Thu, 20 Oct 2016 21:04:17 +0000 (23:04 +0200)]
Merge pull request #11565 from stiopaa1/mds_sessionmap_removeUnneededFunction

mds/SessionMap.h: remove unneeded function

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agorgw: handle empty POST condition 11581/head
Yehuda Sadeh [Thu, 20 Oct 2016 17:17:36 +0000 (10:17 -0700)]
rgw: handle empty POST condition

Fixes: http://tracker.ceph.com/issues/17635
Before accessing json entity, need to check that iterator is valid.
If there is no entry return appropriate error code.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agomds/SnapServer.h: add override to virtual functs 11583/head
Michal Jarzabek [Thu, 20 Oct 2016 19:03:30 +0000 (20:03 +0100)]
mds/SnapServer.h: add override to virtual functs

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #11580 from cbodley/wip-rgw-deadlock-dump-crs
Yehuda Sadeh [Thu, 20 Oct 2016 18:36:51 +0000 (11:36 -0700)]
Merge pull request #11580 from cbodley/wip-rgw-deadlock-dump-crs

rgw: dump remaining coroutines when cr deadlock is detected

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11526 from ukernel/wip-17591
Gregory Farnum [Thu, 20 Oct 2016 16:39:00 +0000 (09:39 -0700)]
Merge pull request #11526 from ukernel/wip-17591

client: get caller's uid/gid on every libcephfs operation

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agorgw: dump remaining coroutines when cr deadlock is detected 11580/head
Casey Bodley [Wed, 19 Oct 2016 17:01:39 +0000 (13:01 -0400)]
rgw: dump remaining coroutines when cr deadlock is detected

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #11553 from Aran85/wip-datasync-status
Casey Bodley [Thu, 20 Oct 2016 15:13:07 +0000 (11:13 -0400)]
Merge pull request #11553 from Aran85/wip-datasync-status

rgw multisite: fix the increamtal bucket sync init

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #11577 from jcsp/wip-17636
Kefu Chai [Thu, 20 Oct 2016 14:50:20 +0000 (22:50 +0800)]
Merge pull request #11577 from jcsp/wip-17636

denc: don't pass null instances into encoder fns

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoinclude/fs_types: fix crash in inodeno_t encode 11577/head
John Spray [Thu, 20 Oct 2016 14:14:07 +0000 (15:14 +0100)]
include/fs_types: fix crash in inodeno_t encode

Passing by value tries to copy from a null and segfaults.

Fixes: http://tracker.ceph.com/issues/17636
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11055 from gcharot/ceph-lazy
Loic Dachary [Thu, 20 Oct 2016 14:21:34 +0000 (16:21 +0200)]
Merge pull request #11055 from gcharot/ceph-lazy

Adding ceph-lazy tool

Reviewed-by: Sébastien Han <han.sebastien@gmail.com>
8 years agoMerge pull request #8316 from dx9/wip-ceph-detect-init
Loic Dachary [Thu, 20 Oct 2016 11:02:44 +0000 (13:02 +0200)]
Merge pull request #8316 from dx9/wip-ceph-detect-init

ceph_detect_init: add support for Alpine

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agomds: add debug assertion for issue #17636 11576/head
Yan, Zheng [Thu, 20 Oct 2016 09:42:08 +0000 (17:42 +0800)]
mds: add debug assertion for issue #17636

Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #11520 from dillaman/wip-17590
Venky Shankar [Thu, 20 Oct 2016 09:26:50 +0000 (14:56 +0530)]
Merge pull request #11520 from dillaman/wip-17590

journal: do not prematurely flag object recorder as closed

8 years agoMerge pull request #11480 from dillaman/wip-17566
Kefu Chai [Thu, 20 Oct 2016 09:13:15 +0000 (17:13 +0800)]
Merge pull request #11480 from dillaman/wip-17566

test: TestJournalReplay test cases need to wait for event commit

Reviewed-by: Venky Shankar <vshankar@redhat.com>
8 years agotest/encoding: do not include unused headers 11575/head
Kefu Chai [Thu, 20 Oct 2016 08:51:16 +0000 (16:51 +0800)]
test/encoding: do not include unused headers

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: link against rados_a instead of its objs
Kefu Chai [Thu, 20 Oct 2016 08:43:42 +0000 (16:43 +0800)]
cmake: link against rados_a instead of its objs

prior to this change, librbd tests link against librados_api_obj and
librados_objs, but since librados_a offers all the goodies, we can
just link against it instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: librados depends on osdc implicitly
Kefu Chai [Thu, 20 Oct 2016 07:58:13 +0000 (15:58 +0800)]
cmake: librados depends on osdc implicitly

so no need to put add_dependencies() explicitly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: do not link against global if not necessary
Kefu Chai [Thu, 20 Oct 2016 07:51:43 +0000 (15:51 +0800)]
cmake: do not link against global if not necessary

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: link tests against static librados
Kefu Chai [Thu, 20 Oct 2016 07:46:09 +0000 (15:46 +0800)]
cmake: link tests against static librados

Fixes: http://tracker.ceph.com/issues/17260
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocmake: always create static lib librados_a
Kefu Chai [Thu, 20 Oct 2016 07:21:19 +0000 (15:21 +0800)]
cmake: always create static lib librados_a

so tests referencing internal symbols can use librados_a instead of
librados to avoid violating ODR (one definition rule).

Fixes: http://tracker.ceph.com/issues/17260
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agopybind: return a tuple in run_in_thread() if interrupted 11532/head
Javeme [Tue, 18 Oct 2016 12:54:24 +0000 (20:54 +0800)]
pybind: return a tuple in run_in_thread() if interrupted

Callers expect run_in_thread() to return a tuple, but it
returns an int. When interrupt the function it would raise
an iterable exception.

This patch fix the bug, and it would just output a message
like: "Error EINTR: Interrupted!"

Signed-off-by: Javeme <javaloveme@gmail.com>
8 years agoMerge pull request #11175 from asheplyakov/wip-rbd-default-features 11572/head
Jason Dillaman [Thu, 20 Oct 2016 01:25:41 +0000 (21:25 -0400)]
Merge pull request #11175 from asheplyakov/wip-rbd-default-features

librbd: parse rbd_default_features config option as a string

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agorgw multisite: fix the increamtal bucket sync init 11553/head
Zengran Zhang [Wed, 19 Oct 2016 09:05:27 +0000 (17:05 +0800)]
rgw multisite: fix the increamtal bucket sync init

in the `RGWBucketShardFullSyncCR::operate`, inc_marker will assigned with remote bilog's max_marker.
but the sync_status's inc_marker cant be assigned.so the next step inc sync will always sync
from null log,which means at beginning log.

Fixes: http://tracker.ceph.com/issues/17624
Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
8 years agoMerge pull request #11567 from ceph/wip-master-rgw-0lenfix2
Yehuda Sadeh [Wed, 19 Oct 2016 23:31:35 +0000 (16:31 -0700)]
Merge pull request #11567 from ceph/wip-master-rgw-0lenfix2

Don't loop forever when reading data from 0 sized segment.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoDon't loop forever when reading data from 0 sized segment. 11567/head
Marcus Watts [Fri, 14 Oct 2016 01:12:36 +0000 (21:12 -0400)]
Don't loop forever when reading data from 0 sized segment.

The 0 sized segment can arise depending on how
the client uploads the object in the first place.
The cpu loop then happens during a swift `GET'.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
8 years agotools/cephfs: add pg_files command 11026/head
John Spray [Thu, 8 Sep 2016 22:58:26 +0000 (23:58 +0100)]
tools/cephfs: add pg_files command

Sometimes users know that particular data pool PGs
have been damaged, and they would like to scan
their files to work out which ones might have
been affected.

Fixes: http://tracker.ceph.com/issues/17249
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agolibcephfs: take ref when constructed with CephContext
John Spray [Thu, 8 Sep 2016 17:35:15 +0000 (18:35 +0100)]
libcephfs: take ref when constructed with CephContext

Previously, if you used ceph_create_with_context, then
it would try and destroy your context when you called
ceph_release.  Bad behaviour: caller created the
context, caller should decide when to destroy it.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agorgw: fix put_acls for objects starting and ending with underscore 11566/head
Orit Wasserman [Wed, 19 Oct 2016 19:51:01 +0000 (21:51 +0200)]
rgw: fix put_acls for objects starting and ending with underscore

Fixes: http://tracker.ceph.com/issues/17625
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11541 from stiopaa1/mds_sessionmap_addConst
John Spray [Wed, 19 Oct 2016 19:15:18 +0000 (21:15 +0200)]
Merge pull request #11541 from stiopaa1/mds_sessionmap_addConst

mds/SessionMap: add const to member functions

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agounittest_bluestore_types: add random put_ref test case
Sage Weil [Wed, 19 Oct 2016 18:13:20 +0000 (14:13 -0400)]
unittest_bluestore_types: add random put_ref test case

This appeared to fail under load, but works fine here.
:/

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agounittest_bluestore_types: fix gc tests
Sage Weil [Wed, 19 Oct 2016 18:12:42 +0000 (14:12 -0400)]
unittest_bluestore_types: fix gc tests

In ef8989ce7417034aa715de4fe83d1f0363c044f4 we disabled
gc for non-compressed blobs.  So mark these test ones as
compressed.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agorgw_admin: add a few admin commands to the usage 11230/head
Yehuda Sadeh [Tue, 4 Oct 2016 00:00:41 +0000 (17:00 -0700)]
rgw_admin: add a few admin commands to the usage

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw_admin: add bi purge command
Yehuda Sadeh [Mon, 3 Oct 2016 23:43:44 +0000 (16:43 -0700)]
rgw_admin: add bi purge command

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw: bucket resharding, adjust logging
Yehuda Sadeh [Wed, 28 Sep 2016 19:54:47 +0000 (12:54 -0700)]
rgw: bucket resharding, adjust logging

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agocls/rgw: bi_list() fix is_truncated returned param
Yehuda Sadeh [Wed, 28 Sep 2016 17:41:45 +0000 (10:41 -0700)]
cls/rgw: bi_list() fix is_truncated returned param

is_truncated was never set. Also, make sure that we don't return
more entries than requested.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw_admin: require --yes-i-really-mean-it for bucket reshard
Yehuda Sadeh [Tue, 27 Sep 2016 22:13:37 +0000 (15:13 -0700)]
rgw_admin: require --yes-i-really-mean-it for bucket reshard

in the case where num shards are less or equal to current bucket

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw_admin: better bucket reshard logging
Yehuda Sadeh [Tue, 27 Sep 2016 21:35:31 +0000 (14:35 -0700)]
rgw_admin: better bucket reshard logging

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw: limit bucket reshard num shards to max possible
Yehuda Sadeh [Tue, 27 Sep 2016 21:11:41 +0000 (14:11 -0700)]
rgw: limit bucket reshard num shards to max possible

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw_admin: fix bi list command
Yehuda Sadeh [Tue, 27 Sep 2016 18:55:32 +0000 (11:55 -0700)]
rgw_admin: fix bi list command

Changes scoping of json section, and push the --object param in so that
an object can be specified as a filter.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw_admin: use aio operations for bucket resharding
Yehuda Sadeh [Mon, 26 Sep 2016 22:49:37 +0000 (15:49 -0700)]
rgw_admin: use aio operations for bucket resharding

also created shards manager to make things slightly cleaner

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>