]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoclient: in UserPerm, correctly use delete[] and don't leak gids on copy 11218/head
Greg Farnum [Wed, 28 Sep 2016 06:45:56 +0000 (23:45 -0700)]
client: in UserPerm, correctly use delete[] and don't leak gids on copy

gids is an array. We also need to clean it up when deep_copy()ing, which
requires initializing our member fields in the copy-constructor.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agomds: sort GID lists in MDSAuthCaps
Greg Farnum [Mon, 26 Sep 2016 23:45:43 +0000 (16:45 -0700)]
mds: sort GID lists in MDSAuthCaps

Fixes: http://tracker.ceph.com/issues/17368
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agotest: temporarily disable tests which relied on MDS' incorrect GID-adding behavior
Greg Farnum [Mon, 26 Sep 2016 21:24:05 +0000 (14:24 -0700)]
test: temporarily disable tests which relied on MDS' incorrect GID-adding behavior

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge remote-tracking branch 'origin/master' into wip-getuid
Greg Farnum [Sat, 24 Sep 2016 01:12:33 +0000 (18:12 -0700)]
Merge remote-tracking branch 'origin/master' into wip-getuid

Conflicts:
src/client/Client.cc
src/client/Client.h
src/client/Makefile.am
src/client/fuse_ll.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: use uid_t/gid_t in _getgrouplist
Greg Farnum [Wed, 21 Sep 2016 23:02:08 +0000 (16:02 -0700)]
client: use uid_t/gid_t in _getgrouplist

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agotest: basic checks on gid list is_capable
Greg Farnum [Wed, 14 Sep 2016 23:28:14 +0000 (16:28 -0700)]
test: basic checks on gid list is_capable

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agomds: do not make use of GIDs which aren't included by the Client in its request
Greg Farnum [Wed, 21 Sep 2016 21:42:16 +0000 (14:42 -0700)]
mds: do not make use of GIDs which aren't included by the Client in its request

We were previously iterating through all the GIDs allowed by a particular
MDSAuthCap::match, but there are plenty of situations where a GID might
be *allowed* but not actually assigned. Take the set intersection of what's
allowed and what's specified instead.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agomds: pass full gid list to MDSAuthCap checks, when present
Greg Farnum [Wed, 14 Sep 2016 23:19:46 +0000 (16:19 -0700)]
mds: pass full gid list to MDSAuthCap checks, when present

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agolibcephfs: repeatedly use new default_perms instead of pick_my_perms()
Greg Farnum [Mon, 12 Sep 2016 23:10:02 +0000 (16:10 -0700)]
libcephfs: repeatedly use new default_perms instead of pick_my_perms()

There's no need to invoke it each time for library-using clients. Either they've
set the default uid/gid or they haven't, and they aren't going to be switching
dynamic uid/gid a bunch either. (Right? Anyway, we want them to use the
not-here-yet functions specifying uid/gid on each call.)

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: do a shallow copy for MetaRequest::perms
Greg Farnum [Mon, 12 Sep 2016 22:42:26 +0000 (15:42 -0700)]
client: do a shallow copy for MetaRequest::perms

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: include UserPerm contents in may_* debug output
Greg Farnum [Thu, 8 Sep 2016 02:37:48 +0000 (19:37 -0700)]
client: include UserPerm contents in may_* debug output

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoClient: always pass a Fh to _do_filelock
Greg Farnum [Thu, 1 Sep 2016 23:55:00 +0000 (16:55 -0700)]
Client: always pass a Fh to _do_filelock

We weren't passing in the Fh as a signal we were releasing locks (ie, don't
remove the lock ranges in question rather than adding htem to our accounting).
But that was a little weird and doesn't work when we're pulling perms out of
the Fh.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: add a static pick_my_perms taking a CephContext
Greg Farnum [Thu, 1 Sep 2016 23:27:38 +0000 (16:27 -0700)]
client: add a static pick_my_perms taking a CephContext

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agofuse: optionally (off by default) set the group lists on calls
Greg Farnum [Sat, 6 Aug 2016 01:43:08 +0000 (18:43 -0700)]
fuse: optionally (off by default) set the group lists on calls

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: give UserPerm a move constructor
Greg Farnum [Sat, 6 Aug 2016 01:39:57 +0000 (18:39 -0700)]
client: give UserPerm a move constructor

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMClientRequest: include the full gid list of the caller
Greg Farnum [Sat, 6 Aug 2016 00:20:32 +0000 (17:20 -0700)]
MClientRequest: include the full gid list of the caller

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove the now-unused UserGroups entirely
Greg Farnum [Wed, 3 Aug 2016 22:51:01 +0000 (15:51 -0700)]
client: remove the now-unused UserGroups entirely

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: stop using UserGroups for may_setattr() now that UserPerm does it all
Greg Farnum [Wed, 3 Aug 2016 22:48:48 +0000 (15:48 -0700)]
client: stop using UserGroups for may_setattr() now that UserPerm does it all

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: Actually handle gid lists in UserPerm
Greg Farnum [Wed, 3 Aug 2016 22:48:01 +0000 (15:48 -0700)]
client: Actually handle gid lists in UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: stop using UserGroups for posix ACL checks
Greg Farnum [Wed, 3 Aug 2016 22:27:34 +0000 (15:27 -0700)]
client: stop using UserGroups for posix ACL checks

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: push UserGroups into _posix_acl_permission(), instead of passing it
Greg Farnum [Wed, 3 Aug 2016 22:05:03 +0000 (15:05 -0700)]
client: push UserGroups into _posix_acl_permission(), instead of passing it

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch Inode::check_mode() to UserPerm
Greg Farnum [Wed, 3 Aug 2016 21:57:02 +0000 (14:57 -0700)]
client: switch Inode::check_mode() to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch inode_permission() to UserPerm-based (over UserGroups)
Greg Farnum [Wed, 3 Aug 2016 21:27:02 +0000 (14:27 -0700)]
client: switch inode_permission() to UserPerm-based (over UserGroups)

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoUserPerm: add trivial implementation of UserGroup interface equivalents
Greg Farnum [Wed, 3 Aug 2016 21:54:50 +0000 (14:54 -0700)]
UserPerm: add trivial implementation of UserGroup interface equivalents

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove get_(uid|gid) functions
Greg Farnum [Wed, 3 Aug 2016 21:17:26 +0000 (14:17 -0700)]
client: remove get_(uid|gid) functions

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove now-unused uid-based may_* functions
Greg Farnum [Wed, 3 Aug 2016 21:16:10 +0000 (14:16 -0700)]
client: remove now-unused uid-based may_* functions

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to mkdirs, rmdir, symlink, mknod
Greg Farnum [Wed, 3 Aug 2016 20:44:00 +0000 (13:44 -0700)]
client: pass UserPerm to mkdirs, rmdir, symlink, mknod

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove now-unused owner_(uid|gid) from dir_result_t
Greg Farnum [Wed, 3 Aug 2016 20:12:44 +0000 (13:12 -0700)]
client: remove now-unused owner_(uid|gid) from dir_result_t

9 years agoclient: replace Inode's "best" logic with a UserPerm over gid/uid pair
Greg Farnum [Wed, 3 Aug 2016 20:06:05 +0000 (13:06 -0700)]
client: replace Inode's "best" logic with a UserPerm over gid/uid pair

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: include UserPerm.h in MetaRequest.h
Greg Farnum [Wed, 3 Aug 2016 20:04:17 +0000 (13:04 -0700)]
client: include UserPerm.h in MetaRequest.h

9 years agoclient: move UserPerm into its own header file
Greg Farnum [Wed, 3 Aug 2016 20:03:49 +0000 (13:03 -0700)]
client: move UserPerm into its own header file

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: add a UserPerm to MetaRequest
Greg Farnum [Wed, 3 Aug 2016 07:35:57 +0000 (00:35 -0700)]
client: add a UserPerm to MetaRequest

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove uid-based _create()
Greg Farnum [Wed, 3 Aug 2016 07:24:43 +0000 (00:24 -0700)]
client: remove uid-based _create()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove uid-based _geattr() functions
Greg Farnum [Wed, 3 Aug 2016 06:37:21 +0000 (23:37 -0700)]
client: remove uid-based _geattr() functions

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: call _getattr() with UserPerm in posix checkers
Greg Farnum [Wed, 3 Aug 2016 06:34:58 +0000 (23:34 -0700)]
client: call _getattr() with UserPerm in posix checkers

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch _posix_acl_create() to UserPerm
Greg Farnum [Wed, 3 Aug 2016 06:29:47 +0000 (23:29 -0700)]
client: switch _posix_acl_create() to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: use Fh::actor_perms for _read() and _write()
Greg Farnum [Wed, 3 Aug 2016 06:17:41 +0000 (23:17 -0700)]
client: use Fh::actor_perms for _read() and _write()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove uid-based path_walk()
Greg Farnum [Wed, 3 Aug 2016 05:53:05 +0000 (22:53 -0700)]
client: remove uid-based path_walk()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to get_caps_issued()
Greg Farnum [Wed, 3 Aug 2016 05:49:11 +0000 (22:49 -0700)]
client: pass UserPerm to get_caps_issued()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to describe_layout()
Greg Farnum [Wed, 3 Aug 2016 05:44:17 +0000 (22:44 -0700)]
client: pass UserPerm to describe_layout()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to ll_walk()
Greg Farnum [Wed, 3 Aug 2016 05:37:37 +0000 (22:37 -0700)]
client: pass UserPerm to ll_walk()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to all open() variants
Greg Farnum [Wed, 3 Aug 2016 05:32:56 +0000 (22:32 -0700)]
client: pass UserPerm to all open() variants

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to readlink()
Greg Farnum [Wed, 3 Aug 2016 05:14:14 +0000 (22:14 -0700)]
client: pass UserPerm to readlink()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: use UserPerm for _posix_acl_chmod
Greg Farnum [Tue, 2 Aug 2016 03:16:27 +0000 (20:16 -0700)]
client: use UserPerm for _posix_acl_chmod

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to get_quota_root() and quota helpers
Greg Farnum [Tue, 2 Aug 2016 02:54:42 +0000 (19:54 -0700)]
client: pass UserPerm to get_quota_root() and quota helpers

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: use Fh::actor_perm for _write()
Greg Farnum [Tue, 2 Aug 2016 02:55:36 +0000 (19:55 -0700)]
client: use Fh::actor_perm for _write()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: fill in _interrupt_filelock() with MetaRequest's uid/gid
Greg Farnum [Tue, 2 Aug 2016 02:17:59 +0000 (19:17 -0700)]
client: fill in _interrupt_filelock() with MetaRequest's uid/gid

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: store "actor" UserPerm in Fh, use for requesting file locks and things
Greg Farnum [Tue, 2 Aug 2016 02:15:51 +0000 (19:15 -0700)]
client: store "actor" UserPerm in Fh, use for requesting file locks and things

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: fill in cap renewals with the "best" uid/gid perms
Greg Farnum [Tue, 2 Aug 2016 02:08:07 +0000 (19:08 -0700)]
client: fill in cap renewals with the "best" uid/gid perms

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: track which request uid/gid granted a cap
Greg Farnum [Tue, 2 Aug 2016 01:49:08 +0000 (18:49 -0700)]
client: track which request uid/gid granted a cap

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to lookup_name()
Greg Farnum [Tue, 2 Aug 2016 00:49:13 +0000 (17:49 -0700)]
client: pass UserPerm to lookup_name()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to lookup_parent()
Greg Farnum [Mon, 1 Aug 2016 18:12:06 +0000 (11:12 -0700)]
client: pass UserPerm to lookup_parent()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to lookup_ino()
Greg Farnum [Sat, 30 Jul 2016 02:02:56 +0000 (19:02 -0700)]
client: pass UserPerm to lookup_ino()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to lookup_hash()
Greg Farnum [Sat, 30 Jul 2016 01:59:13 +0000 (18:59 -0700)]
client: pass UserPerm to lookup_hash()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: store UserPerms in dir_result_t and use on MDS requests
Greg Farnum [Sat, 30 Jul 2016 01:52:13 +0000 (18:52 -0700)]
client: store UserPerms in dir_result_t and use on MDS requests

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to statfs() variants
Greg Farnum [Sat, 30 Jul 2016 01:05:33 +0000 (18:05 -0700)]
client: pass UserPerm to statfs() variants

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: pass UserPerm to chdir() and getcwd()
Greg Farnum [Sat, 30 Jul 2016 00:59:28 +0000 (17:59 -0700)]
client: pass UserPerm to chdir() and getcwd()

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove uid/gid-based make_request, push up logic
Greg Farnum [Sat, 30 Jul 2016 00:11:03 +0000 (17:11 -0700)]
client: remove uid/gid-based make_request, push up logic

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove client reference from RequestUserGroups
Greg Farnum [Fri, 29 Jul 2016 23:37:43 +0000 (16:37 -0700)]
client: remove client reference from RequestUserGroups

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove spurious RequestUserGroups from xattr_permission
Greg Farnum [Fri, 29 Jul 2016 23:18:35 +0000 (16:18 -0700)]
client: remove spurious RequestUserGroups from xattr_permission

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch xattr_permission() implementation to UserPerm
Greg Farnum [Fri, 29 Jul 2016 23:05:01 +0000 (16:05 -0700)]
client: switch xattr_permission() implementation to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch _create() implementation to UserPerm
Greg Farnum [Fri, 29 Jul 2016 22:47:32 +0000 (15:47 -0700)]
client: switch _create() implementation to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch _open() implementation to UserPerm
Greg Farnum [Fri, 29 Jul 2016 22:44:09 +0000 (15:44 -0700)]
client: switch _open() implementation to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch _getattr() implementation to UserPerm
Greg Farnum [Fri, 29 Jul 2016 22:42:50 +0000 (15:42 -0700)]
client: switch _getattr() implementation to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch path_walk() implementation to UserPerm
Greg Farnum [Fri, 29 Jul 2016 22:30:10 +0000 (15:30 -0700)]
client: switch path_walk() implementation to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch _lookup() implementation to UserPerm
Greg Farnum [Fri, 29 Jul 2016 22:27:19 +0000 (15:27 -0700)]
client: switch _lookup() implementation to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch may_*() function implementations to UserPerm
Greg Farnum [Fri, 29 Jul 2016 22:21:55 +0000 (15:21 -0700)]
client: switch may_*() function implementations to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch make_request implementation and verify_reply_trace to UserPerm
Greg Farnum [Thu, 28 Jul 2016 23:26:06 +0000 (16:26 -0700)]
client: switch make_request implementation and verify_reply_trace to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch _do_lookup() to UserPerm
Greg Farnum [Fri, 29 Jul 2016 21:16:02 +0000 (14:16 -0700)]
client: switch _do_lookup() to UserPerm

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: add a UserPerm param to mount
Greg Farnum [Fri, 29 Jul 2016 21:08:52 +0000 (14:08 -0700)]
client: add a UserPerm param to mount

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove unused ll_listxattr_chunks declaration
Greg Farnum [Thu, 28 Jul 2016 23:13:09 +0000 (16:13 -0700)]
client: remove unused ll_listxattr_chunks declaration

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: switch ll_open and ll_create to be UserPerm-based
Greg Farnum [Thu, 28 Jul 2016 18:51:05 +0000 (11:51 -0700)]
client: switch ll_open and ll_create to be UserPerm-based

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: generate UserPerm _open and _create variants
Greg Farnum [Thu, 28 Jul 2016 18:42:43 +0000 (11:42 -0700)]
client: generate UserPerm _open and _create variants

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: always pass a UserPerm to seek variants
Greg Farnum [Thu, 28 Jul 2016 01:17:54 +0000 (18:17 -0700)]
client: always pass a UserPerm to seek variants

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: always pass a UserPerm to stat variants
Greg Farnum [Thu, 28 Jul 2016 00:13:03 +0000 (17:13 -0700)]
client: always pass a UserPerm to stat variants

Also remove the lstatlite() declaration, since it's not defined.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: remove non-UserPerm _setattr implementation
Greg Farnum [Thu, 28 Jul 2016 00:06:48 +0000 (17:06 -0700)]
client: remove non-UserPerm _setattr implementation

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: always pass a UserPerm to truncate variants
Greg Farnum [Wed, 27 Jul 2016 23:45:46 +0000 (16:45 -0700)]
client: always pass a UserPerm to truncate variants

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: always pass a UserPerm to utime variants
Greg Farnum [Wed, 27 Jul 2016 23:07:30 +0000 (16:07 -0700)]
client: always pass a UserPerm to utime variants

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoclient: always pass a UserPerm to chown variants
Greg Farnum [Wed, 27 Jul 2016 23:05:01 +0000 (16:05 -0700)]
client: always pass a UserPerm to chown variants

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #11122 from branch-predictor/bp-zlib-improvements
Sage Weil [Wed, 21 Sep 2016 19:48:21 +0000 (14:48 -0500)]
Merge pull request #11122 from branch-predictor/bp-zlib-improvements

compressor/zlib: switch to raw deflate

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #11108 from liewegas/wip-bluefs-dirty-fnodes
Sage Weil [Wed, 21 Sep 2016 19:47:38 +0000 (14:47 -0500)]
Merge pull request #11108 from liewegas/wip-bluefs-dirty-fnodes

os/bluestore/BlueFS: log dirty files at sync time

9 years agoMerge pull request #11173 from tchaikov/wip-17306
Kefu Chai [Wed, 21 Sep 2016 15:35:04 +0000 (23:35 +0800)]
Merge pull request #11173 from tchaikov/wip-17306

test/cli/crushtool: fix the test of compile-decompile-recompile.t

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agotest/cli/crushtool: fix the test of compile-decompile-recompile.t 11173/head
Kefu Chai [Wed, 21 Sep 2016 14:58:49 +0000 (22:58 +0800)]
test/cli/crushtool: fix the test of compile-decompile-recompile.t

should read the map from $TESTDIR,
it's a regression introduced by b2c0a07

Fixes: http://tracker.ceph.com/issues/17306
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #11166 from xiexingguo/xxg-wip-bluestore-0921
Sage Weil [Wed, 21 Sep 2016 14:11:52 +0000 (09:11 -0500)]
Merge pull request #11166 from xiexingguo/xxg-wip-bluestore-0921

os/bluestore: simplify calculation of collection key range

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #11131 from ceph/rgw-lifecycle-testing
Casey Bodley [Wed, 21 Sep 2016 14:05:57 +0000 (10:05 -0400)]
Merge pull request #11131 from ceph/rgw-lifecycle-testing

Rgw lifecycle testing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoLifecycle testing 11131/head
Daniel Gryniewicz [Thu, 14 Jul 2016 16:40:29 +0000 (12:40 -0400)]
Lifecycle testing

Add new config option - rgw_lc_debug_interval - that modifies the
lifecycle algorithm.  It treats days as being the configured number of
seconds.  This allows lifecycle to be tested in minutes, rather than
days.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoLifecycle - Fix config locking
Daniel Gryniewicz [Wed, 14 Sep 2016 17:38:36 +0000 (13:38 -0400)]
Lifecycle - Fix config locking

The lifecycle config lock was not setting a cookie.  This means that all
instances of that lock conflict, causing errors to be returned to the
client.

Set a unique cookie on each lock instance.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoMerge pull request #11031 from yangdongsheng/du
Jason Dillaman [Wed, 21 Sep 2016 12:56:05 +0000 (08:56 -0400)]
Merge pull request #11031 from yangdongsheng/du

rbd: return error if we specified a wrong image name for rbd du

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #11163 from jcsp/wip-cmake-vstart
John Spray [Wed, 21 Sep 2016 09:18:04 +0000 (10:18 +0100)]
Merge pull request #11163 from jcsp/wip-cmake-vstart

doc: Update developer docs for cmake paths

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agodoc: update vstart guide for cmake-ish paths 11163/head
John Spray [Wed, 21 Sep 2016 07:59:45 +0000 (08:59 +0100)]
doc: update vstart guide for cmake-ish paths

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agodoc: update build instructions for cmake
John Spray [Wed, 21 Sep 2016 07:54:24 +0000 (08:54 +0100)]
doc: update build instructions for cmake

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoos/bluestore: simplify calculation of collection key range 11166/head
xie xingguo [Wed, 21 Sep 2016 05:57:39 +0000 (13:57 +0800)]
os/bluestore: simplify calculation of collection key range

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #11083 from ifed01/wip-load-plugins-fix
Kefu Chai [Wed, 21 Sep 2016 03:59:55 +0000 (11:59 +0800)]
Merge pull request #11083 from ifed01/wip-load-plugins-fix

common/compressor: add libcommon as a dependency for zlib and snappy p…

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10975 from stiopaa1/osd_replicatedbackend_moveSomeClassesToCC
Kefu Chai [Wed, 21 Sep 2016 03:59:01 +0000 (11:59 +0800)]
Merge pull request #10975 from stiopaa1/osd_replicatedbackend_moveSomeClassesToCC

osd/PGBackend.h: move structs to .cc file

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #11073 from badone/wip-remove-check_disk_write_cache
Kefu Chai [Wed, 21 Sep 2016 03:58:38 +0000 (11:58 +0800)]
Merge pull request #11073 from badone/wip-remove-check_disk_write_cache

FileJournal: Remove obsolete _check_disk_write_cache function

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #11060 from stiopaa1/mon_osdmonitor_removeAssign
Kefu Chai [Wed, 21 Sep 2016 03:57:14 +0000 (11:57 +0800)]
Merge pull request #11060 from stiopaa1/mon_osdmonitor_removeAssign

mon/OSDMonitor.cc: remove use of boost assign

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #11039 from stiopaa1/osd_inprogress_removingCount
Kefu Chai [Wed, 21 Sep 2016 03:56:24 +0000 (11:56 +0800)]
Merge pull request #11039 from stiopaa1/osd_inprogress_removingCount

osd/OSD.cc: remove unneeded searching of maps

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge branch 'wip-rocksdb-librados-test'
Josh Durgin [Wed, 21 Sep 2016 03:13:44 +0000 (20:13 -0700)]
Merge branch 'wip-rocksdb-librados-test'

qa: add test of envlibrados for rocksdb

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoadd qa test of envlibrados for rocksdb
Ryne Li [Thu, 11 Aug 2016 20:33:27 +0000 (16:33 -0400)]
add qa test of envlibrados for rocksdb

Signed-off-by: Ryne Li <lizhenqiangsnake@gmail.com>
9 years agoMerge pull request #11146 from tchaikov/wip-17307
Kefu Chai [Wed, 21 Sep 2016 02:56:01 +0000 (10:56 +0800)]
Merge pull request #11146 from tchaikov/wip-17307

os/filestore/FileJournal: error out if FileJournal is not a file

Reviewed-by: David Zafman <dzafman@redhat.com>