Sage Weil
4060d21ede
Merge pull request #6202 from cxwshawn/wip-ful-fix
...
rados: implement rm --force option to force remove when full
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-17 08:58:53 -05:00
Sage Weil
03f9c6f2ff
Merge pull request #6956 from somnathr/wip-conditional-drive-metadata-collection
...
osd: FileStore: conditional collection of drive metadata
Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-17 08:35:52 -05:00
Joao Eduardo Luis
cf5da012ad
Merge pull request #6929 from clever215/mon-log
...
mon: degrade a log message to level 2
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-12-17 13:27:41 +00:00
Loic Dachary
54d6b47a09
Merge pull request #6864 from scienceluo/wip-cleanup
...
osdmap: remove unused local variables
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-17 07:52:19 +01:00
scienceluo
2e17c34bb9
osdmap: remove unused local variables
...
Signed-off-by: luo kexue <luo.kexue@zte.com.cn>
2015-12-17 11:56:52 +08:00
Josh Durgin
6e02d3288c
Merge pull request #6904 from wuxiangwei/wip-wxw-rbdadminsocket
...
rbd: add pool name to disambiguate rbd admin socket commands
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-16 17:21:19 -08:00
Josh Durgin
8acfddc9e9
Merge pull request #6942 from x11562/stripe
...
rbd: striping parameters should support 64bit integers
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-16 17:18:08 -08:00
Somnath Roy
3296905f95
FileStore: Conditional collection of drive metadata
...
get_device_by_uuid->blkid_find_dev_with_tag() call from
FileStore::collect_metadata() is hanging for ~3min before returning
EINVAL in case the drive is visible but reserved for some other host.
This is probably is bug within blkid* calls. fdisk/lsblk call is coming
out immediately saying device is inaccessible. This call is now
protected by config option filestore_collect_device_partition_information
Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
2015-12-16 17:02:17 -05:00
Sage Weil
fbd5959fc9
doc/release-notes: v10.0.1
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-12-16 13:03:45 -05:00
Sage Weil
91bf56e26b
Merge remote-tracking branch 'gh/jewel'
2015-12-16 10:48:15 -05:00
Sage Weil
4fc410280c
Merge pull request #6932 from aiicore/test_fix
...
tests: allow object corpus readable test to skip specific incompat instances
Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-16 08:46:50 -05:00
Yan, Zheng
db8bf2dcea
Merge pull request #6941 from jcsp/wip-14029
...
mds: fix setvxattr (broken in a536d114
)
2015-12-16 19:55:40 +08:00
na xie
82841656a5
rbd: process crushed, rbd creating with striping parameters
...
Signed-off-by: Na Xie <xie.na@h3c.com>
2015-12-16 09:48:31 +08:00
David Zafman
1d7b53f42f
Merge pull request #6948 from ceph/revert-6939-bp-remove-bz2dev
...
Revert "makefiles: remove bz2-dev from dependencies"
Reviewed-by: Dan Mick <dmick@redhat.com>
2015-12-15 17:47:01 -08:00
Samuel Just
35542eb6ed
Revert "makefiles: remove bz2-dev from dependencies"
2015-12-15 15:12:19 -08:00
Ken Dreyer
ff9712b249
Merge pull request #6692 from SUSE/wip-13860
...
ceph.spec.in: add BuildRequires: systemd
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-12-15 08:28:06 -07:00
Kefu Chai
34ceddf026
Merge pull request #6939 from branch-predictor/bp-remove-bz2dev
...
makefiles: remove bz2-dev from dependencies
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-15 22:43:27 +08:00
Loic Dachary
09c57ff521
Merge pull request #6943 from smithfarm/wip-doc-dev-typo
...
doc: fix typo in developer guide
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-15 15:33:21 +01:00
Nathan Cutler
fec545839c
doc: fix typo in developer guide
...
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-12-15 15:25:45 +01:00
wuxiangwei
4bf6fbf21a
rbd: specify pool name for rbd admin socket commands
...
Add the pool name for a given rbd imgae when executing rbd admin socket
commands in case there are more than one images with the same name in
different pools.
Signed-off-by: Xiangwei Wu wuxiangwei@h3c.com
2015-12-15 08:28:41 -05:00
John Spray
d465830115
mds: fix setvxattr (broken in a536d114
)
...
There was an accidental move of this line
when adding the MAY_SET_POOL check, which
was causing setxattr to proceed before
it had the right locks, and thereby apply
its checks on bad data (symptom was failing
to detect that the file had data written to it).
Fixes : #14029
Signed-off-by: John Spray <john.spray@redhat.com>
2015-12-15 13:22:23 +00:00
John Spray
d278134232
Merge pull request #6821 from H3C/wip-cephfs-f11322
...
ceph-fuse: add process to ceph-fuse --help
Reviewed-by: John Spray <john.spray@redhat.com>
2015-12-15 13:15:43 +00:00
Piotr Dałek
a8b5920259
makefiles: remove bz2-dev from dependencies
...
The only thing that uses bzip2-devel is RocksDB, and it's optional, not
requirement. Drop the bzip2-devel/libbz2-dev dependency entirely, and
let RocksDB use it only if it is already present.
Fixes : #13981
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-12-15 14:01:51 +01:00
Wei Feng
9409e96aed
ceph-fuse: add process to ceph-fuse --help
...
Signed-off-by: Wei Feng <feng.wei@h3c.com>
2015-12-15 07:45:07 -05:00
Loic Dachary
736532cac9
Merge pull request #6934 from smithfarm/wip-14070
...
doc: Update list of admin/build-doc dependencies
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-15 13:24:47 +01:00
Nathan Cutler
eadc771d27
doc: Update list of admin/build-doc dependencies
...
http://tracker.ceph.com/issues/14070 Fixes : #14070
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-12-15 12:41:29 +01:00
Igor Podoski
8d68d0237c
test/encoding/readable.sh: add non-whole type skip
...
With this modification there will be possibility to skip only one/few
object/s of particular type, not whole type as it was before.
Before:
- To skip whole TYPE create file named TYPE in forward_incompat
directory.
Now:
- To skip whole TYPE create file or empty directory named TYPE in
forward_incompat directory.
- To skip one/few object/s of TYPE create directory named TYPE in
forward_incompat and put into symbolic links to objects that
you wantt to skip.
Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
2015-12-15 12:08:17 +01:00
Loic Dachary
9c34d0c4e4
Merge pull request #6910 from dachary/wip-dev-guide-ceph-qa-suite
...
doc: dev: introduction to tests
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-12-15 11:21:51 +01:00
Loic Dachary
575d2380af
Merge pull request #6927 from tchaikov/wip-fix-ftbfs
...
rgw: fix the build failure
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-15 08:52:51 +01:00
Kefu Chai
34a6c2aeae
rgw: remove unused variable
...
to fix the compiler warning of
rgw/rgw_formats.cc: In member function 'virtual void
RGWFormatter_Plain::dump_format_va(const char*, const char*, bool, const
char*, __va_list_tag*)':
rgw/rgw_formats.cc:143:15: warning: unused variable 'format'
[-Wunused-variable]
const char *format;
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-12-15 14:46:16 +08:00
Kefu Chai
a57784f75f
rgw: fix the build failure
...
* s/bucket_name_str/bucket_name/
* the member variable name of `req_state` was changed to `bucket_name`
in f7ca00a. but some commits was still using the old name before the
commit got merged.
* fixes for the tenant related change
* also fixes a typo
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-12-15 14:17:06 +08:00
Josh Durgin
265e18fc36
Merge pull request #6859 from dillaman/wip-librbd-async-refresh
...
librbd: image refresh code paths converted to async state machines
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-14 20:14:13 -08:00
Jason Dillaman
d2d4bb42d5
librbd: refresh object map after rollback
...
An image refresh will no longer trigger an automatic object map
reload, therefore explicitly reload the object map after rollback.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
db2d495cce
librbd: refresh image asynchronously from watch/notify path
...
The AIO path already ensures asynchronous image refreshes, but the
watch/notify path for maintenance ops was still using the sync refresh
path.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
16547c9b17
librbd: the journal state machine is now asynchronous
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
2a4aad5ffb
tests: adjust test cases to refactored librbd
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
7e3a032224
librbd: all object map methods are now async
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
8ef37b0259
librbd: IO ops will now asynchronously refresh the image if needed
...
This avoids blocking the AIO path with the previous synchronous
refresh path.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
01bc5156ef
WorkQueue: PointerWQ now supports out-of-band processing
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
18f4f69f20
librbd: flush all in-flight IO on block write and shut down
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
bad4641547
librbd: add shut down support to the AIO work queue
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
f1973b1d94
librbd: integrate new async image state machines
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
8740ddf0f7
librbd: ImageWatcher should release lock upon request
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
c00b28b017
librbd: implement image state tracker for open/close/refresh/etc
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
3fd24eb2cd
librbd: rename ImageRefresh to ImageState
...
This class handles more than just refreshing the image from
disk.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
1673332353
librbd: object map lifespan now controlled by state machines
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
ccdeb15157
librbd: decouple ImageWatcher from exclusive lock management
...
Use new ExclusiveLock state machine to handle all the proper
transitions between lock states.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
6e1718c758
librbd: separate image refresh into async state machines
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
22eb25bc20
tests: exclusive lock state machines test cases
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00
Jason Dillaman
8aabb8cbc3
librbd: separate exclusive lock handling into async state machines
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-14 20:31:31 -05:00