Commit Graph

89746 Commits

Author SHA1 Message Date
songweibin
dec2ea83cf tools/rbd: support group snap rollback CLI
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:15 +08:00
songweibin
908fcd39b1 librbd: minor cleanup in api/Group.cc
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:15 +08:00
songweibin
680e86e6fb librbd: add group snap rollback method
Fixes: http://tracker.ceph.com/issues/23550

Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:14 +08:00
Sage Weil
88df536908 Merge PR #23540 into master
* refs/pull/23540/head:
	include/ceph_fs: rename old auid field
	PendingReleaseNotes: note about auid support removal
	radosgw-admin: remove -a --auth-uid arg
	rgw: remove auid member from RGWUserInfo
	auth: remove auid member from EntityAuth
	osd: remove auid session member
	mon: remove auid session member
	doc/dev/cephx_protocol: drop auid reference
	auth: remove auid args from handle_request and verify_authorizer
	mon/OSDMonitor: remove 'osd pool {get,set} <name> auid ...'
	mon/OSDMonitor: remove auid arg for 'osd lspools' and deprecate
	osd/OSDCap: remove auid from grammar
	osd/OSDCap: remove auid from is_capable() etc args
	auth: clean up cap parse error messages
	mon/AuthMonitor: raise health warning on invalid caps
	mon/AuthMonitor: drop ancient auth inc encoding compat
	messages/MPoolOp: drop auid member
	osdc/Objecter: drop change_pool_auid
	pybind/rados: drop auid arg to pool_create
	pybind/rados: drop change_auid
	rados: drop mkpool, rmpool commands
	rados: remove 'chown' command
	librados: deprecate calls that take auid
	librados: mark all auid calls deprecated
	mon/OSDMonitor: drop variable pool auid for prepare_new_pool
	mon/OSDMonitor: remove pool auid change support
	osdc/Objecter: do not pass auid to create_pool
	ceph-authtool: remove auid options
	qa/workunits/cephtool: remove auid tests

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2018-09-01 15:53:31 -05:00
Sage Weil
38817df0e9 Merge PR #23739 into master
* refs/pull/23739/head:
	mgr/telemetry: add crashdump info to report

Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-01 15:53:26 -05:00
Sage Weil
012d03b30b Merge PR #23766 into master
* refs/pull/23766/head:
	BlueStore: Fix concurrency conflicts

Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-01 15:53:21 -05:00
Ilya Dryomov
33fea11ebf
Merge pull request #23841 from idryomov/wip-krbd-namespaces
krbd: support for images within namespaces

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-01 11:39:40 +02:00
Xie Xingguo
0857124d23
Merge pull request #23663 from xiexingguo/wip-incompat-async-fixes
osd: some recovery improvements and cleanups


Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-01 14:27:27 +08:00
Kefu Chai
e461ea6859
Merge pull request #23837 from rjfd/wip-update-dmclock
dmclock: update dmclock submodule sha1 to tip of ceph/dmclock.git master

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-01 14:01:14 +08:00
Sage Weil
53e1b87455 include/ceph_fs: rename old auid field
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
bc858eac63 PendingReleaseNotes: note about auid support removal
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
487cfabc4f radosgw-admin: remove -a --auth-uid arg
It was already a no-op.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
b700f0fbfd rgw: remove auid member from RGWUserInfo
Unused.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
5df1a2ee9e auth: remove auid member from EntityAuth
Note that for the keyring we still accept (but ignore) auid lines so that
we can parse old keyrings that have them.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
c2e6044034 osd: remove auid session member
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
6120a1467b mon: remove auid session member
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
3ebdd47737 doc/dev/cephx_protocol: drop auid reference
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
3752b67ec9 auth: remove auid args from handle_request and verify_authorizer
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
b83b4d5874 mon/OSDMonitor: remove 'osd pool {get,set} <name> auid ...'
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
c2457ffbac mon/OSDMonitor: remove auid arg for 'osd lspools' and deprecate
Use 'osd pool ls' instead.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
0ce73796fd osd/OSDCap: remove auid from grammar
This is an incompatible change: old caps that include auid will no longer
parse.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
027bbe7223 osd/OSDCap: remove auid from is_capable() etc args
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
e0b59e91d1 auth: clean up cap parse error messages
Consistent formatted.  Drop newline.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Sage Weil
35820f4b88 mon/AuthMonitor: raise health warning on invalid caps
Raise a health warning if we have invalid (unparsable) caps in the auth
database.  Include a simple test.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 15:54:58 -05:00
Jason Dillaman
ef61fbc0c6
Merge pull request #23840 from idryomov/wip-krbd-untar-build-packages
qa: rbd_workunit_kernel_untar_build: install build dependencies

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-08-31 13:53:39 -04:00
Jason Dillaman
72323c7ab8
Merge pull request #22983 from trociny/wip-journal-limit-inflight-appends
librbd: optionally limit journal in-flight appends

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-08-31 13:32:34 -04:00
Jason Dillaman
9abe3c2040
Merge pull request #23770 from Songweibin/wip-rbd-namespace
rbd: correct parameter of namespace and verify it before set_namespace

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-08-31 13:32:15 -04:00
Ilya Dryomov
0a037ef15d krbd: support for images within namespaces
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-08-31 16:29:22 +02:00
Ilya Dryomov
f4db03d278 krbd: create udev_enumerate in enumerate_devices()
Make it easier to run more than one scan in a row.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-08-31 16:29:22 +02:00
Ilya Dryomov
95b9740a68 krbd: introduce krbd_spec
Don't substitute "@-" for HEAD when printing the spec.  Instead, omit
the snapshot part.  The same would be done for the namespace part.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-08-31 16:29:22 +02:00
Ilya Dryomov
faa7a3ce97 krbd: change krbd_unmap_by_spec() to take "" instead of NULL
krbd_map() and krbd_is_mapped() take "", krbd_unmap_by_spec() is the
odd one out.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-08-31 16:29:22 +02:00
Ilya Dryomov
4251a08561 krbd: remove unused include
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-08-31 16:29:22 +02:00
Sage Weil
4fe8cef327 mon/AuthMonitor: drop ancient auth inc encoding compat
This is for *ancient* mons (I'm guessing bobtail?).

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
9fd2e0bc43 messages/MPoolOp: drop auid member
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
360c3b33f4 osdc/Objecter: drop change_pool_auid
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
1cbca88f83 pybind/rados: drop auid arg to pool_create
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
c3ec044415 pybind/rados: drop change_auid
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
2c26fb0fe1 rados: drop mkpool, rmpool commands
- mkpool and rmpool users should use the normal cli/mon commands

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
d213b2531f rados: remove 'chown' command
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:27:36 -05:00
Sage Weil
0c330c211a librados: deprecate calls that take auid
Return EOPNOTSUPP for auid-specific calls, or EINVAL for ones that get a non-default
auid value.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Sage Weil
89439b5be3 librados: mark all auid calls deprecated
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Sage Weil
c4cad29d25 mon/OSDMonitor: drop variable pool auid for prepare_new_pool
Always set to 0 for now.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Sage Weil
64a174e32a mon/OSDMonitor: remove pool auid change support
EOPNOTSUPP

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Sage Weil
0d0e7c2192 osdc/Objecter: do not pass auid to create_pool
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Sage Weil
d6def8ba11 ceph-authtool: remove auid options
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Sage Weil
eaca033d17 qa/workunits/cephtool: remove auid tests
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-31 09:26:19 -05:00
Ilya Dryomov
a4df8c3562 qa: rbd_workunit_kernel_untar_build: install build dependencies
Commit f0fe0936e6 ("qa: use recent kernel to kernel build testing")
bumped the kernel to 4.17.

Fixes: http://tracker.ceph.com/issues/35074
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-08-31 14:31:03 +02:00
Kefu Chai
527415b818
Merge pull request #23838 from wjwithagen/wjw-fix-ConfUtil
common: Reverse deleted include

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-08-31 20:17:33 +08:00
Willem Jan Withagen
2b1bc4160e common: Reverse deleted include
Reversing 1 delete from
09d3f546b3

Clang trips over this:
home/jenkins/workspace/ceph-master/src/common/ConfUtils.cc:94:19: error: implicit instantiation of undefined template 'std::__1::basic_ostringstream<char, std::
__1::char_traits<char>, std::__1::allocator<char> >'
    ostringstream oss;
                  ^
/usr/include/c++/v1/iosfwd:123:32: note: template is declared here
    class _LIBCPP_TEMPLATE_VIS basic_ostringstream;
                               ^

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2018-08-31 12:21:45 +02:00
Ricardo Dias
65a56369a3
dmclock: update dmclock submodule sha1 to tip of ceph/dmclock.git master
This update will fix the build of Ceph when -DWITH_TESTS=OFF is used.

Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-08-31 11:16:46 +01:00