]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw: temporarily use std::vector in place of static_vector of Boost.
Radoslaw Zarzynski [Wed, 25 May 2016 16:30:28 +0000 (18:30 +0200)]
rgw: temporarily use std::vector in place of static_vector of Boost.

We want to use boost::container::static_vector to avoid dynamic
memory allocations. However, Boost on some platforms we support
doesn't offer this container yet.

The patch can be safely reverted when we get modern enough Boost
on all our platforms.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: reuse the HTTP client of KeystoneService in RGWKeystoneAuthEngine.
Radoslaw Zarzynski [Mon, 23 May 2016 20:37:28 +0000 (22:37 +0200)]
rgw: reuse the HTTP client of KeystoneService in RGWKeystoneAuthEngine.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw, optimization: reduce the overhead of RGWIdentityApplier::to_str().
Radoslaw Zarzynski [Mon, 23 May 2016 19:45:33 +0000 (21:45 +0200)]
rgw, optimization: reduce the overhead of RGWIdentityApplier::to_str().

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve error checking in Keystone-related code.
Radoslaw Zarzynski [Mon, 23 May 2016 12:49:33 +0000 (14:49 +0200)]
rgw: improve error checking in Keystone-related code.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: cosmetic changes in the new auth infra.
Radoslaw Zarzynski [Mon, 23 May 2016 12:03:56 +0000 (14:03 +0200)]
rgw: cosmetic changes in the new auth infra.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw, optimization: switch from std::vector to std::array in auth infra.
Radoslaw Zarzynski [Fri, 20 May 2016 16:34:05 +0000 (18:34 +0200)]
rgw, optimization: switch from std::vector to std::array in auth infra.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: int -> uint32_t transition for perm and perm_mask.
Radoslaw Zarzynski [Fri, 20 May 2016 14:44:41 +0000 (16:44 +0200)]
rgw: int -> uint32_t transition for perm and perm_mask.

This patch doesn't affect data structures. Changes were made
to the upper layers only. We rely there on the same assumption
like in case of req_state::perm_mask and RGWSubUser::perm_mask
that already are uint32_t. The assumption is presence of an
implicit conversion between int and uint32_t.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw, optimization: switch to std::string& when possible in the new auth.
Radoslaw Zarzynski [Fri, 20 May 2016 13:28:52 +0000 (15:28 +0200)]
rgw, optimization: switch to std::string& when possible in the new auth.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw, cmake: remove rgw/rgw_swift.cc also from CMakeList.txt.
Radoslaw Zarzynski [Fri, 20 May 2016 13:26:44 +0000 (15:26 +0200)]
rgw, cmake: remove rgw/rgw_swift.cc also from CMakeList.txt.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw, optimization: avoid extra allocations in RGWHTTPHeadersCollector.
Radoslaw Zarzynski [Fri, 20 May 2016 12:48:41 +0000 (14:48 +0200)]
rgw, optimization: avoid extra allocations in RGWHTTPHeadersCollector.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw, optimization: RGWAuthEngine::get_name() returns const char*.
Radoslaw Zarzynski [Fri, 20 May 2016 11:41:54 +0000 (13:41 +0200)]
rgw, optimization: RGWAuthEngine::get_name() returns const char*.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: switch from std::list to std::vector in rgw_acl_swift.{cc,h}.
Radoslaw Zarzynski [Thu, 19 May 2016 17:05:12 +0000 (19:05 +0200)]
rgw: switch from std::list to std::vector in rgw_acl_swift.{cc,h}.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw, optimization: further reduce allocations in RGWTempURLAuthEngine.
Radoslaw Zarzynski [Thu, 19 May 2016 15:22:09 +0000 (17:22 +0200)]
rgw, optimization: further reduce allocations in RGWTempURLAuthEngine.

Also improve the accommodation of Matt Benjamin's changes in the new
TempURL infrastructure.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: reduce string copies in tempURL processing
Matt Benjamin [Sat, 23 Apr 2016 19:41:02 +0000 (15:41 -0400)]
rgw: reduce string copies in tempURL processing

Introduce a helper class encapsulating the temp URL HMAC computation,
and also save it for later computation.  Use the underlying HMACSHA1
implementation to compute the HMAC incrementally (saves a copy of all
the parameters).

Also avoid some other string copying in the logic prior to taking the
HMAC, in one case by remembering to use auto& in a std::map range-for
loop, and using boost::string_ref to share ReqState::request_uri and
conditionally suffix of same.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Conflicts:
src/rgw/rgw_swift.cc

9 years agorgw: reuse ltstr_nocase in RGWHTTPHeadersCollector.
Radoslaw Zarzynski [Sat, 23 Apr 2016 17:15:07 +0000 (19:15 +0200)]
rgw: reuse ltstr_nocase in RGWHTTPHeadersCollector.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: the Keystone backend does support now Swift's cross-tenant ACLs.
Radoslaw Zarzynski [Sat, 23 Apr 2016 14:59:18 +0000 (16:59 +0200)]
rgw: the Keystone backend does support now Swift's cross-tenant ACLs.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: drop req_state::os_auth_token as it isn't neccessary anymore.
Radoslaw Zarzynski [Wed, 20 Apr 2016 13:04:40 +0000 (15:04 +0200)]
rgw: drop req_state::os_auth_token as it isn't neccessary anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: implement to_str() over auth appliers.
Radoslaw Zarzynski [Tue, 19 Apr 2016 17:50:41 +0000 (19:50 +0200)]
rgw: implement to_str() over auth appliers.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: drop rgw_user_is_authenticated from rgw_user.{h,cc}.
Radoslaw Zarzynski [Sun, 17 Apr 2016 10:23:29 +0000 (12:23 +0200)]
rgw: drop rgw_user_is_authenticated from rgw_user.{h,cc}.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: allow giving perms in Swift ACLs to an identity who don't have a local account.
Radoslaw Zarzynski [Sun, 17 Apr 2016 10:22:27 +0000 (12:22 +0200)]
rgw: allow giving perms in Swift ACLs to an identity who don't have a local account.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: fix printing of Swift's bucket ACLs.
Radoslaw Zarzynski [Sun, 17 Apr 2016 10:15:28 +0000 (12:15 +0200)]
rgw: fix printing of Swift's bucket ACLs.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add support for HTTP Referer-based ACLs of Swift API.
Radoslaw Zarzynski [Thu, 28 Jan 2016 17:43:56 +0000 (18:43 +0100)]
rgw: add support for HTTP Referer-based ACLs of Swift API.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: ONLY refactor RGWAccessControlPolicy_SWIFT[Acct].
Radoslaw Zarzynski [Fri, 8 Apr 2016 23:05:04 +0000 (01:05 +0200)]
rgw: ONLY refactor RGWAccessControlPolicy_SWIFT[Acct].

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: refactor rgw_acl_swift.h to not inject std namespace.
Radoslaw Zarzynski [Wed, 13 Jan 2016 12:51:55 +0000 (13:51 +0100)]
rgw: refactor rgw_acl_swift.h to not inject std namespace.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: use account ACL for request verification.
Radoslaw Zarzynski [Thu, 7 Apr 2016 15:41:39 +0000 (17:41 +0200)]
rgw: use account ACL for request verification.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add support for putting Swift account ACLs.
Radoslaw Zarzynski [Mon, 11 Jan 2016 18:27:21 +0000 (19:27 +0100)]
rgw: add support for putting Swift account ACLs.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve code formatting ONLY.
Radoslaw Zarzynski [Mon, 11 Jan 2016 17:52:15 +0000 (18:52 +0100)]
rgw: improve code formatting ONLY.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: dump account ACLs in Swift responses.
Radoslaw Zarzynski [Mon, 11 Jan 2016 17:51:14 +0000 (18:51 +0100)]
rgw: dump account ACLs in Swift responses.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add basics for Swift Account ACLs.
Radoslaw Zarzynski [Mon, 11 Jan 2016 17:49:21 +0000 (18:49 +0100)]
rgw: add basics for Swift Account ACLs.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve const-correctness of ACL-related code.
Radoslaw Zarzynski [Fri, 22 Jan 2016 16:40:03 +0000 (17:40 +0100)]
rgw: improve const-correctness of ACL-related code.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: eradicate rgw_swift.{h,cc}.
Radoslaw Zarzynski [Sun, 17 Apr 2016 14:26:44 +0000 (16:26 +0200)]
rgw: eradicate rgw_swift.{h,cc}.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: eradicate rgw_swift_verify_signed_token.
Radoslaw Zarzynski [Sun, 17 Apr 2016 14:24:37 +0000 (16:24 +0200)]
rgw: eradicate rgw_swift_verify_signed_token.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: switch to the new auth infrastructure in rgw_rest_swift.cc
Radoslaw Zarzynski [Thu, 7 Apr 2016 12:04:53 +0000 (14:04 +0200)]
rgw: switch to the new auth infrastructure in rgw_rest_swift.cc

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: implement get_name() over RGWAuthEngine.
Radoslaw Zarzynski [Fri, 8 Apr 2016 15:51:30 +0000 (17:51 +0200)]
rgw: implement get_name() over RGWAuthEngine.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: introduce the Extractor concept to the auth infrastructure.
Radoslaw Zarzynski [Mon, 4 Apr 2016 13:03:00 +0000 (15:03 +0200)]
rgw: introduce the Extractor concept to the auth infrastructure.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: implement Swift-specific authentication engines.
Radoslaw Zarzynski [Wed, 6 Apr 2016 16:56:14 +0000 (18:56 +0200)]
rgw: implement Swift-specific authentication engines.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: implement RGWKeystoneAuthEngine.
Radoslaw Zarzynski [Mon, 11 Apr 2016 18:43:19 +0000 (20:43 +0200)]
rgw: implement RGWKeystoneAuthEngine.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: infrastructure for authentication engine-dependent ACL checks.
Radoslaw Zarzynski [Sat, 23 Apr 2016 14:53:25 +0000 (16:53 +0200)]
rgw: infrastructure for authentication engine-dependent ACL checks.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: share the ACL interpreter across multiple identity appliers.
Radoslaw Zarzynski [Sat, 23 Apr 2016 14:23:09 +0000 (16:23 +0200)]
rgw: share the ACL interpreter across multiple identity appliers.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: infrastructure for object-based Swift authentication.
Radoslaw Zarzynski [Wed, 6 Apr 2016 16:47:29 +0000 (18:47 +0200)]
rgw: infrastructure for object-based Swift authentication.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: use RGWIdentityApplier across ACL implementation.
Radoslaw Zarzynski [Sun, 17 Apr 2016 10:11:35 +0000 (12:11 +0200)]
rgw: use RGWIdentityApplier across ACL implementation.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: enable management of admin privileges.
Radoslaw Zarzynski [Mon, 15 Feb 2016 13:16:58 +0000 (14:16 +0100)]
rgw: enable management of admin privileges.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: decouple system user from admin user.
Radoslaw Zarzynski [Sun, 17 Apr 2016 11:08:48 +0000 (13:08 +0200)]
rgw: decouple system user from admin user.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: split account owner from identity used for authorization.
Radoslaw Zarzynski [Sun, 17 Apr 2016 10:44:44 +0000 (12:44 +0200)]
rgw: split account owner from identity used for authorization.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: make use of RGWIdentityApplier as req_state::auth_identity.
Radoslaw Zarzynski [Sun, 17 Apr 2016 12:34:51 +0000 (14:34 +0200)]
rgw: make use of RGWIdentityApplier as req_state::auth_identity.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: introduce RGWIdentityApplier for representing identities.
Radoslaw Zarzynski [Sun, 17 Apr 2016 12:12:27 +0000 (14:12 +0200)]
rgw: introduce RGWIdentityApplier for representing identities.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: remove get_keystone_{url,admin_token} from RGWSwift.
Radoslaw Zarzynski [Thu, 7 Apr 2016 11:11:46 +0000 (13:11 +0200)]
rgw: remove get_keystone_{url,admin_token} from RGWSwift.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: switch from RGWSwift to KeystoneService admin_token/url.
Radoslaw Zarzynski [Mon, 11 Apr 2016 18:33:55 +0000 (20:33 +0200)]
rgw: switch from RGWSwift to KeystoneService admin_token/url.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: naturalize the transplanted get_keystone_{url,admin_token} in KeystoneService.
Radoslaw Zarzynski [Thu, 7 Apr 2016 10:34:32 +0000 (12:34 +0200)]
rgw: naturalize the transplanted get_keystone_{url,admin_token} in KeystoneService.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: ONLY move RGWSwift::get_keystone_{url,admin_token} to rgw_keystone.cc.
Radoslaw Zarzynski [Wed, 6 Apr 2016 17:43:21 +0000 (19:43 +0200)]
rgw: ONLY move RGWSwift::get_keystone_{url,admin_token} to rgw_keystone.cc.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: rework handling of rgw_keystone_accepted_[admin_]roles.
Radoslaw Zarzynski [Fri, 19 Feb 2016 18:20:31 +0000 (19:20 +0100)]
rgw: rework handling of rgw_keystone_accepted_[admin_]roles.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: cosmetic for RGWKeystoneTokenCache::RevokeThread.
Radoslaw Zarzynski [Tue, 5 Apr 2016 14:50:22 +0000 (16:50 +0200)]
rgw: cosmetic for RGWKeystoneTokenCache::RevokeThread.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: RevokeThread is now a part of RGWKeystoneTokenCache.
Radoslaw Zarzynski [Mon, 4 Apr 2016 17:27:50 +0000 (19:27 +0200)]
rgw: RevokeThread is now a part of RGWKeystoneTokenCache.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: ONLY move parts of KeystoneRevokeThread's code to rgw/rgw_keystone.cc
Radoslaw Zarzynski [Mon, 4 Apr 2016 15:24:59 +0000 (17:24 +0200)]
rgw: ONLY move parts of KeystoneRevokeThread's code to rgw/rgw_keystone.cc

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: implement singleton pattern over RGWKeystoneTokenCache.
Radoslaw Zarzynski [Wed, 6 Apr 2016 16:01:17 +0000 (18:01 +0200)]
rgw: implement singleton pattern over RGWKeystoneTokenCache.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: replace RGWPostHTTPData with RGW[Keystone]HTTPTransceiver.
Radoslaw Zarzynski [Wed, 6 Apr 2016 15:38:53 +0000 (17:38 +0200)]
rgw: replace RGWPostHTTPData with RGW[Keystone]HTTPTransceiver.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve encapsulation and const-correctness in the RGWHTTPClient family.
Radoslaw Zarzynski [Tue, 5 Apr 2016 12:05:39 +0000 (14:05 +0200)]
rgw: improve encapsulation and const-correctness in the RGWHTTPClient family.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: ONLY move RGWPostHTTPData's definitions to rgw_http_client.cc.
Radoslaw Zarzynski [Tue, 5 Apr 2016 10:25:41 +0000 (12:25 +0200)]
rgw: ONLY move RGWPostHTTPData's definitions to rgw_http_client.cc.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: ONLY move RGWPostHTTPData to rgw_http_client.h.
Radoslaw Zarzynski [Mon, 4 Apr 2016 17:20:17 +0000 (19:20 +0200)]
rgw: ONLY move RGWPostHTTPData to rgw_http_client.h.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: implement RGWHTTPHeadersCollector.
Radoslaw Zarzynski [Fri, 1 Apr 2016 15:40:19 +0000 (17:40 +0200)]
rgw: implement RGWHTTPHeadersCollector.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: rgw_user can be now explicitly initialized with tenant and ID.
Radoslaw Zarzynski [Tue, 29 Mar 2016 15:22:59 +0000 (17:22 +0200)]
rgw: rgw_user can be now explicitly initialized with tenant and ID.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve const-correctness of rgw_open_cms_envelope.
Radoslaw Zarzynski [Tue, 5 Apr 2016 14:49:32 +0000 (16:49 +0200)]
rgw: improve const-correctness of rgw_open_cms_envelope.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve const-correctness of rgw_get_user_info_by_swift().
Radoslaw Zarzynski [Mon, 4 Apr 2016 12:56:36 +0000 (14:56 +0200)]
rgw: improve const-correctness of rgw_get_user_info_by_swift().

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve const-correctness of RGWHTTPArgs.
Radoslaw Zarzynski [Wed, 23 Mar 2016 14:43:33 +0000 (15:43 +0100)]
rgw: improve const-correctness of RGWHTTPArgs.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve const-correctness of KeystoneToken class.
Radoslaw Zarzynski [Sun, 17 Apr 2016 11:12:22 +0000 (13:12 +0200)]
rgw: improve const-correctness of KeystoneToken class.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve const-correctness of KeystoneToken.
Radoslaw Zarzynski [Sun, 17 Apr 2016 13:40:15 +0000 (15:40 +0200)]
rgw: improve const-correctness of KeystoneToken.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: make rgw_get_user_info_by_uid to be const-correct.
Radoslaw Zarzynski [Mon, 18 Jan 2016 12:07:41 +0000 (13:07 +0100)]
rgw: make rgw_get_user_info_by_uid to be const-correct.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #9037 from rzarzynski/wip-rgw-swift-quota
Orit Wasserman [Thu, 2 Jun 2016 12:45:43 +0000 (14:45 +0200)]
Merge pull request #9037 from rzarzynski/wip-rgw-swift-quota

rgw: add support for account and container quotas of Swift API
Reviewed-by" Orit Wasserman <owasserm@redhat.com>

9 years agorgw: reuse populate_with_generic_attrs() across rgw_op.cc.Reviewed-by: Orit Wasserman...
Orit Wasserman [Thu, 2 Jun 2016 09:20:55 +0000 (11:20 +0200)]
rgw: reuse populate_with_generic_attrs() across rgw_op.cc.Reviewed-by: Orit Wasserman <owasserm@redhat.com>

rgw: reuse populate_with_generic_attrs() across rgw_op.cc.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9367 from Yan-waller/yj-wip-rgwfixhextobuf
Orit Wasserman [Thu, 2 Jun 2016 09:19:05 +0000 (11:19 +0200)]
Merge pull request #9367 from Yan-waller/yj-wip-rgwfixhextobuf

rgw/common: fix error return value of hex_to_buf.
Reviewed by: Orit Wasserman <owasserm@redhat.com>

9 years agoMerge pull request #9438 from ceph/wip-cmake
Kefu Chai [Thu, 2 Jun 2016 07:41:21 +0000 (15:41 +0800)]
Merge pull request #9438 from ceph/wip-cmake

cmake: rbd_mirror not linking rbd_test_mock

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9060 from mikulely/fix-rgw-multiste-doc
Yehuda Sadeh [Thu, 2 Jun 2016 05:52:42 +0000 (08:52 +0300)]
Merge pull request #9060 from mikulely/fix-rgw-multiste-doc

doc: fix rgw multiste config

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #9392 from yehudasa/wip-16072 9369/head
Yehuda Sadeh [Thu, 2 Jun 2016 05:46:04 +0000 (08:46 +0300)]
Merge pull request #9392 from yehudasa/wip-16072

rgw/rgw_common.cc: modify the end check in RGWHTTPArgs::sys_get

Tested-by: Orit Wasserman <owasserm@redhat.com>
http://pulpito.ceph.com/owasserm-2016-06-01_20:43:36-rgw:verify-wip-orit-testing---basic-mira/

9 years agocmake: rbd_mirror not linking rbd_test_mock 9438/head
Ali Maredia [Thu, 2 Jun 2016 03:28:38 +0000 (23:28 -0400)]
cmake: rbd_mirror not linking rbd_test_mock

Added rbd_test_mock lib, also changed name of
journal_test to journal_test_mock to mimic
automake naming.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9209 from yehudasa/wip-15939
Matt Benjamin [Wed, 1 Jun 2016 22:11:53 +0000 (18:11 -0400)]
Merge pull request #9209 from yehudasa/wip-15939

rgw: aws4 fixes

verified

9 years agoMerge pull request #9084 from dzafman/wip-dz-misc
Samuel Just [Wed, 1 Jun 2016 21:16:32 +0000 (14:16 -0700)]
Merge pull request #9084 from dzafman/wip-dz-misc

Wip dz misc

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9426 from linuxbox2/cmake-mds
Casey Bodley [Wed, 1 Jun 2016 18:07:59 +0000 (14:07 -0400)]
Merge pull request #9426 from linuxbox2/cmake-mds

cmake: change libmds back to a static library

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocmake: restore static linkage (libmds) 9426/head
Matt Benjamin [Wed, 1 Jun 2016 17:25:19 +0000 (13:25 -0400)]
cmake: restore static linkage (libmds)

Required by ceph-mds.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #9385 from ceph/wip-cmake-kefu
Matt Benjamin [Wed, 1 Jun 2016 16:42:52 +0000 (12:42 -0400)]
Merge pull request #9385 from ceph/wip-cmake-kefu

cmake: more fixes

fixes make install workflow

9 years agoMerge pull request #9228 from liewegas/wip-bluestore-write
Sage Weil [Wed, 1 Jun 2016 16:29:49 +0000 (12:29 -0400)]
Merge pull request #9228 from liewegas/wip-bluestore-write

os/bluestore: new write path (checksums and compression)

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9106 from SUSE/wip-15869
Nathan Cutler [Wed, 1 Jun 2016 16:14:38 +0000 (18:14 +0200)]
Merge pull request #9106 from SUSE/wip-15869

rpm: unconditionally set ceph user's primary group to ceph (SUSE)

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agocmake: install cython modules 9385/head
Kefu Chai [Wed, 1 Jun 2016 05:38:05 +0000 (13:38 +0800)]
cmake: install cython modules

* fix CYTHON_ADD_MODULE() macro. because python_add_module() offered by
  FindPythonLibs.cmake creates a target with name of ${name}, which conflicts
  with existing targets like "rbd" or "rados". so we can not reuse the
  name in ${name}.pyx. and instead, we should specify the target name
  explicitly.
* add distutils_install_cython_module() function to build and install
  cython modules.
* we can split build and install of cython module, but the install phase
  always tries to build the module. so keep it this way. will look at it
  later on.
* move the variables initializations into the Distutils.cmake module.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install compressor plugins into ${pkglibdir/compressor
Kefu Chai [Wed, 1 Jun 2016 03:25:11 +0000 (11:25 +0800)]
cmake: install compressor plugins into ${pkglibdir/compressor

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install erasure plugins into ${pkglibdir}/erasure-code
Kefu Chai [Wed, 1 Jun 2016 03:14:49 +0000 (11:14 +0800)]
cmake: install erasure plugins into ${pkglibdir}/erasure-code

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove duplicated file from ceph-osd
Kefu Chai [Sat, 28 May 2016 21:19:23 +0000 (05:19 +0800)]
cmake: remove duplicated file from ceph-osd

objclass/class_api.cc is already included in libosd

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix dependencies on tracing headers
Kefu Chai [Sat, 28 May 2016 16:23:22 +0000 (00:23 +0800)]
cmake: fix dependencies on tracing headers

group the header dependencies by its tp .so, so the traced target can
depend on them by the name of ${name}-tp.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: libradosstriper's OUTPUT_NAME should be radosstriper
Kefu Chai [Sat, 28 May 2016 16:22:31 +0000 (00:22 +0800)]
cmake: libradosstriper's OUTPUT_NAME should be radosstriper

and s/libradosstriper/radosstriper/ otherwise the created .so
filename would be liblibradosstriper.so with the default prefix.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install the artifacts the packaging requires
Kefu Chai [Sat, 28 May 2016 07:42:33 +0000 (15:42 +0800)]
cmake: install the artifacts the packaging requires

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install init script to etc/init.d
Kefu Chai [Sat, 28 May 2016 13:59:14 +0000 (21:59 +0800)]
cmake: install init script to etc/init.d

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add the autoconf path variables back
Kefu Chai [Sat, 28 May 2016 09:09:37 +0000 (17:09 +0800)]
cmake: add the autoconf path variables back

* partially revert 7a602ec.
* the directory variables created by automake, like "prefix", "bindir",
  and "libdir", are used for generating configuration_file() for substitution,
  and they should have the same names with ones from autotools.
* also fix the ${pkglibdir}, it should be the ${libdir}/${PACKAGE}. so
  the plugins are not installed into ${libdir}, in which the installed shared
  objects are supposed to be shared with other applications.
* install shared libraries into ${CMAKE_INSTALL_LIBDIR} instead of
  ${prefix}/lib. this complies to what ceph.spec.in requires:
  ceph.spec.in expects the shared libraries to be installed into
  ${_libdir}, and ${_libdir} is /usr/lib64 on an amd64 machine.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install ceph-post-file
Kefu Chai [Sat, 28 May 2016 09:03:08 +0000 (17:03 +0800)]
cmake: install ceph-post-file

and related pubkey for sftp

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add ceph-brag
Kefu Chai [Sat, 28 May 2016 08:53:36 +0000 (16:53 +0800)]
cmake: add ceph-brag

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: project name should be "ceph"
Kefu Chai [Sat, 28 May 2016 08:38:09 +0000 (16:38 +0800)]
cmake: project name should be "ceph"

so it would be easier to figure out paths, also
CMAKE_INSTALL_DOCDIR is composed using the PROJECT_NAME also.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install ceph-{detect-init,disk}
Kefu Chai [Sat, 28 May 2016 07:44:36 +0000 (15:44 +0800)]
cmake: install ceph-{detect-init,disk}

add a cmake module named Distutils.cmake for setting up python modules
using setup.py.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add ceph_rgw_{json,multi}parser
Kefu Chai [Sat, 28 May 2016 08:18:54 +0000 (16:18 +0800)]
cmake: add ceph_rgw_{json,multi}parser

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: compile and install ceph-bluefs-tool
Kefu Chai [Sat, 28 May 2016 08:18:31 +0000 (16:18 +0800)]
cmake: compile and install ceph-bluefs-tool

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/ceph_test_xattr_bench/ceph_xattr_bench/
Kefu Chai [Sat, 28 May 2016 07:44:17 +0000 (15:44 +0800)]
cmake: s/ceph_test_xattr_bench/ceph_xattr_bench/

to match with automake and packager

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: rename ceph-psim to ceph_psim
Kefu Chai [Sat, 28 May 2016 07:43:34 +0000 (15:43 +0800)]
cmake: rename ceph-psim to ceph_psim

to match with automake and packager

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix bash_completion install path
Kefu Chai [Sat, 28 May 2016 05:20:35 +0000 (13:20 +0800)]
cmake: fix bash_completion install path

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore: fsck: check for dup overlay keys 9228/head
Sage Weil [Tue, 31 May 2016 19:26:14 +0000 (15:26 -0400)]
os/bluestore: fsck: check for dup overlay keys

Signed-off-by: Sage Weil <sage@redhat.com>