]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Wed, 5 Jul 2017 16:27:57 +0000 (12:27 -0400)]
mon: debug session feature tracking
Hunting http://tracker.ceph.com/issues/20475
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 5 Jul 2017 15:47:23 +0000 (10:47 -0500)]
Merge pull request #15873 from ztczll/zl
osd: check queue_transaction return value
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Sage Weil [Wed, 5 Jul 2017 15:46:55 +0000 (10:46 -0500)]
Merge pull request #16048 from Yan-waller/wip-waller-0630mon
mon/mgr: add detail error infomation
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Wed, 5 Jul 2017 15:26:56 +0000 (10:26 -0500)]
Merge pull request #16122 from tchaikov/wip-qa-warning-msg
qa/tasks/ceph: should be "Waiting for all PGs", not "all osds"
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Kefu Chai [Wed, 5 Jul 2017 15:05:23 +0000 (23:05 +0800)]
Merge pull request #16117 from majianpeng/bluestore-move-object-exist-in-assign-nid
os/bluestore: move object exist in assign nid
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Jianpeng Ma [Mon, 3 Jul 2017 10:48:13 +0000 (18:48 +0800)]
os/bluestore/BlueStore: move "onode::exists=true" in _assign_nid.
If object has nid, it always set exists =true in get_onode.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Kefu Chai [Wed, 5 Jul 2017 13:57:21 +0000 (21:57 +0800)]
Merge pull request #16110 from javacruft/wrap-and-sort
debian: wrap-and-sort all files
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 5 Jul 2017 13:52:29 +0000 (21:52 +0800)]
Merge pull request #15642 from wjwithagen/wip-wjw-freebsd-ceph-disk-zap
ceph_disk/main.py: Allow FreeBSD zap a OSD disk
Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jos Collin [Wed, 5 Jul 2017 12:48:37 +0000 (12:48 +0000)]
Merge pull request #16084 from mikulely/fix-data-pool-cli
rgw,test: fix rgw placement rule pool config option
Reviewed By: Jos Collin <jcollin@redhat.com>
Mykola Golub [Wed, 5 Jul 2017 11:53:46 +0000 (14:53 +0300)]
Merge pull request #16024 from dillaman/wip-19035
rbd: do not attempt to load key if auth is disabled
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Mykola Golub [Wed, 5 Jul 2017 11:52:55 +0000 (14:52 +0300)]
Merge pull request #15860 from dillaman/wip-20168
librbd: fail IO request when exclusive lock cannot be obtained
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Kefu Chai [Wed, 5 Jul 2017 11:15:19 +0000 (19:15 +0800)]
Merge pull request #16118 from IlsooByun/fix-spdk-build-error
os/bluestore: fix build errors when spdk is on
Reviewed-by: Haomai Wang <haomai@xsky.com>
Kefu Chai [Wed, 5 Jul 2017 03:44:55 +0000 (11:44 +0800)]
qa/tasks/ceph: should be "Waiting for all PGs", not "all osds"
amend the warning message
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 5 Jul 2017 10:51:42 +0000 (18:51 +0800)]
Merge pull request #15265 from cooldavid/pr-osd-historic-op
osd: Preserve OSDOp information for historic ops
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 5 Jul 2017 10:48:29 +0000 (18:48 +0800)]
Merge pull request #15964 from tchaikov/wip-5249
mon/MonClient: respect the priority in SRV RR
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Kefu Chai [Wed, 5 Jul 2017 10:46:21 +0000 (18:46 +0800)]
Merge pull request #15780 from wjwithagen/wip-wjw-freebsd-use-ceph_to_hostos_errno
core: make the conversion from wire error to host OS work
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Willem Jan Withagen [Tue, 20 Jun 2017 13:52:06 +0000 (15:52 +0200)]
core: make the conversion from wire error to host OS work
- The key change is the type of rval,
that will call the conversion when en/decoded
- Remainder is fixes for the type change and promotions
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Kefu Chai [Wed, 5 Jul 2017 07:06:21 +0000 (15:06 +0800)]
Merge pull request #15897 from yuyuyu101/wip-20390
msg/async: increase worker reference with local listen table enabled backend
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 5 Jul 2017 07:05:21 +0000 (15:05 +0800)]
Merge pull request #15754 from tchaikov/wip-test-auth-caps
qa/suites: add test exercising workunits/mon/auth_caps.sh
Reviewed By: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Kefu Chai [Wed, 5 Jul 2017 07:04:24 +0000 (15:04 +0800)]
Merge pull request #16011 from hsepeng/cache-osd-bugfix
osd/PrimaryLogPG solve cache tier osd high memory consumption
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Wed, 5 Jul 2017 07:00:44 +0000 (15:00 +0800)]
Merge pull request #13918 from liupan1111/wip-fix-performance-filestore
os/filestore: queue ondisk completion before apply work
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Wed, 5 Jul 2017 06:59:32 +0000 (14:59 +0800)]
Merge pull request #16051 from liewegas/wip-20381
os/bluestore: fix deferred_aio deadlock
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Ilsoo Byun [Wed, 5 Jul 2017 05:42:10 +0000 (01:42 -0400)]
os/bluestore: fix build errors when spdk is on
- remove pthread library link from dpdk cmake
- fix the bugs of NVMEDevice
Signed-off-by: Ilsoo Byun <ilsoo.byun@sk.com>
John Spray [Tue, 4 Jul 2017 23:04:59 +0000 (00:04 +0100)]
Merge pull request #15958 from liewegas/wip-mgr-modules
mgr,mon: enable/disable mgr modules via 'ceph mgr module ...' commands
Reviewed-by: John Spray <john.spray@redhat.com>
James Page [Tue, 4 Jul 2017 16:37:23 +0000 (17:37 +0100)]
debian: wrap-and-sort all files
'wrap-and-sort -a -t' debian folder to apply consistent
ordering/formatting to all files.
This makes synchronization of debian package changes
between Ceph packages and Ubuntu packages easier to
manage.
Signed-off-by: James Page <james.page@ubuntu.com>
Kefu Chai [Tue, 4 Jul 2017 12:20:12 +0000 (20:20 +0800)]
Merge pull request #15305 from wjwithagen/wip-wjw-HAVE_BABELTRACE
cmake: Rewrite HAVE_BABELTRACE option to WITH_
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 4 Jul 2017 10:38:29 +0000 (18:38 +0800)]
Merge pull request #16094 from zphj1987/master
pybind/mgr/dashboard: fix get kernel_version error
Reviewed-by: Kefu Chai <kchai@redhat.com>
Peng Zhang [Tue, 4 Jul 2017 08:08:28 +0000 (16:08 +0800)]
ceph-mgr:fix ceph-mgr web get kernel_version error
fix :
File "/usr/lib64/ceph/mgr/dashboard/module.py", line 523, in _clients
client['version'] = client['kernel_version']
----------
change client['kernel_version'] to
client['client_metadata']['kernel_version']
Signed-off-by: Peng Zhang zphj1987@gmail.com
Josh Durgin [Tue, 4 Jul 2017 07:06:38 +0000 (00:06 -0700)]
Merge pull request #16093 from tchaikov/wip-20432
osd: clear_queued_recovery() in on_shutdown()
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kefu Chai [Tue, 4 Jul 2017 06:46:18 +0000 (14:46 +0800)]
Merge pull request #15823 from jdurgin/wip-omap-tp-heartbeat
osd/ReplicatedBackend: reset thread heartbeat after every omap entry …
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Kefu Chai [Tue, 4 Jul 2017 02:45:44 +0000 (10:45 +0800)]
osd: clear_queued_recovery() in on_shutdown()
otherwise when we are kicking the PG waiting in OSD's awaiting_throttle
queue, the queue is still holding a strong reference of it. then we will
have warnings like "pgid 0.7 has ref count of 2" when shutting down OSD,
because pgmap is also holding a reference of it.
we could clear the "awaiting_throttle" directly in OSD::shutdown(), but
clear_queued_recovery() is more consistent this way, because it is PG
which registered itself to the queue in OSD, it'd be better if PG can
remove itself from the OSD when it is shutting down itself.
Fixes: http://tracker.ceph.com/issues/20432
Signed-off-by: Kefu Chai <kchai@redhat.com>
Xie Xingguo [Tue, 4 Jul 2017 00:42:28 +0000 (08:42 +0800)]
Merge pull request #16081 from tsg-/tsg-affiliation
mailmap, organizationmap: add affiliation for Tushar Gohad
Reviewed-by: Jos Collin <jcollin@redhat.com>
Patrick Donnelly [Mon, 3 Jul 2017 16:11:25 +0000 (09:11 -0700)]
Merge remote-tracking branch 'upstream/pull/16080/head' into HEAD
* upstream/pull/16080/head:
doc/mon: clean up `mds fail`/`mds deactivate` descriptions
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Jiaying Ren [Mon, 3 Jul 2017 15:39:10 +0000 (23:39 +0800)]
doc: fix rgw placment rule pool config option
actually we're checking '--data-pool' and '--data-extra-pool'
during the argument parsing.
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
Sage Weil [Mon, 3 Jul 2017 14:03:38 +0000 (09:03 -0500)]
Merge pull request #15833 from Linbing/wip-osd-delete-MPing
osd: osd does not using MPing Messages,do not include unused include
Reviewed-by: Kefu Chai <kchai@redhat.com>
John Spray [Mon, 3 Jul 2017 13:46:47 +0000 (14:46 +0100)]
doc/mon: clean up `mds fail`/`mds deactivate` descriptions
Fixes: http://tracker.ceph.com/issues/20424
Signed-off-by: John Spray <john.spray@redhat.com>
Sage Weil [Mon, 3 Jul 2017 13:37:25 +0000 (08:37 -0500)]
Merge pull request #16072 from tchaikov/wip-20453
debian: workaround the bug in dpkg-maintscript-helper
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 3 Jul 2017 13:34:04 +0000 (08:34 -0500)]
Merge pull request #15835 from SUSE/wip-flatten-systemd-target-hierarchy-master
systemd: Add explicit Before=ceph.target
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Jos Collin [Mon, 3 Jul 2017 10:35:52 +0000 (10:35 +0000)]
Merge pull request #16067 from YangFanlinux/affi
.mailmap, .organizationmap: Update Fan Yang information and affiliation
Reviewed By: Jos Collin <jcollin@redhat.com>
Kefu Chai [Mon, 3 Jul 2017 10:01:22 +0000 (18:01 +0800)]
Merge pull request #16055 from dmick/master
ceph.in: allow developer mode from outside build tree
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 3 Jul 2017 08:51:21 +0000 (16:51 +0800)]
debian: workaround the bug in dpkg-maintscript-helper
see https://bugs.launchpad.net/ubuntu/+source/snap-confine/+bug/
1605052
and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819
Fixes: http://tracker.ceph.com/issues/20453
Signed-off-by: Kefu Chai <kchai@redhat.com>
Fan Yang [Mon, 3 Jul 2017 07:09:03 +0000 (15:09 +0800)]
mailmap: Fan Yang information and affiliation
Signed-off-by: Fan Yang <yangf@neunn.com>
Tushar Gohad [Mon, 3 Jul 2017 06:17:03 +0000 (23:17 -0700)]
mailmap: add affiliation for Tushar Gohad
Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>
Peng Xie [Thu, 29 Jun 2017 10:48:27 +0000 (18:48 +0800)]
osd/PrimaryLogPG solve cache tier osd high memory consumption
during cache tier dirty data flushing, cache tier osd memroy consumption
will get increasing due to the accumulative pg log which will not be trimmed
Fixes: http://tracker.ceph.com/issues/20464
Signed-off-by: Peng Xie <peng.hse@xtaotech.com>
Willem Jan Withagen [Fri, 26 May 2017 09:58:14 +0000 (11:58 +0200)]
CMakeLists.txt: Rewrite 2 remaning options to WITH_
All options to en/disable inclusion of libraries or other software
are of the format WITH_ so that the Cmake commaind like ahs all
WITH_* options. The WITH_=ON option will result in a HAVE_ setting
in CMAKE so that tests can use that variable.
Last "abusers" to actually follow this format.
- HAVE_BABELTRACE
- HAVE_ZFSLIB is fixed in #15907
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Willem Jan Withagen [Mon, 12 Jun 2017 20:43:54 +0000 (22:43 +0200)]
ceph_disk/main.py: Allow FreeBSD zap a OSD disk
- refactor zap() into a Linux and FreeBSD version
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Sage Weil [Sat, 1 Jul 2017 15:00:37 +0000 (10:00 -0500)]
Merge pull request #16056 from xiexingguo/wip-kill-log-warn
common: fix log warnings
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 1 Jul 2017 14:56:58 +0000 (10:56 -0400)]
os/bluestore: fix deferred_aio deadlock
We submit aios while holding deferred_lock, and we take deferred_lock in
the aio completion handler (of which there is only 1). That means that
if the aio queue fills up, the submitter will block with the lock while
the finisher won't be able to take the lock, progress, and drain completed
aios, leading to a deadlock.
Fix this by submiting aios *without* deferred_lock held. Instead, demote
to a deferred_submit_lock. Further, in the finisher, submit aios
via a finisher (this only happens when in deferred_aggressive mode which
is rare and not performance-sensitive).
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 1 Jul 2017 14:11:57 +0000 (09:11 -0500)]
Merge pull request #15986 from liewegas/wip-20435
mon/MgrStatMonitor: avoid dup health warnings during luminous upgrade
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Sage Weil [Sat, 1 Jul 2017 14:11:31 +0000 (09:11 -0500)]
Merge pull request #14178 from songbaisen/m10
mon: show the leader info on mon stat command
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Sage Weil [Sat, 1 Jul 2017 14:10:59 +0000 (09:10 -0500)]
Merge pull request #15585 from dachary/wip-20229-ceph-disk-timeout
ceph-disk: set the default systemd unit timeout to 3h
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Sat, 1 Jul 2017 14:10:30 +0000 (09:10 -0500)]
Merge pull request #15984 from idryomov/wip-chooseargs-encoding-fix
crush/CrushWrapper: chooseargs encoding fix
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 1 Jul 2017 14:09:52 +0000 (09:09 -0500)]
Merge pull request #16023 from liewegas/wip-19994
systemd/ceph-mgr: remove automagic mgr creation hack
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Mykola Golub [Sat, 1 Jul 2017 12:02:29 +0000 (15:02 +0300)]
Merge pull request #15956 from dillaman/wip-librbd-devstack
test: fix failing rbd devstack teuthology test
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Mykola Golub [Sat, 1 Jul 2017 08:24:05 +0000 (11:24 +0300)]
Merge pull request #15923 from dillaman/wip-qa-rbd-memcheck-python
qa/suites/rbd: restrict python memcheck validation to CentOS
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
xie xingguo [Sat, 1 Jul 2017 07:20:30 +0000 (15:20 +0800)]
common: fix log warnings
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc:54:24: warning: suggest parentheses around comparison in operand of ‘|’ [-Wparentheses]
} else if (level_str == "warn" | level_str == "warning") {
^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc:56:24: warning: suggest parentheses around comparison in operand of ‘|’ [-Wparentheses]
} else if (level_str == "error" | level_str == "err") {
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Dan Mick [Sat, 1 Jul 2017 04:36:45 +0000 (21:36 -0700)]
ceph.in: allow developer mode from outside build tree
Use path of script to look for 'am I in a build tree' rather than
getcwd(), so that 'build tree' versions can be run from anywhere
Fixes: http://tracker.ceph.com/issues/20472
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Sage Weil [Sat, 1 Jul 2017 02:18:11 +0000 (21:18 -0500)]
Merge pull request #15911 from xiexingguo/wip-bluestore-
20170626
os/bluestore: narrow cache lock range; make sure min_alloc_size p2 aligned
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Sage Weil [Sat, 1 Jul 2017 02:17:49 +0000 (21:17 -0500)]
Merge pull request #16044 from liewegas/wip-i-cant-believe-its-not-btrfs
qa: stop testing btrfs
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Sat, 1 Jul 2017 02:17:21 +0000 (21:17 -0500)]
Merge pull request #16046 from liewegas/wip-valgrind-on-centos
do all valgrind runs on centos
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Fri, 30 Jun 2017 17:54:18 +0000 (13:54 -0400)]
doc: recommend against btrfs
Signed-off-by: Sage Weil <sage@redhat.com>
Yan Jun [Fri, 30 Jun 2017 15:25:09 +0000 (23:25 +0800)]
mon/mgr: add detail error infomation
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
Sage Weil [Fri, 30 Jun 2017 14:38:05 +0000 (09:38 -0500)]
Merge pull request #15963 from Songweibin/wip-release-notes
doc/release-notes: add Images creation timestamp note
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Fri, 30 Jun 2017 14:11:56 +0000 (09:11 -0500)]
Merge pull request #15924 from jcsp/wip-log-last-filters
mon: Filter `log last` output by severity and channel
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 30 Jun 2017 14:10:39 +0000 (09:10 -0500)]
Merge pull request #15946 from Yan-waller/wip-waller-dumpwatcher0627
osd: dump the field name of object watchers and cleanups
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Fri, 30 Jun 2017 14:09:53 +0000 (09:09 -0500)]
Merge pull request #15959 from smithfarm/wip-rgw-singleton-cleanup
tests: rgw/singleton: drop duplicate filestore-xfs.yaml
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Fri, 30 Jun 2017 14:09:38 +0000 (09:09 -0500)]
Merge pull request #15961 from majianpeng/filestore-remove-redundant-judgement
os/filestore/FileStore.cc: remove a redundant judgement when get max latency
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
Sage Weil [Fri, 30 Jun 2017 14:09:03 +0000 (09:09 -0500)]
Merge pull request #15999 from Yan-waller/wip-waller-0629message
msg/MOSDOpReply: fix missing trace decode
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Jos Collin [Fri, 30 Jun 2017 13:33:29 +0000 (13:33 +0000)]
Merge pull request #16037 from gmayyyha/monmapmonitor-use-func
mon/MonmapMonitor: use __func__ instead of hard code function name
Reviewed By: Joao Eduardo Luis <jecluis@gmail.com>
Sage Weil [Fri, 30 Jun 2017 13:33:10 +0000 (09:33 -0400)]
do all valgrind runs on centos
We are fighting two issues with valgrind on ubuntu (xenial, yakkety,
and z):
http://tracker.ceph.com/issues/18126
http://tracker.ceph.com/issues/20360
Revert this when it is fixed.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 30 Jun 2017 13:28:03 +0000 (09:28 -0400)]
qa: stop testing btrfs
This is too noisy and we don't recommend it anyway.
See http://tracker.ceph.com/issues/20169
Signed-off-by: Sage Weil <sage@redhat.com>
Ilya Dryomov [Fri, 30 Jun 2017 10:53:18 +0000 (12:53 +0200)]
PendingReleaseNotes: add a note on choose_args encoding
It's unlikely that it's been used yet, but worth a note.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Ilya Dryomov [Tue, 27 Jun 2017 15:22:11 +0000 (17:22 +0200)]
crush/CrushWrapper: crush_choose_arg::ids should be __s32
crush_choose_arg::ids array is encoded on the wire. int is not fixed
size -- use __s32 instead (crush_bucket::id is __s32).
This was introduced in commit
dbe36e08be00 ("crush: compile/decompile
crush_choose_arg_map") under SERVER_LUMINOUS bit.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Ilya Dryomov [Tue, 27 Jun 2017 14:47:38 +0000 (16:47 +0200)]
crush/CrushWrapper: encode choose_args.size() as __u32
choose_args.size() returns size_t, which is not fixed size. Given that
choose_args code just open-codes our std::map encoder, do what we do for
std::map.
This was introduced in commit
dbe36e08be00 ("crush: compile/decompile
crush_choose_arg_map") under SERVER_LUMINOUS bit.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Yanhu Cao [Fri, 30 Jun 2017 08:44:01 +0000 (16:44 +0800)]
mon/MonmapMonitor: use __func__ instead of hard code function name
Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
Tim Serong [Fri, 30 Jun 2017 07:24:21 +0000 (17:24 +1000)]
systemd: Add explicit Before=ceph.target
The PartOf= and WantedBy= directives in the various systemd
unit files and targets create the following logical hierarchy:
- ceph.target
- ceph-fuse.target
- ceph-fuse@.service
- ceph-mds.target
- ceph-mds@.service
- ceph-mgr.target
- ceph-mgr@.service
- ceph-mon.target
- ceph-mon@.service
- ceph-osd.target
- ceph-osd@.service
- ceph-radosgw.target
- ceph-radosgw@.service
- ceph-rbd-mirror.target
- ceph-rbd-mirror@.service
Additionally, the ceph-{fuse,mds,mon,osd,radosgw,rbd-mirror}
targets have WantedBy=multi-user.target. This gives the
following behaviour:
- `systemctl {start,stop,restart}` of any target will restart
all dependent services (e.g.: `systemctl restart ceph.target`
will restart all services; `systemctl restart ceph-mon.target`
will restart all the mons, and so forth).
- `systemctl {enable,disable}` for the second level targets
(ceph-mon.target etc.) will cause depenent services to come
up on boot, or not (of course the individual services can
be enabled or disabled as well - for a service to start
on boot, both the service and its target must be enabled;
disabling either will cause the service to be disabled).
- `systemctl {enable,disable} ceph.target` has no effect on
whether or not services come up at boot; if the second level
targets and services are enabled, they'll start regardless of
whether ceph.target is enabled. This is due to the second
level targets all having WantedBy=multi-user.target.
- The OSDs will always start regardless of ceph-osd.target
(unless they are explicitly masked), thanks to udev magic.
So far, so good. Except, several users have encountered
services not starting with the following error:
Failed to start ceph-osd@5.service: Transaction order is
cyclic. See system logs for details.
I've not been able to reproduce this myself in such a way as to
cause OSDs to fail to start, but I *have* managed to get systemd
into that same confused state, as follows:
- Disable ceph.target, ceph-mon.target, ceph-osd.target,
ceph-mon@$(hostname).service and all ceph-osd instances.
- Re-enable all of the above.
At this point, everything is fine, but if I then subseqently
disable ceph.target, *then* try `systemctl restart ceph.target`,
I get "Failed to restart ceph.target: Transaction order is cyclic.
See system logs for details."
Explicitly adding Before=ceph.target to each second level target
prevents systemd from becoming confused in this situation.
Signed-off-by: Tim Serong <tserong@suse.com>
Haomai Wang [Sat, 24 Jun 2017 07:59:02 +0000 (15:59 +0800)]
msg/async: increase worker reference with local listen table enabled backend
Fixes: http://tracker.ceph.com/issues/20390
Signed-off-by: Haomai Wang <haomai@xsky.com>
Sage Weil [Tue, 27 Jun 2017 22:12:35 +0000 (18:12 -0400)]
mon,mgr: track available modules in MgrMap too
Require --force to enable a module that isn't reported as available.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 27 Jun 2017 20:00:26 +0000 (16:00 -0400)]
doc: update docs for enabling mgr modules
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 27 Jun 2017 19:58:44 +0000 (15:58 -0400)]
mon,mgr: manage mgr module list in mgrmap
Kill old mgr_modules option.
Add new mgr_initial_modules option, on the mon, for the initial cluster
mgrmap.
Add ls, enable, disable commands.
Respawn mgr if the module list changes. In the future we could enable
new modules without a full restart, but disabling probably requires (and
is best handled by) a respawn.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 27 Jun 2017 19:52:25 +0000 (15:52 -0400)]
mgr: include MgrMap in ClusterState
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 30 Jun 2017 03:04:20 +0000 (22:04 -0500)]
Merge pull request #15927 from jcsp/wip-mgr-log-on-load-failed
mgr: cluster log message on plugin load error
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 30 Jun 2017 03:03:55 +0000 (22:03 -0500)]
Merge pull request #15951 from wido/issue-20430
osd: Execute crush_location_hook when configured in ceph.conf
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 30 Jun 2017 03:03:37 +0000 (22:03 -0500)]
Merge pull request #15954 from Liuchang0812/wip-osd-compact
mon: fix kvstore type in mon compact command
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 30 Jun 2017 03:03:20 +0000 (22:03 -0500)]
Merge pull request #15957 from liewegas/wip-rc
ceph_release: we are in the 'rc' phase (12.1.z)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 30 Jun 2017 03:03:02 +0000 (22:03 -0500)]
Merge pull request #15968 from xiexingguo/wip-poolopts-fix
mon/OSDMonitor: two pool opts related fix
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 30 Jun 2017 03:02:47 +0000 (22:02 -0500)]
Merge pull request #15974 from liewegas/wip-require-osd-release-print
osd/OSDMap: print require_osd_release
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Fri, 30 Jun 2017 03:02:08 +0000 (22:02 -0500)]
Merge pull request #15976 from liewegas/wip-bluestore-big-cache
os/bluestore: default cache size of 3gb
Kefu Chai [Fri, 30 Jun 2017 02:21:37 +0000 (10:21 +0800)]
Merge pull request #15489 from xxhdx1985126/master
librados: redirect balanced reads to acting primary when targeting object isn't recovered
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 30 Jun 2017 01:34:59 +0000 (09:34 +0800)]
Merge pull request #14678 from joscollin/wip-cleanup-storeget-return-check
mon: handle cases where store->get() may return error
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 30 Jun 2017 01:32:56 +0000 (09:32 +0800)]
Merge pull request #15926 from liewegas/wip-log-channel
librados: add log channel to rados_monitor_log2 callback
Reviewed-by: John Spray <john.spray@redhat.com>
Kefu Chai [Fri, 30 Jun 2017 01:31:02 +0000 (09:31 +0800)]
Merge pull request #15925 from jcsp/wip-fsstatus-cleanup
mgr: clean up fsstatus module
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 30 Jun 2017 01:29:25 +0000 (09:29 +0800)]
Merge pull request #15932 from dillaman/wip-20421
pybind: restore original API for backwards compatibility
Reviewed-by: Kefu Chai <kchai@redhat.com>
Josh Durgin [Thu, 29 Jun 2017 21:00:18 +0000 (14:00 -0700)]
Merge pull request #14760 from dzafman/wip-19657
osd: On EIO from read recover the primary replica from another copy
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yehuda Sadeh [Thu, 29 Jun 2017 19:54:28 +0000 (12:54 -0700)]
Merge pull request #15912 from cloudbau/wip-20107
rgw: Fix duplicate tag removal during GC
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Tested-by: Yuri Weinstein <yweinste@redhat.com>
Jason Dillaman [Thu, 29 Jun 2017 18:54:40 +0000 (14:54 -0400)]
rbd: do not attempt to load key if auth is disabled
Fixes: http://tracker.ceph.com/issues/19035
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Thu, 29 Jun 2017 17:39:28 +0000 (13:39 -0400)]
systemd/ceph-mgr: remove automagic mgr creation hack
For kraken we auto-created mgr daemons next to mon daemons with some
systemd hackery. This is awkward (you can't not get a new mgr daemon when
you deploy a mon), systemd-specific (not implemented for upstart on
trusty), and mostly unexpected. Since ceph-mgr daemons are now first-class
citizens and required for every cluster, make their deployment explicit
and transparent to the administrator. Major upgrades are a rare
opportunity to have the administrator's full attention so take advantage
of it.
This effectively reverts
61d779345e9efbe9a2e3f215af1f1dcf6630f04a and
082199f69dd0bd4c18a5f4baea67a88782586657 (and follow-on fixes).
Fixes/avoids: http://tracker.ceph.com/issues/19994
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 29 Jun 2017 16:21:42 +0000 (11:21 -0500)]
Merge pull request #15894 from liewegas/wip-no-default-pool
mon,osd: do not create rbd pool by default
John Spray [Thu, 29 Jun 2017 15:59:53 +0000 (11:59 -0400)]
mon: make `log` command send messages to default channel
...rather than leaving channel blank. This means that
people watching the main "cluster" channel will see
the log messages sent using `log`.
Signed-off-by: John Spray <john.spray@redhat.com>
Yan Jun [Thu, 29 Jun 2017 06:11:26 +0000 (14:11 +0800)]
message: fix missing decode trace
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>