Kefu Chai
1638525015
Merge pull request #5312 from xinxinsh/wip-sparse-copy
...
use SEEK_HOLE/SEEK_DATA for sparse copy
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-04 13:58:21 +08:00
Kefu Chai
8f0028a9bd
Merge pull request #5420 from ceph/wip-12429
...
osd/OSDMap: handle incrementals that modify+del pool
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-04 13:52:15 +08:00
Sage Weil
89c99db0d5
Merge pull request #5431 from kylinstorage/test_cache_pool_script_fix
...
fix: qa/workunits/rados/test_cache_pool.sh
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-03 21:49:38 -04:00
Sage Weil
75d80aa5ce
Merge pull request #5430 from ceph/wip-12537
...
rgw: url encode exposed bucket
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-03 21:47:41 -04:00
Sage Weil
06d1546464
Merge pull request #5400 from tchaikov/wip-12451
...
tools/rados: update the help message
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-03 15:14:37 -04:00
Josh Durgin
fb4e332124
Merge pull request #5440 from vumrao/wip-vumrao-12458-doc
...
doc: change --keyfile description in man page of rbd help
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-03 11:05:55 -07:00
Vikhyat Umrao
85cb86d05f
doc: change "--keyfile" description in man page of rbd help
...
"--keyring" has higher priority than "--keyfile".
"--keyfile" option is overridden by "--keyring"
if latter is also specified.
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
2015-08-03 22:57:04 +05:30
Kefu Chai
12c4e7dac9
Merge pull request #5455 from ceph/wip-cephfs-cmake
...
CMake fixes for CephFS
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-04 01:18:47 +08:00
Sage Weil
b93b6726c0
Merge pull request #5456 from kylinstorage/wip-do_autogen.sh
...
Allow do_autogen.sh pass configure parameters
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-03 12:09:33 -04:00
John Spray
bc0d9427d6
CMake: add crushtool
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:36 +01:00
John Spray
fe970bc14d
CMake: fix librados build
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:36 +01:00
John Spray
2355c45459
CMake: fix rbd build
...
Don't link with 'global' from rbd (to match
autotools update fa78739
). Fixes "g_ceph_context
defined twice" error.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:35 +01:00
John Spray
22e8a2915d
CMake: libblkid not only needed with rbd
...
It's linked in libcommon.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:35 +01:00
John Spray
57cd851df6
CMake: smalliobenchrbd should dep on rbd
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:35 +01:00
John Spray
1f541b2e8e
CMake: set WITH_CEPHFS by default
...
Option was referenced in CMakeLists but
not actually set.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:35 +01:00
John Spray
a4a81c33c9
CMake: fix cephfs cls build
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:35 +01:00
John Spray
cc35d9b4b5
CMake: fix cephfs test targets
...
These had bad lib names.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:35 +01:00
John Spray
2761b296c1
CMake: add cephfs tools
...
cephfs-table-tool, cephfs-data-scan, cephfs-journal-tool
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-03 16:39:35 +01:00
Kefu Chai
fdf0e030c3
Merge pull request #5422 from ceph/wip-fix-filestore-getattr
...
tests: fix the ObjectStore/StoreTest.SimpleCloneTest in "ceph_test_objectstore"
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-03 22:37:35 +08:00
Yan, Zheng
02590c1d65
Merge pull request #5375 from ceph/wip-config-root-ino
...
Make UID of new root inos configurable
2015-08-03 21:28:47 +08:00
Yunchuan Wen
e4c6922cca
add help to do_autogen.sh
...
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
2015-08-03 13:16:00 +00:00
Yunchuan Wen
e28b3d111d
Allow do_autogen.sh to pass configure parameters
...
Currently do_autogen.sh does not allow to pass parameters
of configure to disable/enable components during building, which is not
flexible, this patch add the ability to it.
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
2015-08-03 13:03:47 +00:00
Orit Wasserman
ef86e29259
Merge pull request #5445 from ceph/wip-12432
...
Wip 12432
2015-07-31 21:39:04 +02:00
Yehuda Sadeh
b8e28ab9f9
rgw: set http status in civetweb
...
Need to set the http status in civetweb so that we report it correctly.
Fixes : #12432
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-31 11:09:53 -07:00
Yehuda Sadeh
0451f19341
civetweb: update submodule to support setting of http status
...
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-31 11:09:53 -07:00
Yehuda Sadeh
c8653b11a8
Merge pull request #5258 from zhouyuan/rgw_skip_first_chunk
...
rgw: skip prefetch first chunk if range get falls to shadow objects
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-31 13:25:46 -04:00
Ilya Dryomov
3fbcf5e265
doc: krbd supports clones since 3.10
...
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-31 19:50:58 +03:00
Loic Dachary
a9cb1b89f9
Merge pull request #5438 from ceph/fix-doc-build
...
doc: fix the build of placement-groups.rst
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-31 12:29:04 +02:00
Kefu Chai
1fb9bacd0b
os/FileStore: getattr() should return 0 if success
...
* fix the test of ObjectStore/StoreTest.SimpleCloneTest, the expected
return value of getattr() should be 0. otherwise it otherwise it fails
on objectstore backends of "memstore" and "keyvaluestore".
* change FileStore::getattr() to return 0 on success
* tighten related tests in ceph_test_objectstore, to test the return value
of getattr() using ASSERT_EQ(r, 0) instead of ASSERT_GE(r, 0)
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-31 17:35:31 +08:00
Haomai Wang
5760655554
KeyValueStore: Fix incorrect rm_keys behaviors
...
GenericObjectMap will copyup parents keys when rm keys, but if
caller(KeyValueStore) already buffer "set keys", it shouldn't
copyup reset keys.
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-31 17:33:25 +08:00
Kefu Chai
81afcc206d
doc: fix the build of placement-groups.rst
...
add a reference target of "mapping pgs to osds"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-31 17:08:20 +08:00
Kefu Chai
f008440765
Merge pull request #5432 from ceph/wip-fix-rbd-build
...
make: fix the build of "rbd"
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-31 16:47:55 +08:00
Mingxin Liu
79c7d2e498
fix: qa/workunits/rados/test_cache_pool.sh
...
Signed-off-by: Mingxin Liu <mingxinliu@ubuntukylin.com>
2015-07-31 16:38:01 +08:00
Loic Dachary
2d90da863c
Merge pull request #5434 from tobegit3hub/remove_execute_mode
...
Remove execute mode of source files
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-31 09:55:01 +02:00
tobe
f8554f9b8e
Remove execute mode of source files
2015-07-31 15:47:43 +08:00
Haomai Wang
1a2f29050a
Merge pull request #5398 from mingyuez/master
...
rbd:If the image has any protected snaps,'rbd snap purge image' will return failure without removing any snaps.
Reviewed-by: Josh During <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-31 15:41:32 +08:00
Kefu Chai
b255b4c51c
make: fix the build of "rbd"
...
`CEPH_GLOBAL` was removed in fa78739
, but the linked libraries does not
offer all needed symbols for "rbd". so add them back.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-31 14:45:55 +08:00
mingyuez
8a7a52dd93
rbd:'rbd purge image' will return failure without removing any snaps if the image has a protected snap
...
Signed-off-by: mingyuez <zhao.mingyue@h3c.com>
2015-07-31 12:06:12 +08:00
Kefu Chai
d5142ba29e
Merge pull request #5395 from tchaikov/wip-12512
...
common/syncfs: fall back to sync(2) if syncfs(2) not available
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-31 10:24:30 +08:00
Kefu Chai
f705d8c7e4
Merge pull request #5402 from ceph/wip-claim-sparse-read-buffer
...
osd/ReplicatedPG: claim the read buffer instead of copying it
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-07-31 10:14:02 +08:00
Sage Weil
b7e5d2af47
Merge pull request #5428 from ceph/wip-kill-rest-bench
...
kill rest-bench
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-30 22:13:40 -04:00
Yuan Zhou
95745550ce
rgw: skip prefetch first chunk if range get falls to shadow objects
...
Currently the head object will be prefetched in each GET:
a) This is unnecessary if the Range GET falls to shadow objects.
b) The GET request would be quite slow if we have a big head object
This patch adds some check on the Range. If it's not in the head
object(>=rgw_max_chunk_size) then skip the prefetch.
Fixes : #12539
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-07-31 08:42:00 +08:00
Josh Durgin
03491ae843
Merge remote-tracking branch 'origin/next'
2015-07-30 16:35:01 -07:00
Josh Durgin
27fa210f40
Merge pull request #5425 from ceph/wip-12479-next
...
librbd: test crash during client upgrade suite
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-30 16:26:51 -07:00
Yehuda Sadeh
ad5507fe0b
rgw: url encode exposed bucket
...
Fixes : #12537
Don't send the bucket name back without url encoding it.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-30 14:47:47 -07:00
Sage Weil
ca40bf0b30
Merge pull request #5423 from oddomatik/patch-1
...
doc: No CRUSH involvement in deciding PG target
Reviewed-by: Sage Weil <sage@redhat.com>
2015-07-30 17:32:52 -04:00
Josh Durgin
04d8766264
Merge pull request #5426 from ceph/wip-12383-next
...
rbd: remove dependency on non-ABI controlled CephContext
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-30 14:08:32 -07:00
Josh Durgin
115f370634
Merge pull request #5399 from tchaikov/wip-12458
...
rbd: add "--keyring" option to help message
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-30 14:00:15 -07:00
Yehuda Sadeh
d621d9878c
Merge pull request #5414 from cxwshawn/master
...
doc: add bucket object version description.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-30 13:52:06 -04:00
Sage Weil
a634ab34b2
remove libs3 submodule
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-07-30 13:24:00 -04:00