Kefu Chai
21581a499b
Merge pull request #5474 from kylinstorage/wip-sparse_read_bugfix
...
osd/ReplicatedPG: sparse read should return (extent_map, data_bufferlist)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-05 16:35:43 +08:00
Yunchuan Wen
28bc30c76f
osd/ReplicatedPG: sparse read should return (extent_map, data_bufferlist)
...
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
2015-08-05 13:46:38 +08:00
Josh Durgin
7d11b6b9d1
Merge remote-tracking branch 'origin/next'
...
Conflicts:
src/Makefile-client.am (link rbd to libglobal again)
2015-08-04 18:13:52 -07:00
Jason Dillaman
add30145a4
Revert "rbd: remove dependency on non-ABI controlled CephContext"
...
This reverts commit fa78739933
.
Original approach broke krbd map/unmap functions and did not fully
address ABI issues.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-04 18:10:52 -07:00
Sage Weil
13ccfb4eb3
Merge pull request #5446 from ceph/wip-systemd
...
systemd support
Reviewed-by: Owen Synge <osynge@suse.com>
2015-08-04 14:05:41 -04:00
Loic Dachary
cdd5f770e3
Merge pull request #5469 from theanalyst/doc/v0.94.3-release
...
doc: release notes for v0.94.3
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-04 19:13:02 +02:00
Abhishek Lekshmanan
793fe5205d
doc: release notes for v0.94.3
...
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-08-04 21:23:27 +05:30
Sage Weil
de40c40932
client/Makefile: ship InodeRef
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-04 09:57:41 -04:00
John Spray
653dbecdfb
Merge pull request #4753 from ceph/wip-client-inode-refs
...
client: hold reference for returned inode
Reviewed-by: John Spray <john.spray@redhat.com>
2015-08-04 14:13:40 +01:00
John Spray
694990ffe7
Merge pull request #5466 from ceph/wip-12578
...
mds: open base inode's snaprealm after decoding snapblob
Reviewed-by: John Spray <john.spray@redhat.com>
2015-08-04 14:12:38 +01:00
Yan, Zheng
0e69527fc1
mds: open base inode's snaprealm after decoding snapblob
...
base inode has no parent, so can we mark its snaprealm open
immediately. This change makes sure replica mdsdir's snaplream
is opened.
Fixes : #12578
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-04 19:28:01 +08:00
Kefu Chai
68e4d620d0
Merge pull request #5140 from tchaikov/wip-pg-ls-update-pending-rel-notes
...
doc: add changes to "pg ls*" commands to pending release notes
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-04 19:08:24 +08:00
Kefu Chai
963c52417e
doc: add changes to "pg ls*" commands to pending release notes
...
"pg ls*" commands now accept recovering instead of recovery as
one of its states.
Fixes : #11569
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-04 19:06:21 +08:00
Kefu Chai
a400b48bfd
Merge pull request #5337 from branch-predictor/bp-reduce-mallocs
...
Thread.cc: remove malloc/free pair
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-04 15:04:29 +08:00
Kefu Chai
eeb660d0a9
Merge pull request #5000 from ceph/wip-da-SCA-20150601
...
Various SCA and Coverity fixes
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-04 15:03:11 +08:00
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
3cbec3521e
Merge pull request #5397 from ceph/wip-12222
...
mon: reject over-large values of max_mds
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-08-03 15:15:51 -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
Sage Weil
145364bbd9
logrotate: fix log rotation with systemd
...
systemctl does not have a nice way to enumerate (active) units so we can
reload them. On centos7, the is-active wildcard syntax does not appear to
be supported. On fedora 22, it prints the state only but not which unit
the state belongs to.
Simply killall -1 instead.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-03 14:41:43 -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
Sage Weil
ec8433df38
Makefile: include systemd udev rules in tarball
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-03 10:57:14 -04: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
Yan, Zheng
217837b89f
client: use smart pointer to track temporary inode reference
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 16:12:18 +08:00
Yan, Zheng
8c45ae1239
client: use smart pointer to track 'cwd' and 'root_parents'
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 16:12:18 +08:00
Yan, Zheng
89648e7ed5
client: convert Inode::snapdir_parent to smart pointer
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 16:12:18 +08:00
Yan, Zheng
e7920c93f2
client: convert CapSnap::in to smart pointer
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 16:12:18 +08:00
Yan, Zheng
dac11e6b4b
client: convert Fh::inode to smart pointer
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 16:12:16 +08:00
Yan, Zheng
fd02f0f245
client: use smart pointers in MetaRequest
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 16:02:41 +08:00
Yan, Zheng
07f5809773
client: convert Dentry::inode to smart pointer
...
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 15:42:34 +08:00
Yan, Zheng
ad9c22a4ca
client: hold reference for returned inode
...
CLient::make_request() returns pointer of target inode, but it does not
increase reference count of the returned inode. The inode may get freed
when CLient::make_request() releases MetaRequest.
he fix is hold a reference for the returned inode. Since there are many
of places use CLient::make_request() directly or indirectly, it's easy
to leak reference. This patch uses intrusive_ptr to track the reference.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-08-03 15:42:33 +08:00
Sage Weil
4d10dc134b
systemd: fix ceph-radosgw@ service
...
There's no prestart. Fix the instance name. Cleanup.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:34 -04:00
Sage Weil
8a67561220
ceph.spec: install the new systemd-based udev rules from ddiss
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:34 -04:00