Commit Graph

41416 Commits

Author SHA1 Message Date
Kefu Chai
b2b443cd4a man: fix the description in NAME section
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-04-21 21:12:45 +08:00
Loic Dachary
008b151958 Merge pull request #4370 from guangyy/wip-ec-test-fix
qa : misc fixes to stabilize test-erasure-code suite

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-04-21 13:50:51 +02:00
Kefu Chai
139a57d22d Merge pull request #4411 from hjwsm1989/wip-monstore-pool
mon: ceph-monstore-tool must do out_store.close() in "store-copy" command

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-21 19:36:36 +08:00
Loic Dachary
ba5a88050d Merge pull request #4417 from osynge/wip-LimitNOFILE
Increase max files open limit for OSD daemon.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-04-21 11:50:19 +02:00
huangjun
d85e0f8c50 tools: ceph-monstore-tool must do out_store.close()
this change fixes the "store-copy" command.
Like the bug reported in http://tracker.ceph.com/issues/10093.

Signed-off-by: huangjun <hjwsm1989@gmail.com>
2015-04-21 17:50:03 +08:00
Owen Synge
ebda4ba1c6 Increase max files open limit for OSD daemon.
Under heavy load the number of file descriptors opened
by the OSD can go beyond the 64K file limit. This patch
increases the default to 128K.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-04-21 11:31:24 +02:00
Yan, Zheng
a5c067427d client: inlcude inline data in FLUSHSNAP cap message
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:17 +08:00
Yan, Zheng
2fad86e2f1 client: flush dirty snap data before allowing new writes
this guarantees that new writes do not overwrite existing dirty
snap data.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:17 +08:00
Yan, Zheng
d08d834d53 mds: properly update capability's client_follow
If snap inode exists, capability's client_follow has already been
updated by MDCache::cow_inode(). So we only update client_follow
when the inode was not COWed.

Besides, we need to check return of SnapRealm::get_snap_following().
It can return CEPH_NOSNAP, which is clearly invalid for client_follows.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:17 +08:00
Yan, Zheng
c9fe13fddc mds: fix Locker::_do_null_snapflush
the snapid check in Locker::_do_null_snapflush() prevents us from
flushing old snap inodes. The check does not make sense.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:17 +08:00
Yan, Zheng
fa34e04587 mds: do null snap flush when processing embeded cap releases
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:16 +08:00
Yan, Zheng
ab44e5971f mds: make sure snap inode's last match existing snapshots
MDCache::pick_inode_snap() and snap caps flushing code require
this.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:16 +08:00
Yan, Zheng
fc758ce7f1 mds: remove stray dentry from delayed list when it's queued for purging
this avoids assert(!dn->state_test(CDentry::STATE_PURGING)) in
eval_stray() being triggered when processing the delayed list.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:16 +08:00
Yan, Zheng
5c09be262c mds: move snap inode to new dirfrag's dirty_rstat_inodes
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:56:16 +08:00
Yan, Zheng
d900252729 mds: keep auth pin on CDir when marking it dirty
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 13:55:43 +08:00
Jianpeng Ma
2e90fa3d5d osd/PG: check scrub state when handle CEPH_OSD_OP_SCRUB_MAP.
There is a chance which cause scrub stop before replica-node send
scrub-map.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-21 11:48:41 +08:00
Yehuda Sadeh
d9bf04fdb6 Merge pull request #4257 from rzarzynski/wip-10683
rgw: rectify support for GET on Swift's account with "limit" parameter == 0

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-20 17:24:11 -07:00
Yehuda Sadeh
d2a67282e0 rgw: don't use end_marker for namespaced object listing
Fixes: #11437

Don't deal with end_marker if there's a namespace set for the object
listing. The cur_end_marker.empty() check is incorrect if no end_marker
is provided, but a namespace is set. Just avoid this issue entirely, as
it's not needed.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-20 16:03:44 -07:00
Yehuda Sadeh
58a144de56 rgw: adjust return code if can't find upload
Fixes: #11436

Return NoSuchUpload (instead of NoSuchKey).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-20 15:01:34 -07:00
Yehuda Sadeh
6ee4f64973 rgw: fail if parts not specified on complete-multipart-upload
Fixes: #11435

A complete multipart upload should not succeed if parts were not
specified. Also, adjust return codes.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-20 14:47:16 -07:00
Jason Dillaman
890d6ee032 Merge pull request #4406 from ceph/wip-11433
librbd: always initialize perf counters

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-04-20 16:47:20 -04:00
Josh Durgin
66edf625b4 librbd: always initialize perf counters
If ImageCtx::init() fails, perf counters are still used when closing
the image. To prevent uninitialized use, it's easiest to always
initialize them before anything that can fail in ImageCtx::init().

This was moved in 6055df3985, but it's
not necessary to delay perf counter initialization for any extra
configuration.

Fixes: #11433
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-04-20 11:34:31 -07:00
Gregory Farnum
c1de23ff45 Merge pull request #4302 from ceph/wip-11339
client: drop inode when rmdir request finishes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-20 11:12:38 -07:00
Gregory Farnum
392e824736 Merge pull request #4282 from ceph/wip-3645
mds: rename snapshot support

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com
2015-04-20 11:10:21 -07:00
Josh Durgin
1e912b79f5 Merge pull request #4405 from ceph/wip-11380
cls_rbd: get_features needs to support legacy negative tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-20 10:23:54 -07:00
Josh Durgin
7147708483 Merge pull request #4402 from ceph/wip-rbd-unmap-by-spec
rbd unmap <image-name>

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-20 10:19:27 -07:00
Jason Dillaman
66493b7e83 cls_rbd: get_features needs to support legacy negative tests
During Ceph upgrade testing, older Ceph test suites assume that
get_features will return -ENOENT if provided a missing snapshot.
Support these negative tests until the older releases are no
longer supported.

Fixes: #11380
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-20 12:40:33 -04:00
Yehuda Sadeh
7efea25c6c Merge pull request #3991 from rzarzynski/wip-11087
rgw: multiple fixes for copying Swift objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-20 09:38:20 -07:00
Yehuda Sadeh
eb787a403b Merge pull request #3863 from rzarzynski/wip-10971
rgw: multiple fixes for Content-Length header generation in Swift API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-20 09:21:24 -07:00
Radoslaw Zarzynski
7dd54fa362 rgw: make rgw_read_user_buckets() backward compatible.
Fixes: #10683
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015-04-20 15:04:57 +02:00
Radoslaw Zarzynski
f7b92f9988 rgw: rectify support for GET on Swift's account with limit == 0.
Fixes: #10683
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015-04-20 15:04:53 +02:00
Jianpeng Ma
16af675e2e test: add test-case for copy_get flags.
Until now, copy_get used in promote_object/flush_object and
CEPH_OSD_OP_COPY_FROM. We add test cases for promote_object and
copy_from.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-20 16:22:06 +08:00
Jianpeng Ma
2b4acfb1b8 rados: Add new field flags for ceph_osd_op.copy_get.
Using this field as the copy_get flags.
When using 'rados cp' copy a no-ec object w/ omap data into ecpool, it
will met this bug:
 osd/ReplicatedPG.cc: 6463: FAILED assert(cop->omap_header.length() == 0)

So we add CEPH_OSD_COPY_GET_FLAG_NOTSUPP_OMAP which avoid copy omap-object from
one pool to other.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-20 16:19:00 +08:00
Loic Dachary
b142c92344 Merge pull request #4400 from ceph/update-organization-1
Update Haomai's organization

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-04-20 10:13:03 +02:00
Kefu Chai
9403df27f6 Merge pull request #3847 from trociny/wip-test_with_crushtool.master
mon: ceph osd setcrushmap: test_with_crushtool improvements

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-20 16:04:25 +08:00
Haomai Wang
b05d144c2f AsyncConnection: Fix deadlock cause by throttle block
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-04-20 14:51:05 +08:00
Haomai Wang
0c75b8804a AsyncConnection: Avoid lockdep check assert failure
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-04-20 11:38:16 +08:00
Haomai Wang
69bedcd692 Event: Fix memory leak for notify fd
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-04-20 11:01:15 +08:00
Gregory Farnum
a84ae7b14e Merge pull request #4343 from ceph/wip-11356
client: fix uninline data funtion

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-19 17:53:52 -07:00
Gregory Farnum
0f2de92db3 Merge pull request #4223 from ceph/wip-11254
mds: make sure lock state not stay in XLOCK/XLOCKDONE indefinitely

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-19 17:53:00 -07:00
Gregory Farnum
0b94bf547d Merge pull request #4218 from ceph/wip-11048
mds: persist completed_requests reliably

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-19 17:52:09 -07:00
Gregory Farnum
b25e9e130b Merge pull request #4204 from ceph/wip-10368-mk3
mds: separate MDLog::safe_pos from journaler

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-19 17:51:12 -07:00
Mykola Golub
cc5f144a51 mon: osd df: fix average_util calculation
average_util should be calculated from the same set of nodes that
dump_item considers when calculating the stddev.

While here, remove unnecessary check for kb > 0:
get_bucket_utilization returns false if kb <= 0.

Also, update get_bucket_utilization accordingly to the preferred
convention to use pointers and not references for output arguments.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-04-19 20:18:24 +03:00
Haomai Wang
0374f32b1f Update Haomai's organization
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-04-20 00:48:42 +08:00
Ilya Dryomov
e4ebe10894 test/cli-integration/rbd: add unmap test
Add a test to exercise rbd unmap.  This was inspired by and is mostly
for rbd unmap <image-name> (aka spec), but rbd unmap <device> is tested
as well.  Any significant change to krbd.cc or corresponding rbd cli
should be tested in the following three configurations at least:

- kernel < 3.14
- kernel >= 3.14, rbd.single_major=N
- kernel >= 3.14, rbd.single_major=Y

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-04-19 14:45:37 +03:00
Ilya Dryomov
b1d3f918fb rbd: allow unmapping by spec
Make use of krbd_unmap_by_spec() and allow unmapping by <image-name>
(i.e. pool/image@snap spec) with a bunch of careful adjustments to the
fragile command args/options parsing process to make --pool, --image
and --snap options work as expected for rbd unmap <image-name> case.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-04-19 14:45:37 +03:00
Ilya Dryomov
087ed06340 krbd: add krbd_unmap_by_spec()
Make unmapping by (pool, image, snap) spec possible.  For specs mapped
multiple times unmap one device per krbd_unmap_by_spec() call.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-04-19 14:41:53 +03:00
Ilya Dryomov
a1363c41f2 krbd: rename should_match_minor() to have_minor_attr()
Rename and clarify why simply checking kernel version doesn't work.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-04-19 14:41:53 +03:00
Yan, Zheng
7df2cf243b client: drop inode when rmdir request finishes
Current client code relies on cap message to trim unlinked inode
from cache. This method is too sensitive to message ordering. If
client receives the cap message while directory inode still contains
dentries that are referenced by unsafe requests, the inode can't
get trimmed.

The fix is, when rmdir/rename request finishes, try trimming the
unlinked inode again.

Fixes: #11339
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-19 11:01:08 +08:00
Josh Durgin
69e3ec8a6b Merge pull request #4380 from ceph/wip-nodebug-build
tests: separate check_PROGRAMS from TESTS

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-17 21:52:21 -07:00