Commit Graph

41027 Commits

Author SHA1 Message Date
Kefu Chai
927f0f9f28 Merge pull request #4269 from majianpeng/add-recoverable
osd: For ec pool recovery, only for can recoverable object.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-22 10:37:05 +08:00
Kefu Chai
5d1442ef28 Merge pull request #4222 from majianpeng/scrub-fix1
osd/PG: check scrub state when handle CEPH_OSD_OP_SCRUB_MAP.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-22 10:06:40 +08:00
Jianpeng Ma
8f30db8521 test: add test-case for repair unrecovery-ec pg.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-22 09:47:51 +08:00
Jianpeng Ma
bdd6205408 osd: Remove the duplicated func MissingLoc::get_all_missing.
It is the same as MissingLoc::get_needs_recovery.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-22 09:47:51 +08:00
Jianpeng Ma
b16b080332 osd: For object op, first check object whether unfound.
If object unfound, asap return -EIO.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-22 09:47:50 +08:00
Jianpeng Ma
d51806f5b3 osd: Fix ec pg repair endless when met unrecover object.
In repair_object, if bad_peer is replica, it don't add soid in
MissingLoc for ec pool. If there are more bad replica for ec pool
which cause object can't recover, the later recoverying will endless.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-04-22 09:47:50 +08:00
Sage Weil
67990c57a6 Merge pull request #4399 from trociny/fix-osd_df_avgutil
mon: osd df: fix average_util calculation

Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-21 14:27:48 -07:00
Gregory Farnum
1c8913cf2c Merge pull request #4386 from ceph/wip-10657
mds: warn when clients are not advancing their oldest_client_tid

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-21 14:19:21 -07:00
Gregory Farnum
881cb27426 Merge pull request #4331 from ceph/wip-mds-misc
Wip mds misc

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-21 14:13:09 -07:00
Josh Durgin
eff0598a85 Merge pull request #4424 from ceph/wip-doc-nuke-setmap
doc: don't mention ceph osd setmap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-21 12:58:54 -07:00
Loic Dachary
9dbe55ee43 Merge pull request #4420 from tchaikov/wip-man-fix-desc-in-name
man: fix the description in NAME section

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-04-21 19:34:45 +02:00
Josh Durgin
cbc941cb9b Merge pull request #4409 from ceph/wip-11437
rgw: don't use end_marker for namespaced object listing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-21 10:34:15 -07:00
Josh Durgin
d87fb08220 Merge pull request #4408 from ceph/wip-11436
rgw: adjust return code if can't find upload

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-21 10:31:22 -07:00
Josh Durgin
36ff465020 Merge pull request #4407 from ceph/wip-11435
rgw: fail if parts not specified on complete-multipart-upload

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-21 10:29:08 -07:00
Ilya Dryomov
3bfdf54ca3 doc: don't mention ceph osd setmap
ceph osd setmap command was disabled and subsequently removed 5 years
ago.  See 9aadd41b20 ("mon: disable 'osd setmap'") and 6d292397aa
("mon: remove dead 'setmap' code").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-04-21 20:27:59 +03:00
Josh Durgin
0c278d7a3c Merge pull request #4423 from ceph/wip-11370
librbd: better handling for duplicate flatten requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-21 10:23:44 -07:00
Jason Dillaman
ef7e210c3f librbd: better handling for duplicate flatten requests
A proxied flatten request could be replayed, resulting in a
-EINVAL error code being generated on the second attempt. Filter
out that error if it is known the parent did exist before the
op started.

Fixes: #11370
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-21 13:02:29 -04:00
Sage Weil
86ea4cfbd4 Merge pull request #4372 from xiaoxichen/fix_kv_compact_on_mount
Fix kv compact on mount

Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-21 09:31:15 -07:00
Yehuda Sadeh
bfb112406b Merge pull request #4418 from oritwas/wip-11438
rgw: force content-type header for swift account responses without body

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-21 08:44:52 -07:00
Yan, Zheng
12f1b30947 client: add failure injection for not advancing oldest_tid
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 23:14:22 +08:00
Yan, Zheng
901fd1a5c6 mds: include size of completed_requests in session dump
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 23:14:21 +08:00
Yan, Zheng
dcd9302227 mds: warn when clients are not advancing their oldest_client_tid
Fixes: #10657
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-04-21 23:14:15 +08:00
Orit Wasserman
009664e560 rgw: force content-type header for swift account responses without body
This regression was introduced in commit 4cfeca03ad

Fixes: #11438

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-04-21 16:31:57 +02:00
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