Commit Graph

33210 Commits

Author SHA1 Message Date
Sage Weil
a26a2cf6b5 Merge pull request #4455 from liewegas/wip-civetweb-gitignore
civetweb: add .gitignore
2015-04-25 17:06:35 -07:00
Josh Durgin
bff825bdbb Merge pull request #4434 from ceph/wip-7385
librbd: updated cache max objects calculation

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-24 11:45:54 -07:00
Gregory Farnum
927105b021 Merge pull request #4395 from ceph/wip-11381
Fix clear_pipe after reaping progress

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-04-24 11:20:41 -07:00
Josh Durgin
4df9c8e83d Merge pull request #4440 from ceph/wip-11442
Wip 11442

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-24 11:18:38 -07:00
Sage Weil
49d17a1a6e Merge pull request #4401 from yuyuyu101/wip-async-fix-5
Wip async fix 5
2015-04-24 10:43:06 -07:00
Yehuda Sadeh
06d67d9139 rgw_admin: add --remove-bad flag to bucket check
Add this flag so that the bad object will be removed (should be called
only after user has verified that objects content is correct).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-24 09:40:12 -07:00
Yehuda Sadeh
b8beb9be6a Merge pull request #4438 from oritwas/wip-10295
rgw: civetweb should use unique request id

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-24 09:26:24 -07:00
Haomai Wang
8a7e58e2de AsyncMessenger: Don't need to join thread if not started
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-04-24 21:18:50 +08:00
Haomai Wang
0ea0e011a6 Fix clear_pipe after reaping progress
In pipe.cc:1353 we stop this connection and we will let reader and write threads stop. If now reader and writer quit ASAP and we call queue_reap to trigger the reap progress. Now we haven't call "connection_state->clear_pipe(this)" in pipe.cc:1379, so we may assert failure  here.

Fixes: #11381
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-04-24 14:52:36 +08:00
Sage Weil
eb6738c0b5 civetweb: add .gitignore
Signed-off-by: Sage Weil <sage@redhat.com>
2015-04-23 16:03:21 -07:00
Sage Weil
74b36c4d30 Merge pull request #4439 from ceph/wip-11453-rgw-init-as-root
#11453 init-radosgw: run RGW as root

Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-23 15:05:57 -07:00
Ken Dreyer
47339c5ac3 init-radosgw: run RGW as root
The ceph-radosgw service fails to start if the httpd package is not
installed. This is because the init.d file attempts to start the RGW
process with the "apache" UID. If a user is running civetweb, there is
no reason for the httpd or apache2 package to be present on the system.

Switch the init scripts to use "root" as is done on Ubuntu.

http://tracker.ceph.com/issues/11453 Refs: #11453

Reported-by: Vickey Singh <vickey.singh22693@gmail.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-04-23 15:29:38 -06:00
Orit Wasserman
c26225980c rgw: civetweb should use unique request id
max_req_id was moved to RGWRados and changed to atomic64_t.

The same request id resulted in gc giving the same idtag to all objects
resulting in a leakage of rados objects. It only kept the last deleted object in
it's queue, the previous objects were never freed.

Fixes: 10295
Backport: Hammer, Firefly

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-04-23 19:36:35 +02:00
Josh Durgin
97158dfef3 Merge pull request #4451 from ceph/wip-kfsx-flush-on-discard
test_librbd_fsx: flush before discard in krbd mode

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-23 10:17:39 -07:00
Ilya Dryomov
bd050240ce test_librbd_fsx: flush before discard in krbd mode
We need to sync dirty pages before issuing BLKDISCARD, explained in
a comment.

Fixes: #11448
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-04-23 19:31:43 +03:00
Kefu Chai
07cfc83de6 Merge pull request #4444 from big-henry/wip-throttle
common: fix Throttle - unable to reenable throttling after disabling it

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-23 23:34:51 +08:00
Henry Chang
92574ab8f6 Throttle: reset max only if max changed
Save some CPU cycles.

Signed-off-by: Henry Chang <henry@bigtera.com>
2015-04-23 22:23:01 +08:00
Henry Chang
d7de5858ca Throttle: fix wait/get() with new max
We were unable to set a new non-zero max if the original max was 0.
Fix it. Also, add test cases for it.

Signed-off-by: Henry Chang <henry@bigtera.com>
2015-04-23 22:23:01 +08:00
Josh Durgin
2e8d476e7a Merge pull request #4435 from ceph/wip-11451
rgw: fix s3 list buckets

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-22 16:36:44 -07:00
Yehuda Sadeh
be4355ad8e rgw-admin: a tool to fix object locator issue
Objects that start with underscore need to have an object locator,
this is due to an old behavior that we need to retain. Some objects
might have been created without the locator. This tool creates a new
rados object with the appropriate locator.

Syntax:

$ ./radosgw-admin bucket check --check-head-obj-locator \
                               --bucket=<bucket> [--fix]

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-22 15:51:38 -07:00
Yehuda Sadeh
3d4a1d20b8 rgw: set a special object locator if object starts with underscore
Fixes: #11442
Backport: hammer

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-22 13:11:26 -07:00
Yehuda Sadeh
98b59bae7c rgw: fix s3 list buckets
Fixes: #11451
Backport: hammer
Got broken in commit:7dd54fa3621c04c8ea5723fb1bc06b91d81a0c6c.
Resurrect the option to list unlimited number of buckets using the S3
api.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-22 13:09:45 -07:00
Jason Dillaman
0b378942c4 librbd: updated cache max objects calculation
The previous calculation was based upon the image's object size.
Since the cache stores smaller bufferheads, the object size is not
a good indicator of cache usage and was resulting in objects being
evicted from the cache too often.  Instead, base the max number of
objects on the memory load required to store the extra metadata
for the objects.

Fixes: #7385
Backport: firefly, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-22 11:27:35 -04:00
Kefu Chai
89262abc53 Merge pull request #4426 from liewegas/wip-11330
logrotate: prefer service over invoke-rc.d

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-22 17:18:56 +08:00
Orit Wasserman
037de56ca9 Merge pull request #4425 from ceph/wip-10243
civetweb: update max num of threads
2015-04-22 10:38:33 +02:00
Kefu Chai
8d9905d5d9 Merge pull request #4421 from dachary/wip-11441-osd-bench
tests: osd-bench.sh must be verbose on failure

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-22 15:37:54 +08:00
Henry Chang
37edd162a8 mds: fix integer truncation
Client ID is a 64-bit integer. Unlike Ceph daemons, it may go beyond
2147483647 and cause problems.

Signed-off-by: Henry Chang <henry@bigtera.com>
2015-04-22 12:17:39 +08:00
Kefu Chai
56e96f0e30 Merge pull request #4376 from majianpeng/needs-recovery
osd: fix bugs for PG::needs_recovery()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-22 10:49:35 +08:00
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
Jianpeng Ma
f8504700c8 PG: For needs_recovery, asap return if need recover.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-22 09:17:39 +08:00
Jianpeng Ma
34cb1f0cce PG: remove the duplicated code.
assert(!actingbackfill.empty()) is equal to
assert(actingbackfill.end() != actingbackfill.begin()).

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-22 09:11:11 +08:00
Jianpeng Ma
f4e7d4a9c1 PG: fix logic error: don't set need_recovery if peer_missing don't have acting osd.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-04-22 09:11:11 +08:00
Sage Weil
6063a21f9e logrotate.conf: prefer service over invoke-rc.d
On trusty 14.04, service works but invoke-rc.d does not (but is present).

Fixes: #11330
Reported-by: Wim Heirman <wim@heirman.net>
Signed-off-by: Sage Weil <sage@redhat.com>
2015-04-21 16:08:09 -07:00
Loic Dachary
8aea730f69 tests: osd-bench.sh must be verbose on failure
When a command fail as it should but it does not contain the expected
output, display the entire output to confirm it's a false negative.

http://tracker.ceph.com/issues/11441 Fixes: #11441

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-21 23:35:28 +02:00
Loic Dachary
14cb7b8f59 tests: convert osd-bench.sh to ceph-helpers.sh
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-21 23:35:28 +02:00
Loic Dachary
5871781b10 ceph-helpers: implement test_expect_failure
To display the output in case the command did not fail with the expected
output.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-21 23:35:28 +02: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
Yehuda Sadeh
7a432f7bdf civetweb: update max num of threads
Fixes: #10243
cherry-picked upstream fixed into submodule

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-21 11:08:45 -07: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
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