Commit Graph

55890 Commits

Author SHA1 Message Date
Casey Bodley
d945e20995 rgw: carry tenant id with data sync
use rgw_bucket_shard to track buckets, which includes tenant id

Fixes: http://tracker.ceph.com/issues/16469

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:26 -04:00
Casey Bodley
2a1e1a776c rgw: add tenant to url for RGWRESTStreamWriteRequest
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:26 -04:00
Casey Bodley
fc0df4802b rgw: add tenant to rgw_bucket json format
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:26 -04:00
Casey Bodley
d5ac140040 rgw: add rgw_bucket_parse_bucket_key()
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:25 -04:00
Casey Bodley
c8aa668fc3 rgw: add tenant name to datalog entries
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:25 -04:00
Casey Bodley
3eae201c8a rgw: convert bucket instance listings back to metadata key format
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:25 -04:00
Casey Bodley
a0befa1e7b rgw: use tenant/ for bucket instance metadata keys
to work around the ambiguity of parsing tenant: and :shard in the same
bucket instance metadata key, use tenant/ instead

to preserve backward compatibility with existing objects, new helper
function rgw_bucket_instance_key_to_oid() converts this / back to a :
before being used as an object name

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:25 -04:00
Casey Bodley
51ff8ef7c6 rgw: add get_key() methods to format rgw_buckets
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 12:20:25 -04:00
Kefu Chai
21402181f5 Merge pull request #9934 from tchaikov/wip-build-on-armf
common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-08 22:58:28 +08:00
Kefu Chai
5ba22025a8 Merge pull request #10204 from ceph/wip-cmake
cmake: fixes for pypi changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-08 22:51:48 +08:00
Orit Wasserman
e1bd0118ad rgw: remove unused realm from radosgw-admin zone modify
Fixes:http://tracker.ceph.com/issues/16632

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-07-08 16:20:32 +02:00
Ken Dreyer
3c43185002 doc: more details for pool deletion
Prior to this change, the documention instructed administrators to
delete rulesets and users, but did not go into details regarding how to
do that.

Add example commands that admins may use to search for rulesets and
users that might reference the to-be-deleted pool.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-07-08 07:42:29 -06:00
Ilya Dryomov
ccc834d3d8 AsyncConnection: don't limit recv_max_prefetch with TCP_PREFETCH_MIN_SIZE
simple messenger's prefetch buffer is ms_tcp_prefetch_max_size.
Don't cap it with TCP_PREFETCH_MIN_SIZE in the async messenger.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2016-07-08 15:36:32 +02:00
Ilya Dryomov
f6e7e40394 AsyncConnection: don't use state_buffer for connect authorizer
state_buffer is 4096 bytes long, while connect authorizer can be
arbitrarily big - an OSD service ticket with lots of per-pool or
per-namespace caps is one example.  We end up scribbling on invalid
memory past the state_buffer and eventually crash.

Move authorizer_bl up into connection and read directly into it.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2016-07-08 15:34:30 +02:00
Kefu Chai
31db4c5f9f common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>
this fixes the build on armf.

on 32bit platforms, cstdint is very likely to

 typedef long long int int64_t;

this results in compilation error like

 `common/strtol.cc:190:75: error: duplicate explicit instantiation of 'T
 strict_si_cast(const char, std::string) [with T = long long int;
 std::string = std::basic_string]'

 [-fpermissive]
 template int64_t strict_si_cast(const char *str, std::string *err);
 ^`

we can address this by instantiate the primitive type of `long long`
instead of `in64_t`.

Fixes: http://tracker.ceph.com/issues/16398
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-08 21:20:53 +08:00
Kefu Chai
37dbe98a31 Merge pull request #8189 from chardan/wip-chardan-15100
librados examples: link and include from current source tree by default.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-08 21:10:35 +08:00
xie xingguo
ff0329634a os/bluestore: release compressor if comp_mode turned out to be none
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
ed5f7c4df7 os/bluestore: drop unnecessary increase of iterator
We are going to break anyway.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
359c3863a5 os/bluestore: assert to confirm that we don't access violation
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
a7228eb8b9 os/bluestore: drop unused member _bytes
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
72fe4df3f8 os/bluestore: check against that we don't access violation
Some day we might want make this interface more applicable by handling
the abnormal cases more gracefully...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
Igor Fedotov
5c2a1bbb1f Merge pull request #10137 from xiexingguo/xxg-wip-bluestore-2016-07-05-02
os/bluestore: change algorithm of compression header from string to int

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-07-08 13:43:33 +02:00
xie xingguo
1209cb3d12 os/bluestore: change algorithm of compression header from string to int
The literal description of compression algorithm can vary from
various compression types and thus increases the complexity of
en/decoding, which as a result can cause chaos. Also it can be
more efficient by translating it into a fixed-length type.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 19:39:17 +08:00
Orit Wasserman
1a8e72cb2d rgw: register the correct handler for cls_user_complete_stats
Fixes: http://tracker.ceph.com/issues/16624
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-07-08 10:54:00 +02:00
Orit Wasserman
a0420741d4 rgw: add missing master_zone when running with old default region config
Fixes: http://tracker.ceph.com/issues/16627

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-07-08 10:41:59 +02:00
huanwen ren
48f56a5fe1 osdc/mds: fixup pos parameter in the journaler
the type of write_pos\read_pos\expire_pos\trimming_pos is uint64_t, 
change the "pos parameter" to uint64_t

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-07-08 15:54:36 +08:00
Kefu Chai
ce1f9c6e6e pybind: put temp .o files in $TMPDIR
otherwise they will go to $PWD/$TMPDIR instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-08 15:03:45 +08:00
Kefu Chai
edd7c9d709 cmake: creage egg_info files into build directory
otherwise they will go to the source tree, and "git ls-files" will list
them as untracked files, which annoy gitbuilder-ceph-tarball*-cmake
gitbuilders. like

+ echo 'error: Added files:'
error: Added files:
+ cat .git/added-files
src/pybind/rados/rados.egg-info/PKG-INFO
...

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-08 15:02:59 +08:00
Kefu Chai
07387eb9af Merge pull request #10186 from ceph/wip-cmake-no-with-mds
cmake: remove WITH_MDS option

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-08 11:37:04 +08:00
Patrick Donnelly
6305301130
client: note order of member init in cons
(The order of the initializer list is not relevant, only the order of class members.)

This also makes explicit the passed reference to the ino member by "this->ino".

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-07 21:08:36 -04:00
Patrick Donnelly
58439ad09a
client: move Inode specific cleanup to destructor
This better internalizes Inode management.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-07 21:08:05 -04:00
Patrick Donnelly
adba77e34c
mon: use clearer code structure
The failed map is not changed in the first if, so the second if should be an
else.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-07 19:14:17 -04:00
Patrick Donnelly
74932c6b9e
mds: use reference to avoid copy
Making a copy in this range-for is unnecessary.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-07 19:13:52 -04:00
Michal Jarzabek
bf638dfe2a msg/AsyncMessenger: remove unneeded include file
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-07-07 23:35:54 +01:00
Robin H. Johnson
a7016e1b67
rgw: fix multi-delete query param parsing.
Multi-delete is triggered by a query parameter on POST, but there are
multiple valid ways of representing it, and Ceph should accept ANY way
that has the query parameter set, regardless of what value or absence of
value.

This caused the RubyGem aws-sdk-v1 to break, and has been present since
multi-delete was first added in commit 0a1f4a97da, for the bobtail
release.

Fixes: http://tracker.ceph.com/issues/16618
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-07-07 14:19:16 -07:00
Sage Weil
33fb3bc63f Merge pull request #10163 from stiopaa1/msg_asyncmess_removeUnusedFunction_create_anon_connection
msg/AsyncMessenger: remove unused function
2016-07-07 16:33:21 -04:00
Ali Maredia
235a72a8f4 Merge pull request #10178 from ceph/wip-cmake
cmake: use stock Find* modules.

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-07 15:24:45 -04:00
Ali Maredia
cfcf0706f2 cmake: remove option
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-07-07 14:31:32 -04:00
Ken Dreyer
99e0ee1223 doc: rm SysV instructions, add systemd
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-07-07 11:59:18 -06:00
Michal Jarzabek
100757a342 msg/Messenger: add const and override to function
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-07-07 18:47:29 +01:00
Sage Weil
956c769969 Merge pull request #10128 from xiexingguo/xxg-wip-bluestore-2016-07-05
os/bluestore: introduce power 2 macros for block alignment and rounding

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-07 13:40:42 -04:00
Casey Bodley
d1a10c5416 Merge pull request #10180 from theanalyst/mrgw/cmake-fixes
mrgw: search for cmake build dir.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-07 13:00:32 -04:00
Abhishek Lekshmanan
eeb394e04c
mrgw: search for cmake build dir.
Similar to mstart and mstop, mrgw also needs to find the correct build
dir as we pass in the pidfile and asokfile which otherwise falls back to
src/run dir.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-07-07 18:22:27 +02:00
Ali Maredia
3ed34b58bd Merge pull request #10116 from tchaikov/wip-cmake-make-check
test: make check using cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-07 12:13:46 -04:00
Casey Bodley
7dac5c1e21 Merge pull request #10097 from yehudasa/wip-mrun-cmake
mrun, mstart.sh, mstop.sh: search for cmake build directory

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-07 12:03:09 -04:00
David Zafman
d3bcc7dc4d Merge pull request #9489 from athanatos/wip-16156
ReplicatedPG: call op_applied for submit_log_entries based repops

Reviewed-by: David Zafman <dzafman@redhat.com>
2016-07-07 08:57:53 -07:00
Kefu Chai
b5bb77d566 cmake: use the stock FindCURL.cmake
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 23:26:02 +08:00
Kefu Chai
3646fa5c6b cmake: use the stock FindEXPAT.cmake
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 23:26:02 +08:00
Kefu Chai
d053705c03 qa/workunits/ceph-helpers.sh: disable test_pg_scrub()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 23:17:11 +08:00
renhwztetecs
d145fcd7d4 mon/mds: add err info when load_metadata is abnormal
add a print of the most important reason is that:
when the MDSMonitor::init  call MDSMonitor::load_metadata, no processing error code,
so printing can discover problems

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-07-07 23:05:25 +08:00