]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Loic Dachary [Fri, 13 Nov 2015 18:10:28 +0000 (19:10 +0100)]
build/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg
http://tracker.ceph.com/issues/13785 Fixes: #13785
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit
a0204dc47acc0c50223e449fd23a2fc97bfd111a )
Conflicts:
debian/control: << 0.94.5-2 is appropriate for hammer
Loic Dachary [Wed, 11 Nov 2015 10:59:36 +0000 (11:59 +0100)]
Merge pull request #6213 from SUSE/wip-13425-hammer
wrong conditional for boolean function KeyServer::get_auth()
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Wed, 11 Nov 2015 05:59:55 +0000 (06:59 +0100)]
Merge pull request #6336 from Abhishekvrshny/wip-13535-hammer
LibRadosWatchNotify.WatchNotify2Timeout
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Wed, 11 Nov 2015 05:59:42 +0000 (06:59 +0100)]
Merge pull request #6391 from SUSE/wip-13590-hammer
mon: should not set isvalid = true when cephx_verify_authorizer return false
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Wed, 11 Nov 2015 05:58:55 +0000 (06:58 +0100)]
Merge pull request #6398 from SUSE/wip-13588-hammer
OSD::build_past_intervals_parallel() shall reset primary and up_primary when begin a new past_interval.
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 19:24:35 +0000 (20:24 +0100)]
Merge pull request #6199 from liewegas/wip-randomize-scrub-hammer
osd: randomize scrub times
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 19:23:23 +0000 (20:23 +0100)]
Merge pull request #5825 from tchaikov/wip-12848-hammer
ReplicatedPG::hit_set_trim osd/ReplicatedPG.cc: 11006: FAILED assert(obc)
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:34:01 +0000 (10:34 +0100)]
Merge pull request #6157 from dachary/wip-13040-hammer
common/Thread:pthread_attr_destroy(thread_attr) when done with it
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:33:41 +0000 (10:33 +0100)]
Merge pull request #6155 from dachary/wip-13171-hammer
objecter: cancellation bugs
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:33:19 +0000 (10:33 +0100)]
Merge pull request #6152 from dachary/wip-13233-hammer
mon: include min_last_epoch_clean as part of PGMap::print_summary and PGMap::dump
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:33:01 +0000 (10:33 +0100)]
Merge pull request #6146 from dachary/wip-13337-hammer
segfault in agent_work
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:32:53 +0000 (10:32 +0100)]
Merge pull request #6145 from dachary/wip-13338-hammer
filestore: fix peek_queue for OpSequencer
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:32:42 +0000 (10:32 +0100)]
Merge pull request #6144 from dachary/wip-13339-hammer
mon: check for store writeablility before participating in election
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:30:54 +0000 (10:30 +0100)]
Merge pull request #5891 from Abhishekvrshny/wip-13035-hammer
requeue_scrub when kick_object_context_blocked
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:30:38 +0000 (10:30 +0100)]
Merge pull request #5890 from Abhishekvrshny/wip-13037-hammer
hit set clear repops fired in same epoch as map change -- segfault since they fall into the new interval even though the repops are cleared
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Tue, 10 Nov 2015 09:21:07 +0000 (10:21 +0100)]
Merge pull request #6322 from sponce/WIP-13210-hammer
tests : BACKPORT #13210 Fixed broken Makefiles after integration of ttng into rados
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Mon, 9 Nov 2015 07:38:31 +0000 (08:38 +0100)]
Merge pull request #5810 from Abhishekvrshny/wip-12948-hammer
Heavy memory shuffling in rados bench
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Thu, 5 Nov 2015 12:12:11 +0000 (13:12 +0100)]
Merge pull request #5530 from SUSE/wip-12587-hammer
FileStore calls syncfs(2) even it is not supported
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 18:38:53 +0000 (19:38 +0100)]
Merge pull request #5889 from Abhishekvrshny/wip-13042-hammer
ThreadPool add/remove work queue methods not thread safe
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 18:14:28 +0000 (19:14 +0100)]
Merge pull request #6151 from dachary/wip-13245-hammer
client nonce collision due to unshared pid namespaces
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:36:39 +0000 (11:36 +0100)]
Merge pull request #6159 from dachary/wip-13341-hammer
ceph upstart script rbdmap.conf incorrectly processes parameters
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 4 Nov 2015 10:34:07 +0000 (11:34 +0100)]
Merge pull request #6154 from dachary/wip-13195-hammer
should recalc the min_last_epoch_clean when decode PGMap
Reviewed-by: Sage Weil <sage@redhat.com>
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>
xiexingguo [Tue, 13 Oct 2015 06:04:20 +0000 (14:04 +0800)]
OSD:shall reset primary and up_primary fields when beginning a new past_interval.
Shall reset primary and up_primary fields when we start over a new past_interval in OSD::build_past_intervals_parallel().
Fixes: #13471
Signed-off-by: xie.xingguo@zte.com.cn
(cherry picked from commit
65064ca05bc7f8b6ef424806d1fd14b87add62a4 )
yangruifeng [Mon, 19 Oct 2015 12:08:12 +0000 (08:08 -0400)]
mon: should not set isvalid = true when cephx_verify_authorizer return false
Fixes: #13525
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit
c7f75b8f7c0a773148ec16141941efd00ee76626 )
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>
Sebastien Ponce [Tue, 20 Oct 2015 07:22:16 +0000 (09:22 +0200)]
radosstriper : Fixed broken Makefiles after integration of lttng
Fixes: #13210, backport of #6322 into hammer
Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
Sage Weil [Thu, 1 Oct 2015 18:50:34 +0000 (14:50 -0400)]
osdc/Objecter: distinguish between multiple notify completions
We may send a notify to the cluster multiple times due to OSDMap
changes. In some cases, earlier notify attempts may complete with
an error, while later attempts succeed. We need to only pay
attention to the most-recently send notify's completion.
Do this by making note of the notify_id in the initial ACK (only
present when talking to newer OSDs). When we get a notify
completion, match it against our expected notify_id (if we have
one) or else discard it.
This is important because in some cases an early notify completion
may be an error while a later one succeeds.
Note that if we are talking to an old cluster we will simply not record a
notify_id and our behavior will be the same as before (we will trust any
notify completion we get).
Fixes: #13114
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
e86d033854c76f344c678e92016c4e5c5e0385e2 )
Conflicts:
src/osdc/Objecter.cc
In Objecter::handle_watch_notify, a conflict was there due to a modified comment by commit
47277c51db7bb2725ea117e4e8834869ae93e006 , which was not backported
Sage Weil [Thu, 1 Oct 2015 18:50:00 +0000 (14:50 -0400)]
osd: reply to notify request with our unique notify_id
The OSD assigns a unique ID to each notify it queues for
processing. Include this in the reply to the notifier so that
they can match it up with the eventual completions they receive.
This is necessary to distinguish between multiple completions
they may receive if there is PG peering and the notify is resent.
In particular, an earlier notify may return an error when a later
attempt succeeds.
This is forwards and backwards compatible: new clients will make use of
this reply payload but older clients ignore it.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
049ea702b9bf4a8a62ae2770d9ba55c0730b3eef )
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
Samuel Just [Mon, 21 Sep 2015 18:16:49 +0000 (11:16 -0700)]
ReplicatedPG::hit_set_setup: fix hit_set_remove_all call
We only want to do it if the pool config changed AND we are
primary && active.
fd38902dd4693b9b72f7532833e78f5df2c9efa5 partially fixed a related
bug. This should be backported along with it.
Fixes: 13192
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
36e4a80c39f7daab2a35efc04650ae8b7b11c4e0 )
Samuel Just [Tue, 22 Sep 2015 18:13:44 +0000 (11:13 -0700)]
osd/: assert in HitSet constructor if type is TYPE_NONE as well
Otherwise impl is unpopulated and we risk segfaults in several
methods. It also seems like it would always indicate a bug.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
8e5a801b43babf751b619ed9606d7be7e5b12837 )
Zhiqiang Wang [Thu, 23 Jul 2015 01:26:44 +0000 (09:26 +0800)]
osd: only remove all the hit set objects on primary osd
Only the primary PG is allowed to remove all the hit set objects. And
the PG should be in the active or peered states.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
(cherry picked from commit
fd38902dd4693b9b72f7532833e78f5df2c9efa5 )
Zhiqiang Wang [Thu, 18 Jun 2015 01:05:28 +0000 (09:05 +0800)]
osd: implement hit_set_remove_all
When hit set is not configured on startup or on a change, remove all
previous hitsets.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
(cherry picked from commit
be28319bf3dc54b4b6f400d83405a29facfe3bd4 )
Conflicts:
src/osd/ReplicatedPG.cc
pass the new argument of `p->using_gmt` to get_hit_set_archive_object()
Kefu Chai [Tue, 8 Sep 2015 08:52:32 +0000 (16:52 +0800)]
mon: disable gmt_hitset if not supported
the gmt_hitset is enabled by default in the ctor of pg_pool_t, this
is intentional. because we want to remove this setting and make
gmt_hitset=true as a default in future. but this forces us to
disable it explicitly when preparing a new pool if any OSD does
not support gmt hitset.
Fixes: #12968
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
e48cec3dc93b3988dcd8924933deb1b3a43e1d0f )
Conflicts:
src/mon/OSDMonitor.cc
remove unrelated hunk
Kefu Chai [Thu, 27 Aug 2015 16:32:38 +0000 (00:32 +0800)]
osd: do not let OSD_HITSET_GMT reuse the feature bit
* to ease the backport to hammer
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
5a4f6a866bb675195ad83c38fd23238d078c78ed )
Conflicts:
src/include/ceph_features.h
minor changes to resolve conflicts
David Zafman [Thu, 27 Aug 2015 18:24:25 +0000 (11:24 -0700)]
osd: Decode use_gmt_hitset with a unique version
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
2bc5a48f4c5d3667213be3a7b5a0e0f5ef9daf4f )
Conflicts:
src/osd/osd_types.cc
minor changes to resolve conflicts
Kefu Chai [Tue, 18 Aug 2015 08:53:50 +0000 (16:53 +0800)]
mon: print use_gmt_hitset in "ceph osd pool get"
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
cc2bcf760f2d2f20fc4a2fa78ba52475a23e55bf )
Conflicts:
src/mon/OSDMonitor.cc
use the old way to dump pool info
Kefu Chai [Mon, 17 Aug 2015 16:04:23 +0000 (00:04 +0800)]
mon: add "ceph osd pool set $pool use_gmt_hitset true" cmd
allow "ceph osd pool set $pool use_gmt_hitset <true|1>" as long as
the cluster supports gmt hitset.
Fixes: #9732
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
03a1a3cf023a9aeb2fa26820e49e5efe3f3b3789 )
Kefu Chai [Fri, 5 Jun 2015 13:06:48 +0000 (21:06 +0800)]
osd: use GMT time for the object name of hitsets
* bump the encoding version of pg_hit_set_info_t to 2, so we can
tell if the corresponding hit_set is named using localtime or
GMT
* bump the encoding version of pg_pool_t to 20, so we can know
if a pool is using GMT to name the hit_set archive or not. and
we can tell if current cluster allows OSDs not support GMT
mode or not.
* add an option named `osd_pool_use_gmt_hitset`. if enabled,
the cluster will try to use GMT mode when creating a new pool
if all the the up OSDs support GMT mode. if any of the
pools in the cluster is using GMT mode, then only OSDs
supporting GMT mode are allowed to join the cluster.
Fixes: #9732
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
42f8c5daad16aa849a0b99871d50161673c0c370 )
Conflicts:
src/include/ceph_features.h
src/osd/ReplicatedPG.cc
src/osd/osd_types.cc
src/osd/osd_types.h
fill pg_pool_t with default settings in master branch.
Nathan Cutler [Sun, 27 Sep 2015 19:55:00 +0000 (21:55 +0200)]
CephxServiceHandler.cc: fix get_auth conditional
The KeyServer class has a public method get_auth() that returns a boolean
value. This value is being checked here - fix the conditional so it triggers
when get_auth() returns false.
http://tracker.ceph.com/issues/9756 References: #9756
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
7250db62cb7ac1e9c0b1f5956d60b9d874496702 )
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 )
Kefu Chai [Fri, 15 May 2015 16:07:27 +0000 (00:07 +0800)]
osd: use another name for randomize scrub option
s/osd_scrub_interval_limit/osd_scrub_interval_randomize_ratio/
Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 9 Mar 2015 08:42:34 +0000 (16:42 +0800)]
osd: randomize scrub times to avoid scrub wave
- to avoid the scrub wave when the osd_scrub_max_interval reaches in a
high-load OSD, the scrub time is randomized.
- extract scrub_load_below_threshold() out of scrub_should_schedule()
- schedule an automatic scrub job at a time which is uniformly distributed
over [now+osd_scrub_min_interval,
now+osd_scrub_min_interval*(1+osd_scrub_time_limit]. before
this change this sort of scrubs will be performed once the hard interval
is end or system load is below the threshold, but with this change, the
jobs will be performed as long as the load is low or the interval of
the scheduled scrubs is longer than conf.osd_scrub_max_interval. all
automatic jobs should be performed in the configured time period, otherwise
they are postponed.
- the requested scrub job will be scheduled right away, before this change
it is queued with the timestamp of `now` and postponed after
osd_scrub_min_interval.
Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
5e44040e8528bff06cc0a5a3f3293ab146e0e4e1 )
Conflicts:
src/osd/OSD.cc
Kefu Chai [Mon, 9 Mar 2015 08:47:30 +0000 (16:47 +0800)]
osd: use __func__ in log messages
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
0f7f35670f03f3f58329c00d323963710e7e495d )
Kefu Chai [Wed, 15 Apr 2015 04:04:05 +0000 (12:04 +0800)]
osd: simplify OSD::scrub_load_below_threshold() a little bit
avoid unnecessary comparison
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
2ab0e606dfd2847e1918be9f21f572d91befbf7b )
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>
Josh Durgin [Mon, 21 Sep 2015 22:46:42 +0000 (15:46 -0700)]
use simplifed messenger constructor for clients
This is all mechanical except the calculation of the nonce, which is
now always randomized for clients.
Fixes: #13032
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
a3a8c85b79afef67681c32c57b591c0e0a87a349 )
Josh Durgin [Mon, 21 Sep 2015 22:20:53 +0000 (15:20 -0700)]
msg: add simplified messenger constructor
Several callers create messengers using exactly the same parameters:
- reading the ms type from cct that is also passed in
- a default entity_name_t::CLIENT
- the default features
Additionally, the nonce should be randomized and not depend on
e.g. pid, as it does in several callers now. Clients running in
containers can easily have pid collisions, leading to hangs, so
randomize the nonce in this simplified constructor rather than
duplicating that logic in every caller.
Daemons have meaningful entity_name_ts, and monitors currently depend
on using 0 as a nonce, so make this simple constructer
client-specific.
Related: #13032
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
e3785b0b5fbff870adbd5f121021b671912386cf )
Conflicts:
src/msg/Messenger.cc: Messenger::create only has 5 arguments in
hammer. Since the last one is zero, it does not change the
semantic.
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 )