]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Loic Dachary [Wed, 4 Nov 2015 10:28:03 +0000 (11:28 +0100)]
Merge pull request #6132 from SUSE/wip-13307-hammer
dumpling incrementals do not work properly on hammer and newer
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:23:14 +0000 (11:23 +0100)]
Merge pull request #6097 from dillaman/wip-13045-hammer
librbd: diff_iterate needs to handle holes in parent images
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:22:25 +0000 (11:22 +0100)]
Merge pull request #6060 from XinzeChi/wip-hammer-outdata-set
bug fix: osd: avoid multi set osd_op.outdata in tier pool
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:20:50 +0000 (11:20 +0100)]
Merge pull request #5897 from tchaikov/wip-12940-hammer
IO error on kvm/rbd with an erasure coded pool tier
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:11:00 +0000 (11:11 +0100)]
Merge pull request #5787 from SUSE/wip-12923-hammer
logrotate reload error on Ubuntu 14.04
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:10:26 +0000 (11:10 +0100)]
Merge pull request #5766 from dachary/wip-12590-hammer
ceph mds add_data_pool check for EC pool is wrong
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:06:18 +0000 (11:06 +0100)]
Merge pull request #5361 from ceph/wip-11786.hammer
mon: MonitorDBStore: get_next_key() only if prefix matches
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Jenkins [Mon, 26 Oct 2015 14:05:32 +0000 (07:05 -0700)]
0.94.5
Loic Dachary [Fri, 23 Oct 2015 18:41:33 +0000 (20:41 +0200)]
Merge pull request #6348 from dillaman/wip-13567-hammer
librbd: potential assertion failure during cache read
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Fri, 23 Oct 2015 13:20:32 +0000 (15:20 +0200)]
Merge pull request #6362 from liewegas/wip-shut-up-osd-hammer
osd/ReplicatedPG: remove stray debug line
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Sat, 12 Sep 2015 12:33:44 +0000 (08:33 -0400)]
osd/ReplicatedPG: remove stray debug line
This snuck in
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
ff9600a6cef613d40e875597b6392778df1bb04c )
Jason Dillaman [Wed, 21 Oct 2015 17:12:48 +0000 (13:12 -0400)]
librbd: potential assertion failure during cache read
It's possible for a cache read from a clone to trigger a writeback if a
previous read op determined the object doesn't exist in the clone,
followed by a cached write to the non-existent clone object, followed
by another read request to the same object. This causes the cache to
flush the pending writeback ops while not holding the owner lock.
Fixes: #13559
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4692c330bd992a06b97b5b8975ab71952b22477a )
Jason Dillaman [Wed, 21 Oct 2015 17:09:54 +0000 (13:09 -0400)]
tests: reproduce crash during read-induced CoW
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
382219b6bba09156f8cf3d420c6348738e7ed4c6 )
Jason Dillaman [Thu, 22 Oct 2015 16:14:42 +0000 (12:14 -0400)]
Merge pull request #6330 from dachary/wip-13550-hammer
qemu workunit refers to apt-mirror.front.sepia.ceph.com
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuan Zhou [Thu, 18 Jun 2015 16:02:20 +0000 (00:02 +0800)]
qa: Use public qemu repo
This would allow some external tests outside of sepia lab
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
(cherry picked from commit
4731c1e35539c9506ff3fe3141553fad099d0eee )
Jenkins [Mon, 19 Oct 2015 14:43:50 +0000 (07:43 -0700)]
0.94.4
Sage Weil [Thu, 15 Oct 2015 20:35:10 +0000 (16:35 -0400)]
Merge pull request #6287 from jcsp/wip-test-fixes
git path backports for hammer
Sage Weil [Thu, 16 Apr 2015 15:29:41 +0000 (08:29 -0700)]
use git://git.ceph.com
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
34c467ba06345eacd2fd0e79c162dfd0b22f0486 )
Sage Weil [Thu, 24 Sep 2015 22:10:46 +0000 (18:10 -0400)]
qa: http://ceph.com/qa -> http://download.ceph.com/qa
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
d4d65fbd6ad15320339751c604613ac63511e645 )
Loic Dachary [Mon, 12 Oct 2015 22:28:52 +0000 (00:28 +0200)]
Merge pull request #6161 from dachary/wip-13227-hammer
With root as default user, unable to have multiple RGW instances running
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Sage Weil [Thu, 7 May 2015 22:40:05 +0000 (15:40 -0700)]
init-radosgw.sysv: remove
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
9d8c115b0ab05cfc1db6670d1d367737e61fe0ea )
Yehuda Sadeh [Mon, 12 Oct 2015 15:16:17 +0000 (08:16 -0700)]
Merge pull request #6166 from dachary/wip-13046-hammer
RGW : setting max number of buckets for user via ceph.conf option
Yehuda Sadeh [Mon, 12 Oct 2015 15:15:21 +0000 (08:15 -0700)]
Merge pull request #6039 from ceph/wip-13015-hammer
rgw: don't preserve acls when copying object
Yehuda Sadeh [Mon, 12 Oct 2015 15:14:47 +0000 (08:14 -0700)]
Merge pull request #6042 from dreamhost/wip-hammer-crossftp
rgw: remove trailing :port from host for purposes of subdomain matching
Yehuda Sadeh [Mon, 12 Oct 2015 15:14:09 +0000 (08:14 -0700)]
Merge pull request #6160 from dachary/wip-13228-hammer
rgw: segments are read during HEAD on Swift DLO
Yehuda Sadeh [Mon, 12 Oct 2015 15:13:25 +0000 (08:13 -0700)]
Merge pull request #6162 from dachary/wip-13226-hammer
Keystone Fernet tokens break auth
Yehuda Sadeh [Mon, 12 Oct 2015 15:12:26 +0000 (08:12 -0700)]
Merge pull request #6163 from dachary/wip-13054-hammer
rgw: region data still exist in region-map after region-map update
Yehuda Sadeh [Mon, 12 Oct 2015 15:12:07 +0000 (08:12 -0700)]
Merge pull request #6164 from dachary/wip-13053-hammer
rgw: GWWatcher::handle_error -> common/Mutex.cc: 95: FAILED assert(r == 0)
Yehuda Sadeh [Mon, 12 Oct 2015 15:11:16 +0000 (08:11 -0700)]
Merge pull request #5718 from dachary/wip-12859-hammer
testGetContentType and testHead failed
Yehuda Sadeh [Mon, 12 Oct 2015 15:10:55 +0000 (08:10 -0700)]
Merge pull request #5860 from lebauce/wip-12960-hammer
rgw: add delimiter to prefix only when path is specified
Yehuda Sadeh [Mon, 12 Oct 2015 15:08:59 +0000 (08:08 -0700)]
Merge pull request #6165 from dachary/wip-13052-hammer
rgw: init_rados failed leads to repeated delete
Loic Dachary [Fri, 9 Oct 2015 07:17:19 +0000 (09:17 +0200)]
Merge pull request #6201 from dachary/wip-13410-hammer
TEST_crush_rule_create_erasure consistently fails on i386 builder
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Thu, 8 Oct 2015 16:18:49 +0000 (12:18 -0400)]
Merge pull request #5885 from Abhishekvrshny/wip-13034-hammer
osd: copy-from doesn't preserve truncate_{seq,size}
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Wed, 22 Jul 2015 08:42:32 +0000 (10:42 +0200)]
tests: robust test for the pool create crushmap test
The test that goes with
f1e86be589803596e86acc964ac5c5c03b4038d8 to
verify that a bugous crush ruleset will prevent the creation of a pool
trying to use it was fragile. I depends on the implementation of the
erasure code lrc plugin and turns out to not work on i386.
The test is modified to use a fake crushtool that always returns false
and validate that it prevents the creation of a pool, which demonstrate
it is used for crushmap validation prior to the pool creation.
http://tracker.ceph.com/issues/12419 Fixes: #12419
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit
e47903727b5d53f795014bf29b417d357f2bd65a )
Jason Dillaman [Fri, 1 May 2015 18:21:35 +0000 (14:21 -0400)]
librbd: invoking RBD::open twice will leak memory
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a5e88fcf11ebb16d4a1405b21cf6f895b37f185e )
Loic Dachary [Wed, 7 Oct 2015 22:09:24 +0000 (00:09 +0200)]
Merge pull request #6192 from dachary/wip-13401-hammer
mon: fix crush testing for new pools
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 21 Aug 2015 20:40:34 +0000 (16:40 -0400)]
crush/CrushTester: test fewer inputs when running crushtool
If there are a lot of crush rules (say, 100) then the test can
take a long time. 100 values per rule should be enough to catch
most issues.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
0f82f461b33d93d868e185912a2c7e4074d06900 )
Conflicts:
src/crush/CrushTester.cc
in hammer the crushtool validation is via a shell
and not via an internal subprocess utility
Loic Dachary [Sun, 20 Sep 2015 21:42:45 +0000 (23:42 +0200)]
tests: update to match crushmap validation message
http://tracker.ceph.com/issues/13182 Fixes: #13182
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit
21a1e75d8a7bad89a48cd9d36902c5d609be5015 )
Conflicts:
qa/workunits/cephtool/test.sh
the test structure in hammer is different, adapt
the relevant test.
Sage Weil [Fri, 18 Sep 2015 13:42:47 +0000 (09:42 -0400)]
mon/OSDMonitor: fix crush injection error message
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
1b3090d50e5bd5ca3e6e396b23d2d9826896c718 )
Conflicts:
src/mon/OSDMonitor.cc
hammer has a separate error message for EINTR
which is in the context of the fix for error message
Sage Weil [Fri, 18 Sep 2015 13:41:25 +0000 (09:41 -0400)]
mon/OSDMonitor: only test crush ruleset for the newly created pool
Otherwise, we test *all* crush rules.. which might be a lot, and
which is a big waste of time and effort.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
524b0bdcc45c2f4b95f2239c988e93250f337f3d )
Conflicts:
src/mon/OSDMonitor.cc : trivial resolution
Sage Weil [Fri, 18 Sep 2015 13:40:13 +0000 (09:40 -0400)]
crush/CrushTester: allow testing by ruleset
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
aa238e5ed50f44a94caf84567267e4f6be8732a2 )
Conflicts:
src/crush/CrushTester.cc
in hammer the crushtool validation is via a shell
and not via an internal subprocess utility
src/tools/crushtool.cc
ceph_argparse_withint is preferred to ceph_argparse_witharg
Sage Weil [Tue, 6 Oct 2015 15:11:14 +0000 (11:11 -0400)]
Merge pull request #5887 from Abhishekvrshny/wip-13044-hammer
LibCephFS.GetPoolId failure
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Sun, 4 Oct 2015 13:33:49 +0000 (15:33 +0200)]
Merge pull request #6172 from dachary/wip-13354-hammer
qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Mon, 28 Sep 2015 17:13:40 +0000 (13:13 -0400)]
qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45
e.g., it's 5 in teuthology's ceph.conf.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
80b7237e5e74d12b9d8b1f96ea535c96bdff9c6f )
dwj192 [Wed, 9 Sep 2015 01:48:16 +0000 (09:48 +0800)]
rgw:add --reset-regions for regionmap update
Fixes: #12964
Signed-off-by: Weijun Duan <duanweijun@h3c.com>
(cherry picked from commit
95685c19d6f1eab50b903e61273b5351bedc2980 )
Conflicts:
src/rgw/rgw_admin.cc: usage is on cerr in hammer, not cout
src/test/cli/radosgw-admin/help.t: remove extra empty line
Loic Dachary [Sat, 3 Oct 2015 07:39:12 +0000 (09:39 +0200)]
Merge pull request #6156 from dachary/wip-13170-hammer
doc: update docs to point to download.ceph.com
Reviewed-by: Abhishek Varshney <abhishek.varshney@flipkart.com>
Vikhyat Umrao [Thu, 3 Sep 2015 06:32:05 +0000 (12:02 +0530)]
rgw : setting max number of buckets for users via ceph.conf option
This patch adds a new option "rgw_user_max_buckets" for setting
max number of buckets for users via ceph.conf.
Fixes #12714
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit
f65267c96cbd4cd25036b6bf399692e77bbb9436 )
Conflicts:
src/rgw/rgw_admin.cc: usage is on cerr in hammer, not cout
Xiaowei Chen [Tue, 8 Sep 2015 10:58:57 +0000 (06:58 -0400)]
rgw: init_rados failed leads to repeated delete
Fixes: #12978
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit
ab4232baa7bcc86e90746e13312ac9bda1772872 )
Yehuda Sadeh [Wed, 26 Aug 2015 22:08:18 +0000 (15:08 -0700)]
rgw: delete finisher only after finalizing watches
Fixes: #12208
The watch error path might try to schedule a finisher work, delete finisher
only after watch destruction.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
97aed59fb9e865d30d31d2b7f4e93fc9727c96fa )
Abhishek Lekshmanan [Mon, 24 Aug 2015 17:41:35 +0000 (23:11 +0530)]
rgw: be more flexible with iso8601 timestamps
make parsing 8601 more flexible by not restricting the length of seconds
to 5, this allows timestamp to be specified both as ms or us. Newer
keystone backends such as fernet token backend default to microseconds
when publishing iso8601 timestamps, so this allows these timestamps to
be allowed when specifying the token expiry time.
Fixes: #12761
Reported-by: Ian Unruh <ianunruh@gmail.com>
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
(cherry picked from commit
136242b5612b8bbf260910b1678389361e86d22a )
Sage Weil [Tue, 22 Sep 2015 18:12:02 +0000 (14:12 -0400)]
init-radosgw: specify pid file to start-stop-daemon
This fixes restart when multiple instances are running.
Fixes: #12407
Tested-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
e17c8e1a7a06db0e2680dedc7e954021610320d1 )
Vikhyat Umrao [Thu, 23 Jul 2015 12:40:06 +0000 (18:10 +0530)]
rgw: fix radosgw start-up script.
radosgw init script is unable to start radosgw daemon.
as it is relies on requiretty being disabled.
once init script start this daemon with sudo it fails
to start the daemon.
changing 'sudo' to 'su', it will fix this issue and
will also help running radosgw daemon with our new
"ceph" UID project.
Fixes: #10927
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit
c83542296aeb8f5dd96f5d9e09327e7a89370742 )
Sage Weil [Thu, 7 May 2015 22:39:22 +0000 (15:39 -0700)]
init-radosgw: unify init-radosgw[.sysv]
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
1c45f512a91ee49e9253ba6fd3857af9bd2ae57a )
Sage Weil [Thu, 7 May 2015 22:29:11 +0000 (15:29 -0700)]
init-radosgw: look in /var/lib/ceph/radosgw
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
a4bb992426b39188e750fce9198052ca0d510117 )
Nathan Cutler [Sun, 10 May 2015 16:17:53 +0000 (18:17 +0200)]
doc: rgw: fix typo in comments
Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit
05cf0db22dc3a9cb2bf4b86b8f240683c23f41ac )
Dmitry Yatsushkevich [Tue, 17 Mar 2015 22:44:52 +0000 (15:44 -0700)]
rgw: init script waits until the radosgw stops
Fixes: #11140
Init script waits in stop action until the radowgw daemons stop.
Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
(cherry picked from commit
1cca0c1e91a1e18f82f4d22855e96b2fc947f5ea )
Yehuda Sadeh [Thu, 17 Sep 2015 16:10:39 +0000 (09:10 -0700)]
rgw: don't read actual data on user manifest HEAD
Fixes: #12780
We unconditionally read all the data, which is not needed
when doing HEAD operation on user manifest objects.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
4a8b08d1dd2511e28e999f1625103fb919fb5465 )
Alfredo Deza [Fri, 18 Sep 2015 18:20:12 +0000 (14:20 -0400)]
doc: remove mention of ceph-extra as a requirement
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
a6f07e9fa3bd5e50a2d8cfa387b44a39d383fa65 )
Alfredo Deza [Fri, 18 Sep 2015 18:13:21 +0000 (14:13 -0400)]
doc: remove ceph-extras
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
c0ef84fd22aac58b6ec8e58eb4f8dffed306d39e )
Alfredo Deza [Fri, 18 Sep 2015 18:13:02 +0000 (14:13 -0400)]
doc: correct links to download.ceph.com
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
387d7800359154950431d0984c756f43f21dd9b4 )
ritz303 [Tue, 25 Aug 2015 15:02:49 +0000 (10:02 -0500)]
doc: Added "Hammer" in the list of major releases.
Fixes: #12771
Signed-off-by: ritz303 <ritz_303@yahoo.com>
(cherry picked from commit
582f0f64455079290ad3b4ae7338b716e170911f )
Samuel Just [Fri, 25 Sep 2015 01:35:39 +0000 (18:35 -0700)]
OSDMap: fill in known encode_features where possible
Otherwise, if we get an incremental from hammer (struct_v = 6) we will
encode the full map as if it were before CEPH_FEATURE_PGID64, which
was actually pre-argonaut. Similarly, if struct_v >= 7, we know it
was encoded with CEPH_FEATURE_OSDMAP_ENC.
Fixes: #13234
Backport: hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
04679c5451e353c966f6ed00b33fa97be8072a79 )
Yehuda Sadeh [Fri, 25 Sep 2015 17:44:40 +0000 (10:44 -0700)]
rgw: set default value for env->get() call
Fixes: #13239
This fixes a regression introduced at commit
abe4ec293d08b0314bf5c081ace2456073f3a22c .
The host var is a string, env->get() returns a char pointer, shouldn't
pass in NULL.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
0d5730efc0054334897315dc23ba04f30548e36e )
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Jason Dillaman [Tue, 8 Sep 2015 19:47:37 +0000 (15:47 -0400)]
librbd: diff_iterate needs to handle holes in parent images
If a clone's parent image snapshot includes a discarded extent,
this was previously causing an assert failure. Instead, ignore
any discard holes in the parent image.
Fixes: #12885
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3ccc3bb4bd35e57209852d460633e371b4d004e2 )
Conflicts:
src/librbd/DiffIterate.cc : file doesn't exist in hammer, logic is in internal.cc
Jason Dillaman [Mon, 28 Sep 2015 14:25:07 +0000 (10:25 -0400)]
tests: new test case for librbd diff_iterate over discard extents
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d5650c9cf85188efa73b279c8f4e4723fa475308 )
Conflicts:
src/test/librbd/test_librbd.cc : diff_iterate2 doesn't exist in hammer
Sage Weil [Mon, 21 Sep 2015 15:41:03 +0000 (11:41 -0400)]
osd/ReplicatedPG: tolerate promotion completion with stopped agent
We may start a promotion, then get a pool update that disables the
agent, and then complete it. We should not segfault in this case.
Fixes: #13190
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
fd9ce66e8b76787f69c5e337332d57aa72c8b8d5 )
Sage Weil [Tue, 9 Jun 2015 18:15:10 +0000 (14:15 -0400)]
rgw: remove trailing :port from host for purposes of subdomain matching
Some clients (ahem, CrossFTP) include the :port in the HTTP_HOST header.
Strip it out.
Switch req_info field to a std::string and avoid copying it in preprocess.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
abe4ec293d08b0314bf5c081ace2456073f3a22c )
Yehuda Sadeh [Thu, 24 Sep 2015 21:01:26 +0000 (14:01 -0700)]
Merge pull request #5715 from dachary/wip-12592-hammer
RGW returns requested bucket name raw in Bucket response header
Yehuda Sadeh [Thu, 24 Sep 2015 21:00:55 +0000 (14:00 -0700)]
Merge pull request #5719 from dachary/wip-12855-hammer
segmentation fault when rgw_gc_max_objs > HASH_PRIME
Yehuda Sadeh [Thu, 24 Sep 2015 21:00:09 +0000 (14:00 -0700)]
Merge pull request #5720 from dachary/wip-12854-hammer
the arguments 'domain' should not be assigned when return false
Xinze Chi [Mon, 8 Jun 2015 08:54:08 +0000 (16:54 +0800)]
bug fix: osd: avoid multi set osd_op.outdata in tier pool
There are two read op on the same object for ec pool. First op read
miss happend, calling do_proxy_read and promote_object, The second op only
do_proxy_read. but before first op process_copy_chunk finish, the second op
finish_proxy_read. first op receive reply from base pool
first and then second received. so the second op set the field "outdata"
in m->ops first. And then first op requeue_ops in process_copy_chunk,
At last in do_osd_ops, it append outdata field.
Fixes: 12540
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit
855ae1fd6e4557adba1cbd8ab532488b867cee2a )
Conflicts:
src/osd/ReplicatedPG.cc
Yehuda Sadeh [Wed, 9 Sep 2015 22:41:02 +0000 (15:41 -0700)]
rgw: preserve all attrs if intra-zone copy
Fixes: #13015
Intra zone copy requires that all objects' attributes are preserved.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 13 Aug 2015 17:59:32 +0000 (10:59 -0700)]
rgw: don't preserve acls when copying object
Fixes: #12370
When copying an object we need to use the acls we calculated earlier,
and not the source acls.
This was broken at
e41d97c8e38bb60d7e09e9801c0179efe7af1734 .
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
fb020247449d3daf033885bab5b3a10c0e5df4a5 )
Loic Dachary [Tue, 15 Sep 2015 08:23:49 +0000 (10:23 +0200)]
Merge pull request #5930 from liewegas/wip-11798-hammer
upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Mon, 14 Sep 2015 21:57:13 +0000 (23:57 +0200)]
Merge pull request #5908 from liewegas/wip-simple-connect-hammer
Pipe: Drop connect_seq increase line
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Wed, 3 Jun 2015 18:57:34 +0000 (14:57 -0400)]
upstart: limit respawn to 3 in 30 mins (instead of 5 in 30s)
It may take tens of seconds to restart each time, so 5 in 30s does not stop
the crash on startup respawn loop in many cases. In particular, we'd like
to catch the case where the internal heartbeats fail.
This should be enough for all but the most sluggish of OSDs and capture
many cases of failure shortly after startup.
Fixes: #11798
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
eaff6cb24ef052c54dfa2131811758e335f19939 )
Kefu Chai [Fri, 28 Aug 2015 03:36:49 +0000 (11:36 +0800)]
ceph_test_rados_api_aio: add a test for aio_sparse_read
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
076bad955d374cbb37b77e2b0429f3c85f32abc0 )
Kefu Chai [Thu, 27 Aug 2015 14:57:16 +0000 (22:57 +0800)]
ceph_test_rados_api_io: add tests for sparse_read
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
4d4920610ebfcb516630ed15678979c9e9292f5a )
Conflicts:
src/test/librados/test.cc
minor changes and remove C++11 stuff
Kefu Chai [Wed, 26 Aug 2015 07:41:13 +0000 (15:41 +0800)]
ceph_test_rados: also send sparse_read in ReadOp
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
5ae2e7a185b5f95753a09a89d7110fc38848a083 )
Conflicts:
src/test/osd/RadosModel.h
remove the piped-read test
Kefu Chai [Fri, 28 Aug 2015 06:27:53 +0000 (14:27 +0800)]
osd: should use ec_pool() when checking for an ecpool
we were using pool.info.require_rollback() in do_osd_ops() when
handling OP_SPARSE_READ to tell if a pool is an ecpool. should
use pool.info.ec_pool() instead.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
a5bfde69a9d14de67da1e3354173ec70ba089b37 )
Kefu Chai [Thu, 27 Aug 2015 14:57:49 +0000 (22:57 +0800)]
osd: translate sparse_read to read for ecpool
Fixes: #12012
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
700d42ef1c82f5602249b96690ae881c1d259d54 )
Haomai Wang [Wed, 25 Feb 2015 15:38:54 +0000 (23:38 +0800)]
Pipe: Drop connect_seq increase line
Revert commit
0fc47e267b6f8dcd4511d887d5ad37d460374c25 .
When accepting and "connect.connect_seq == existing->connect_seq",
existing->state maybe STATE_OPEN, STATE_STANDBY or STANDY_CONNECTING.
This commit only fix partial problem and want to assert
"(existing->state == STATE_CONNECTING)".
So later we added codes to catch
"(existing->state == STATE_OPEN || existing->state == STATE_STANDBY)"
before asserting.
Backport: dumpling, firefly, giant
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit
67225cb3ee1f6d274a02293724942bdb25cec8ca )
Loic Dachary [Sun, 13 Sep 2015 12:10:23 +0000 (14:10 +0200)]
Merge pull request #5767 from dachary/wip-12597-hammer
Crash during shutdown after writeback blocked by IO errors
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Sun, 13 Sep 2015 11:42:36 +0000 (07:42 -0400)]
Merge pull request #5687 from liewegas/wip-hammer-feature-hammer
include/ceph_features: define HAMMER_0_94_4 feature
Sage Weil [Sat, 12 Sep 2015 13:23:13 +0000 (09:23 -0400)]
Merge pull request #5892 from ceph/wip-13060-hammer
osd: allow peek_map_epoch to return an error
Reviewed-by: David Zafman <dzafman@redhat.com>
Sage Weil [Fri, 11 Sep 2015 15:00:38 +0000 (11:00 -0400)]
osd/PG: peek_map_epoch: skip legacy PGs if infos object is missing
- pg is removed
- osd is stopped before pg is fully removed
- on restart, we ignore/skip the pg because its epoch is too old
- we upgrade to hammer and convert other pgs, skipping this one, and then
remove the legacy infos object
- hammer starts, tries to parse the legacy pg, and fails because the infos
object is gone, crashing.
The fix is to continue ignoring the zombie pg.
Fixes: #16030
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 11 Sep 2015 21:41:01 +0000 (17:41 -0400)]
osd: allow peek_map_epoch to return an error
Allow PG::peek_map_epoch to return an error indicating the PG
should be skipped.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f15d9585edc5a12ac2d076951076247253b897c2 )
[fixed *pepoch default of 0]
[fixed other return paths in peek_map_epoch]
Yan, Zheng [Wed, 5 Aug 2015 07:19:13 +0000 (15:19 +0800)]
crypto: fix unbalanced ceph::crypto::init/ceph::crypto:shutdown
we may create a CephContext without calling common_init_finish(), then
delete the CephContext. In this case, ceph::crypto:init() is not called,
so CephContext::~CephContext() should not call ceph::crypto::shutdown().
Fixes: #12598
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit
98a85ec6464d8ec3fc7f0c647ac97c8cf002ebe2 )
Samuel Just [Thu, 30 Jul 2015 23:59:32 +0000 (16:59 -0700)]
ReplicatedPG,Objecter: copy_get should include truncate_seq and size
Otherwise, we break CephFS over cache tiers.
Fixes: #12551
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
6f9ee7961eee9ee3a61a07cbe0d8d289ee98fa9a )
Conflicts:
src/osd/ReplicatedPG.cc
Josh Durgin [Wed, 9 Sep 2015 23:44:09 +0000 (19:44 -0400)]
Merge pull request #5769 from dachary/wip-12850-hammer
Crash during TestInternal.MultipleResize
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Wed, 9 Sep 2015 23:44:01 +0000 (19:44 -0400)]
Merge pull request #5768 from dachary/wip-12849-hammer
[ FAILED ] TestLibRBD.BlockingAIO
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yehuda Sadeh [Wed, 17 Jun 2015 18:35:18 +0000 (11:35 -0700)]
rgw: fix assignment of copy obj attributes
Fixes: #11563
Clarify the confusing usage of set_copy_attrs() by switching the source and
destinatiion params (attrs, src_attrs). Switch to use attrs instead of
src_attrs afterwards. In one of the cases we originally used the wrong
variable.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
e41d97c8e38bb60d7e09e9801c0179efe7af1734 )
Sylvain Baubeau [Fri, 4 Sep 2015 20:51:44 +0000 (22:51 +0200)]
rgw: add delimiter to prefix only when path is specified
http://tracker.ceph.com/issues/12960
Fixes: #12960
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
(cherry picked from commit
27cf257248ea55f8f4bc7851c3956611828bcae2 )
Loic Dachary [Wed, 9 Sep 2015 14:58:56 +0000 (16:58 +0200)]
Merge pull request #5697 from tchaikov/wip-12638-hammer
mon: add a cache layer over MonitorDBStore
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Joao Eduardo Luis [Mon, 7 Sep 2015 13:12:19 +0000 (14:12 +0100)]
mon: MonitorDBStore: make get_next_key() work properly
We introduced a significant bug with
2cc7aee , when we fixed issue #11786.
Although that patch would fix the problem described in #11786, we
managed to not increment the iterator upon returning the current key.
This would have the iterator iterating over the same key, forever and
ever.
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit
70d31082fd3dc8c7857994104577f1a3631c678c )
Loic Dachary [Wed, 9 Sep 2015 12:52:54 +0000 (14:52 +0200)]
Merge pull request #5381 from dachary/wip-12499-hammer
ceph-fuse 0.94.2-1trusty segfaults / aborts
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
David Zafman [Tue, 8 Sep 2015 21:58:16 +0000 (14:58 -0700)]
Merge pull request #5757 from dachary/wip-12836-hammer
WBThrottle::clear_object: signal on cond when we reduce throttle values
Reviewed-by: David Zafman <dzafman@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 08:06:30 +0000 (10:06 +0200)]
Merge pull request #5759 from dachary/wip-12841-hammer
recursive lock of md_config_t (0)
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 08:05:41 +0000 (10:05 +0200)]
Merge pull request #5761 from dachary/wip-12843-hammer
long standing slow requests: connection->session->waiting_for_map->connection ref cycle
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 08:04:51 +0000 (10:04 +0200)]
Merge pull request #5762 from dachary/wip-12844-hammer
osd suicide timeout during peering - search for missing objects
Reviewed-by: Sage Weil <sage@redhat.com>