]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
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 )
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>
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 )
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 )
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 )
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
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 )
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>
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>
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>
Loic Dachary [Mon, 7 Sep 2015 08:04:03 +0000 (10:04 +0200)]
Merge pull request #5763 from dachary/wip-12846-hammer
osd/PGLog.cc: 732: FAILED assert(log.log.size() == log_keys_debug.size())
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 08:03:10 +0000 (10:03 +0200)]
Merge pull request #5764 from dachary/wip-12847-hammer
common: do not insert emtpy ptr when rebuild emtpy bufferlist
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 08:02:14 +0000 (10:02 +0200)]
Merge pull request #5373 from dachary/wip-12489-hammer
pg_interval_t::check_new_interval - for ec pool, should not rely on min_size to determine if the PG was active at the interval
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 08:00:32 +0000 (10:00 +0200)]
Merge pull request #5383 from dachary/wip-12504-hammer
rest-bench common/WorkQueue.cc: 54: FAILED assert(_threads.empty())
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 07:54:07 +0000 (09:54 +0200)]
Merge pull request #5765 from dachary/wip-12883-hammer
cache agent is idle although one object is left in the cache
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 07:53:14 +0000 (09:53 +0200)]
Merge pull request #5754 from dachary/wip-12588-hammer
Change radosgw pools default crush ruleset
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Mon, 7 Sep 2015 07:51:50 +0000 (09:51 +0200)]
Merge pull request #5377 from dachary/wip-12396-hammer
register_new_pgs() should check ruleno instead of its index
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 7 Sep 2015 01:07:38 +0000 (21:07 -0400)]
Merge pull request #5758 from dachary/wip-12839-hammer
Mutex Assert from PipeConnection::try_get_pipe
Loic Dachary [Thu, 13 Aug 2015 17:41:47 +0000 (19:41 +0200)]
tests: tiering agent and proxy read
Verify that an object promoted to a cache tier because of a proxy read
is evicted as expected.
http://tracker.ceph.com/issues/12673 Refs: #12673
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit
7924231930732bd297d3bd034c8295e96cb81088 )
Loic Dachary [Thu, 13 Aug 2015 11:47:24 +0000 (13:47 +0200)]
osd: trigger the cache agent after a promotion
When a proxy read happens, the object promotion is done in parallel. The
agent_choose_mode function must be called to reconsider the situation
to protect against the following scenario:
* proxy read
* agent_choose_mode finds no object exists and the agent
goes idle
* object promotion happens
* the agent does not reconsider and eviction does not happen
although it should
http://tracker.ceph.com/issues/12673 Fixes: #12673
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit
e1f58feb9b1d20b72f2eb2eefdea5982e0cddccd )
Loic Dachary [Sun, 6 Sep 2015 21:17:22 +0000 (23:17 +0200)]
Merge pull request #5276 from dachary/wip-11824-hammer
implicit erasure code crush ruleset is not validated
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sun, 6 Sep 2015 15:24:43 +0000 (17:24 +0200)]
Merge pull request #5382 from dachary/wip-12500-hammer
segfault launching ceph-fuse with bad --name
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Sun, 6 Sep 2015 15:23:19 +0000 (17:23 +0200)]
Merge pull request #5367 from dachary/wip-12311-hammer
read on chunk-aligned xattr not handled
Reviewed-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Wed, 29 Jul 2015 16:46:24 +0000 (12:46 -0400)]
lockdep: allow lockdep to be dynamically enabled/disabled
librbd test cases attempt to enable lockdep coverage via the librados
API. Use a configuration observer to register/unregister lockdep
support.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
af0cade0293be22e74a3293765676c7b227b06c4 )
Jason Dillaman [Tue, 28 Jul 2015 18:23:14 +0000 (14:23 -0400)]
tests: librbd API test cannot use private md_config_t struct
Remove all depencencies on md_config_t and instead use librados API
methods to get/set configuration values.
Fixes: #12479
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
2c51aadb447d3447b5dace19c5cb6268e94247c8 )
Jason Dillaman [Thu, 9 Apr 2015 19:06:27 +0000 (15:06 -0400)]
tests: ensure old-format RBD tests still work
Override the RBD default image format back to version 1
to ensure tests properly cover the old format.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3b95edb5bd373bd05f83516eccfd30a6b5cf4693 )
Jason Dillaman [Thu, 30 Jul 2015 13:00:57 +0000 (09:00 -0400)]
librados_test_stub: implement conf get/set API methods
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4d03c664f2a9362009c7e3077ed65e2989f0f21b )
Jason Dillaman [Tue, 28 Jul 2015 17:14:29 +0000 (13:14 -0400)]
crypto: use NSS_InitContext/NSS_ShutdownContex to avoid memory leak
Switched to context-aware NSS init/shutdown functions to avoid conflicts
with parent application. Use a reference counter to properly shutdown the
NSS crypto library when the last CephContext is destroyed. This avoids
memory leaks with the NSS library from users of librados.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9fa0112dd9286178da1d76020158503b2062d252 )
Yan, Zheng [Fri, 20 Mar 2015 23:13:51 +0000 (07:13 +0800)]
auth: use crypto_init_mutex to protect NSS_Shutdown()
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit
cf058174fe6be26129eb52f4fb24d0f7146ef7af )
Yan, Zheng [Fri, 20 Mar 2015 17:02:42 +0000 (01:02 +0800)]
auth: reinitialize NSS modules after fork()
Fixes: #11128
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit
4c24d0cc074462ae258b5cf901cd884bb4f50a53 )
Jason Dillaman [Tue, 11 Aug 2015 13:26:33 +0000 (09:26 -0400)]
librbd: prevent race condition between resize requests
It was possible that the same resize request could be sent twice
if a completed resize op started a newly created resize op while
it was also being concurrently started by another thread.
Fixes: #12664
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
6ec431bac1cf9446f3af90209d193dfcf003f2c5 )
Jianpeng Ma [Mon, 9 Mar 2015 06:23:23 +0000 (14:23 +0800)]
librbd: Add a paramter:purge_on_error in ImageCtx::invalidate_cache().
If bh_write met error, it will try again. For closing image, if met this
issue, it will trigger a assert:
>>2015-02-03 15:22:49.198292
7ff62d537800 -1 osdc/ObjectCacher.cc: In
function 'ObjectCacher::~ObjectCacher()' thread
7ff62d537800 time
>>2015-02-03 15:22:49.195927osdc/ObjectCacher.cc: 551: FAILED
>>assert(i->empty())
Now add purge_on_error, when shutdown_cache it set true.
In ImageCtx::invalidate_cache, if met error and purge_on_error is true,
purge the dirty bh.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
35def5c81f7fc83d55d18320e4860c6a63d4c7f5 )
Conflicts:
src/librbd/ImageCtx.cc : trivial resolution
Jianpeng Ma [Thu, 5 Feb 2015 03:28:50 +0000 (11:28 +0800)]
librbd: Remvoe unused func ImageCtx::read_from_cache.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
101440a41253680770f94bc380af7072c7adaebf )
Jianpeng Ma [Thu, 5 Feb 2015 03:03:10 +0000 (11:03 +0800)]
osdc: clean up code in ObjectCacher::Object::map_write
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
9f80c2909ace09cd51c24b49c98a093e0e864dca )
Jianpeng Ma [Thu, 5 Feb 2015 02:13:06 +0000 (10:13 +0800)]
osdc: Don't pass mutex into ObjectCacher::_wait_for_write.
Because the mutex is the same as ObjectCacher::lock.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
d7cf7aeea5cba1ffa8e51ff1ad2424b1ec161a12 )
Jianpeng Ma [Mon, 2 Mar 2015 03:23:44 +0000 (11:23 +0800)]
osdc: After write try merge bh.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
1a48a8a2b222e41236341cb1241f0885a1b0b9d8 )
Jianpeng Ma [Mon, 2 Mar 2015 03:36:24 +0000 (11:36 +0800)]
osdc: Make last missing bh to wake up the reader.
Avoid wakeup early and wait again.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
d582bda090b3339d03e25b0e6d0971ad0267f476 )
Jianpeng Ma [Fri, 6 Feb 2015 01:53:36 +0000 (09:53 +0800)]
osdc: For trust_enoent is true, there is only one extent.
Now the judgement only in conditon which will return -ENOENT.
But o->exists don't depend on the extent size. It only depend on
trust_enoent. So move this judgement at the first of _readx().
Make this bug ASAP occur.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
2449fddc13b5ce8bbf1bb4ecaa5d6937f54e54d1 )
Jianpeng Ma [Tue, 3 Feb 2015 06:46:39 +0000 (14:46 +0800)]
osdc: In _readx() only no error can tidy read result.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit
540346d4a901d8041c9fd74641c98cdfd2e1ab32 )
Ken Dreyer [Fri, 4 Sep 2015 21:38:43 +0000 (15:38 -0600)]
Merge pull request #5223 from SUSE/wip-12305-hammer
ceph.spec.in: running fdupes unnecessarily
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Radoslaw Zarzynski [Thu, 25 Jun 2015 16:28:50 +0000 (18:28 +0200)]
rgw: send Content-Length in response for GET on Swift account.
Fixes: #12158
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
5f47b11791cd46ce2771046e4888575869cc9685 )
Conflicts:
src/rgw/rgw_rest_swift.cc
Orit Wasserman [Mon, 22 Jun 2015 11:51:49 +0000 (13:51 +0200)]
rgw: force content_type for swift bucket stats request
Fixes: 12095
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
da259e4da1329e1e448d75c48c6ee3d1318e19b2 )
Orit Wasserman [Thu, 13 Aug 2015 13:02:03 +0000 (15:02 +0200)]
rgw: we should not overide Swift sent content type
Fixes: #12363
backport: hammer
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
423cf136f15df3099c9266f55932542d303c2713 )
Radoslaw Zarzynski [Tue, 23 Jun 2015 09:54:09 +0000 (11:54 +0200)]
rgw: enforce Content-Type in Swift responses.
Swift sends Content-Type HTTP header even if the response
doesn't contain body. We have this behaviour implemented
until applying some changes in end_header() function.
Unfortunately, lack of Content-Type causes early exits in
many Tempest's tests for Swift API verification.
Fixes: #12157
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit
106aeba206736d4080326f9bc191876bed63370b )
Orit Wasserman [Tue, 21 Apr 2015 10:31:19 +0000 (12:31 +0200)]
rgw: force content-type header for swift account responses without body
This regression was introduced in commit
4cfeca03ade21861ab70ca759f94eb244c16cb39
Fixes: #11438
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
009664e560ee37ef6dc170a0155d6c749e151b06 )
Orit Wasserman [Thu, 9 Apr 2015 18:04:59 +0000 (20:04 +0200)]
rgw: shouldn't return content-type: application/xml if content length is 0
Fixed: #11091
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
5cc92bb27cfbaee4af24dc312c9b98331f899794 )
Loic Dachary [Thu, 3 Sep 2015 10:20:38 +0000 (12:20 +0200)]
Merge pull request #5716 from dachary/wip-12851-hammer
Ensure that swift keys don't include backslashes
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Loic Dachary [Thu, 3 Sep 2015 10:11:24 +0000 (12:11 +0200)]
Merge pull request #5717 from dachary/wip-12591-hammer
rgw: create a tool for orphaned objects cleanup
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Loic Dachary [Wed, 2 Sep 2015 21:35:58 +0000 (23:35 +0200)]
Merge pull request #5755 from dachary/wip-12589-hammer
ceph-disk zap should ensure block device
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 2 Sep 2015 21:22:59 +0000 (23:22 +0200)]
Merge pull request #5732 from ceph/wip-11455-hammer
rgw: init some manifest fields when handling explicit objs
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 2 Sep 2015 21:19:02 +0000 (23:19 +0200)]
Merge pull request #5721 from dachary/wip-12853-hammer
RGW Swift API: X-Trans-Id header is wrongly formatted
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Loic Dachary [Wed, 2 Sep 2015 21:08:24 +0000 (23:08 +0200)]
Merge pull request #5498 from ceph/wip-12432-hammer
rgw: HTTP return code is not being logged by CivetWeb
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Samuel Just [Tue, 21 Jul 2015 18:31:12 +0000 (11:31 -0700)]
OSD: break connection->session->waiting message->connection cycle
Fixes: #12338
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
7f15e22be291df139c85909b96b2366f6dbadf37 )
Sage Weil [Sun, 9 Aug 2015 14:46:10 +0000 (10:46 -0400)]
osd/PGLog: dirty_to is inclusive
There are only two callers of mark_dirty_to who do not pass max,
and they are both in the merge_log extending tail path. In that
case, we want to include the last version specified in the log
writeout. Fix the tail extending code to always specify the
last entry added, inclusive.
Fixes: #12652
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f0ca14df0641daa04eee39d98d8bd0faf46e4e6d )
Xinze Chi [Mon, 24 Aug 2015 15:02:10 +0000 (23:02 +0800)]
common: fix code format
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit
15e5ebe14787bbbc6b906d72ccd2d418d762cfad )
Xinze Chi [Mon, 24 Aug 2015 14:59:40 +0000 (22:59 +0800)]
test: add test case for insert empty ptr when buffer rebuild
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit
2d2f0eb338906742d516a2f8e6d5d05505be8f47 )
Xinze Chi [Mon, 24 Aug 2015 15:01:27 +0000 (23:01 +0800)]
common: fix insert empty ptr when bufferlist rebuild
Fixes: #12775
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit
fb1b6ddd7bfe40d4a38d5ec59b1c3f59f2a83f23 )
Conflicts:
src/common/buffer.cc : because invalidate_crc did not exist
in hammer
Loic Dachary [Wed, 2 Sep 2015 10:00:11 +0000 (12:00 +0200)]
Merge pull request #5527 from SUSE/wip-12585-hammer
OSD crash creating/deleting pools
Reviewed-by: Kefu Chai <kchai@redhat.com>
Guang G Yang [Wed, 29 Jul 2015 21:47:17 +0000 (21:47 +0000)]
osd: copy the RecoveryCtx::handle when creating a new RecoveryCtx instance from another one
Fixes: 12523
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
(cherry picked from commit
6ab9efe799b947f2ef6113df8cc542c73760107d )
Josh Durgin [Mon, 24 Aug 2015 22:40:39 +0000 (15:40 -0700)]
config: skip lockdep for intentionally recursive md_config_t lock
lockdep can't handle recursive locks, resulting in false positive
reports for certain set_val_or_die() calls, like via
md_config_t::parse_argv() passed "-m".
Fixes: #12614
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
415226995ebe841cc9e8639a3233150a75aecaed )
David Zafman [Thu, 23 Jul 2015 23:36:19 +0000 (16:36 -0700)]
osd: Keep a reference count on Connection while calling send_message()
Fixes: #12437
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
a140085f467889f2743294a3c150f13b62fcdf51 )