]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Mark Nelson [Mon, 10 Jul 2017 15:39:15 +0000 (10:39 -0500)]
os/bluestore: Make BitmapFreelistManager kv itereator short lived.
Signed-off-by: Mark Nelson <mnelson@redhat.com>
John Spray [Mon, 10 Jul 2017 14:03:07 +0000 (15:03 +0100)]
Merge pull request #15858 from liewegas/wip-mgr-servicemap
mgr,librados: service map
Reviewed-by: John Spray <john.spray@redhat.com>
Alfredo Deza [Mon, 10 Jul 2017 11:52:24 +0000 (07:52 -0400)]
Merge pull request #16049 from fullerdj/wip-djf-key-timeout
ceph-create-keys: add an argument to override default 10-minute timeout
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Jos Collin [Mon, 10 Jul 2017 11:23:24 +0000 (11:23 +0000)]
Merge pull request #16236 from shashalu/clean-up-RGWRemoteDataLog-unused-function
rgw: drop unused function RGWRemoteDataLog::get_shard_info()
Reviewed-by: Jos Collin <jcollin@redhat.com>
lu.shasha [Mon, 10 Jul 2017 08:14:55 +0000 (16:14 +0800)]
rgw:multisite: clean up RGWRemoteDataLog unused function
'RGWRemoteDataLog::get_shard_info' function not used, drop it
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
Sage Weil [Mon, 10 Jul 2017 01:23:13 +0000 (20:23 -0500)]
Merge pull request #16160 from xiexingguo/wip-misc2
mon, osd: misc fixes and cleanups
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Mon, 10 Jul 2017 01:22:46 +0000 (20:22 -0500)]
Merge pull request #16220 from dzafman/wip-20544
mon: Fix status output warning for mon_warn_osd_usage_min_max_delta
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 10 Jul 2017 01:20:52 +0000 (20:20 -0500)]
Merge pull request #16223 from liewegas/wip-dashboard-default
pybind/mgr/dashboard: bind to :: by default
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yehuda Sadeh [Fri, 30 Jun 2017 16:04:05 +0000 (12:04 -0400)]
rgw: register as a service
support dynamic reload, and also add frontend info
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Sage Weil [Tue, 27 Jun 2017 13:32:44 +0000 (09:32 -0400)]
mon: make service summary string customizable; simple default
Eventually the mgr can populate this field with something tailored to the
service.
Signed-off-by: Sage Weil <sage@redhat.com>
John Spray [Mon, 26 Jun 2017 23:42:34 +0000 (19:42 -0400)]
mgr: set hostname propery on ServiceMap services
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 26 Jun 2017 23:10:24 +0000 (19:10 -0400)]
librados: include common daemon metadata in service_daemon_register
Aside from being generally useful, this uniformity enables ceph-mgr
to have some common information about all the hosts
it knows about; otherwise we would sometimes learn
about a host without e.g. knowing about the cpu/ram/kernel.
Signed-off-by: John Spray <john.spray@redhat.com>
Sage Weil [Mon, 26 Jun 2017 19:55:19 +0000 (15:55 -0400)]
mgr: expose daemon status to modules
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 19:54:59 +0000 (15:54 -0400)]
mgr/PyModules: expose service_map to modules
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 17:22:57 +0000 (13:22 -0400)]
librados: allow service registrations
Signed-off-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Sun, 9 Jul 2017 11:14:42 +0000 (13:14 +0200)]
Merge pull request #16079 from smithfarm/wip-doc-make-check
doc: dev: add notes on PR make check validation test
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sun, 9 Jul 2017 02:34:13 +0000 (21:34 -0500)]
Merge pull request #16027 from liewegas/wip-crush-rule-class
mon,crush: create crush rules using device classes for replicated and ec pools via cli
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Sun, 9 Jul 2017 02:32:36 +0000 (21:32 -0500)]
Merge pull request #16228 from smithfarm/wip-rados-upgrade-2
tests: fix rados/upgrade/jewel-x-singleton and make workunit task handle repo URLs not ending in ".git"
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 17:22:30 +0000 (13:22 -0400)]
mgr: implement 'service dump' and 'service status'
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 17:22:17 +0000 (13:22 -0400)]
mgr: allow/track service registrations
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 17:21:35 +0000 (13:21 -0400)]
mon: include services in 'ceph -s'
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 17:20:58 +0000 (13:20 -0400)]
mon: persist ServiceMap
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 17:19:56 +0000 (13:19 -0400)]
mgr: add ServiceMap
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 26 Jun 2017 17:19:07 +0000 (13:19 -0400)]
vstart.sh: give rgw daemons letter names
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 22 Jun 2017 18:19:17 +0000 (14:19 -0400)]
mgr: index daemon state by string service type
If we use a string we can allow for other service names like
'rgw' and 'rbd-mirror' and 'iscsigw' and so on.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 9 Jul 2017 02:29:59 +0000 (21:29 -0500)]
Merge pull request #15973 from majianpeng/bluefs-async-compact-log
os/bluestore/BlueFS: clear current log entrys before dump all fnode,
Reviewed-by: Sage Weil <sage@redhat.com>
Jos Collin [Sun, 9 Jul 2017 01:02:04 +0000 (01:02 +0000)]
Merge pull request #16214 from liupan1111/wip-fix-mutex
common/Mutex.cc: fixed the error in comment
Reviewed-by: Jos Collin <jcollin@redhat.com>
Nathan Cutler [Sat, 8 Jul 2017 08:48:49 +0000 (10:48 +0200)]
qa: workunit: handle repo ending in "/ceph-ci"
If the repo ends in "/ceph-ci" it's the same as if it ended in "/ceph-ci.git"
Before this change, the following command was broken if the workunit specified,
e.g., "branch: jewel":
teuthology-suite --ceph-repo https://github.com/ceph/ceph --ceph master
--suite-repo https://github.com/ceph/ceph-ci --suite-branch wip-foo . . .
Fixes: http://tracker.ceph.com/issues/20554
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Sage Weil [Fri, 7 Jul 2017 18:55:53 +0000 (14:55 -0400)]
qa/suites/rados/upgrade: upgrade client.0 node too
Fixes: http://tracker.ceph.com/issues/20368
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Sage Weil [Sat, 8 Jul 2017 16:24:07 +0000 (11:24 -0500)]
Merge pull request #16017 from liewegas/wip-20454
os/bluestore/BlueFS: clean up log_writer aios from compaction
Sage Weil [Sat, 8 Jul 2017 14:01:10 +0000 (09:01 -0500)]
Merge pull request #16025 from liewegas/wip-19964
mon: do crushtool test with fork and timeout, but w/o exec of crushtool
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Sage Weil [Sat, 8 Jul 2017 14:00:47 +0000 (09:00 -0500)]
Merge pull request #16121 from shashalu/fix-kerneldevice-size
os/bluestore: clear up redundant size assignment in KerenelDevice
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Sat, 8 Jul 2017 13:54:34 +0000 (08:54 -0500)]
Merge pull request #16205 from javacruft/build-ec-isa-as-module
build: build erasure-code isa lib without versions
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 8 Jul 2017 13:54:18 +0000 (08:54 -0500)]
Merge pull request #16212 from dillaman/wip-qa-ceph-task
qa/tasks/ceph: don't hard-code cluster name when copying fsid
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 8 Jul 2017 13:53:55 +0000 (08:53 -0500)]
Merge pull request #16213 from liewegas/wip-radosbench-timeout
qa/tasks/radosbench: longer timeout
Pan Liu [Sat, 8 Jul 2017 05:49:28 +0000 (13:49 +0800)]
common/Mutex.cc: fixed the error in comment
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Sage Weil [Sat, 8 Jul 2017 02:41:19 +0000 (22:41 -0400)]
pybind/mgr/dashboard: bind to :: by default
This is all available v4 and v6 addrs on the host.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 8 Jul 2017 02:39:19 +0000 (21:39 -0500)]
Merge pull request #16198 from tchaikov/wip-doc-fixes
doc: kill sphinx warnings
Sage Weil [Sat, 8 Jul 2017 02:34:58 +0000 (22:34 -0400)]
test/cli/crushtool: fix rules.t
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Sat, 8 Jul 2017 01:58:21 +0000 (09:58 +0800)]
Merge pull request #16225 from liewegas/wip-mon-auth-caps
qa/suites/rados/singleton/all/mon-auth-caps: more osds so we can go clean
Reviewed-by: Kefu Chai <kchai@redhat.com>
vasukulkarni [Fri, 7 Jul 2017 22:45:01 +0000 (15:45 -0700)]
Merge pull request #16216 from ceph/wip-mgr-cd-updates
[qa/ceph-deploy]: run create mgr nodes as well
Josh Durgin [Fri, 7 Jul 2017 22:18:49 +0000 (15:18 -0700)]
Merge pull request #15689 from jdurgin/wip-filestore-rand-split
os/filestore/HashIndex: randomize split threshold by a configurable amount
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Fri, 7 Jul 2017 22:15:58 +0000 (15:15 -0700)]
Merge pull request #16078 from xiexingguo/wip-misc
mon, osd: misc fixes
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 7 Jul 2017 21:48:14 +0000 (16:48 -0500)]
Merge pull request #16218 from javacruft/ubuntu-fix-systemd-enable
build: execute dh_systemd_{enable,start} after dh_install
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 7 Jul 2017 21:47:38 +0000 (16:47 -0500)]
Merge pull request #15944 from xiexingguo/wip-bluestore-
20170627
os/bluestore: reduce some overhead for _do_clone_range() and _do_remove()
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 7 Jul 2017 21:43:47 +0000 (16:43 -0500)]
Merge pull request #16052 from dzafman/wip-20471
osd: Check for and automatically repair object info soid during scrub
Reviewed-by: Sage Weil <sage@redhat.com>
Douglas Fuller [Fri, 30 Jun 2017 17:46:26 +0000 (17:46 +0000)]
ceph-create-keys: add an argument to override default 10-minute timeout
ceph-create-keys waits 10 minutes for mon quorum by default. Add an
option, -t, to override the timeout with a custom value in seconds.
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
Sage Weil [Fri, 7 Jul 2017 21:43:26 +0000 (16:43 -0500)]
Merge pull request #16147 from Yan-waller/wip-waller-0703radostool
tools/rados: some cleanups
Reviewed-by: David Zafman <dzafman@redhat.com>
Sage Weil [Fri, 7 Jul 2017 21:43:08 +0000 (16:43 -0500)]
Merge pull request #16217 from liewegas/wip-class-luminous
mon/OSDMonitor: guard 'osd crush set-device-class'
Sage Weil [Fri, 7 Jul 2017 21:39:22 +0000 (17:39 -0400)]
qa/suites/rados/singleton/all/mon-auth-caps: more osds so we can go clean
and scrub
Signed-off-by: Sage Weil <sage@redhat.com>
David Zafman [Fri, 30 Jun 2017 23:04:02 +0000 (16:04 -0700)]
osd: Check for and automatically repair object info soid during scrub
Fixes: http://tracker.ceph.com/issues/20471
Signed-off-by: David Zafman <dzafman@redhat.com>
Sage Weil [Fri, 7 Jul 2017 18:19:47 +0000 (14:19 -0400)]
Merge remote-tracking branch 'gh/luminous'
David Zafman [Fri, 7 Jul 2017 17:53:41 +0000 (10:53 -0700)]
mon: Fix status output warning for mon_warn_osd_usage_min_max_delta
Fixes: http://tracker.ceph.com/issues/20544
Caued by:
489e810c37ed6fb9d32d1015634041a577501ee4
Signed-off-by: David Zafman <dzafman@redhat.com>
Sage Weil [Fri, 7 Jul 2017 16:52:53 +0000 (12:52 -0400)]
mon/OSDMonitor: clean up error messages
Signed-off-by: Sage Weil <sage@redhat.com>
Casey Bodley [Fri, 7 Jul 2017 16:45:58 +0000 (12:45 -0400)]
Merge pull request #15997 from pritha-srivastava/wip-rgw-assert-correction
rgw: Correcting the condition in ceph_assert while parsing an AWS Principal
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Yuri Weinstein [Fri, 7 Jul 2017 16:38:37 +0000 (09:38 -0700)]
Merge pull request #15703 from DHB-liuhong/website-lh
rgw: fix the subdir without slash of s3 website url
Reviewed-by: Robin H. Johnson <robbat2@gentoo.org>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 7 Jul 2017 16:35:52 +0000 (09:35 -0700)]
Merge pull request #15916 from oritwas/wip-rgw-fix-prefix-list
Wip rgw fix prefix list
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yuri Weinstein [Fri, 7 Jul 2017 16:33:37 +0000 (09:33 -0700)]
Merge pull request #15996 from mikulely/rgw-rest-complain
rgw: silence compile warning from -Wmaybe-uninitialized
Reviewed-by: Jos Collin <jcollin@redhat.com>
Casey Bodley [Fri, 7 Jul 2017 16:29:14 +0000 (12:29 -0400)]
Merge pull request #16062 from YangFanlinux/myceph1
rgw: Replace get_zonegroup().is_master_zonegroup() with is_meta_master() in RGWBulkDelete::Deleter::delete_single()
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 7 Jul 2017 16:26:58 +0000 (09:26 -0700)]
Merge pull request #15998 from mdw-at-linuxbox/fixmarker
rgw: fix marker encoding problem.
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Vasu Kulkarni [Fri, 7 Jul 2017 16:23:43 +0000 (09:23 -0700)]
create rbd pool since its not created by default anymore
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
Yuri Weinstein [Fri, 7 Jul 2017 16:23:10 +0000 (09:23 -0700)]
Merge pull request #16095 from zhaochao/rgw-add-a-new-errcode-for-non-existed-subuser
rgw: add a new error code for non-existed subuser.
Reviewed-by: Jos Collin <jcollin@redhat.com>
James Page [Fri, 7 Jul 2017 16:18:27 +0000 (17:18 +0100)]
build: execute dh_systemd_{enable,start} after dh_install
Ensure that dh_systemd_* debhelpers are executed after dh_install
has installed the systemd unit and target definitions.
This ensures that targets are enabled by default once installed,
resolving issues with startup of ceph daemons on server reboot.
Fixes: http://tracker.ceph.com/issues/19585
Signed-off-by: James Page <james.page@ubuntu.com>
Sage Weil [Fri, 7 Jul 2017 16:17:36 +0000 (12:17 -0400)]
mon/OSDMonitor: guard 'osd crush set-device-class'
Requires luminous.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 7 Jul 2017 15:35:19 +0000 (10:35 -0500)]
Merge pull request #16148 from liewegas/wip-20434
mon: collect mon metdata as part of the election
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Sage Weil [Thu, 6 Jul 2017 19:32:20 +0000 (15:32 -0400)]
mon: collect mon metadata as part of election
Previously each peon would send a message to teh leader with its metadata
immediately after the election was won. However, at that point paxos
usually wasn't writeable, which meant the old update_mon_metadata() method
didn't persist reliably, updates would race, and generally speaking
metadata wasn't reliably updated.
Fix this by including metadata as part of the election ack, and persisting
the whole quorum when the election is won. This ensures it is up to date.
Fixes: http://tracker.ceph.com/issues/20434
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 5 Jul 2017 21:32:36 +0000 (17:32 -0400)]
mon: keep mon metadata in ram
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 5 Jul 2017 19:43:33 +0000 (15:43 -0400)]
mon: use single collect_metadata helper, consistently set 'addr'
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Fri, 7 Jul 2017 15:21:51 +0000 (11:21 -0400)]
qa/tasks/ceph: supply cluster name to ceph CLI
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Vasu Kulkarni [Fri, 7 Jul 2017 15:16:21 +0000 (08:16 -0700)]
create mgr nodes explicitly now, previously they where
started alongside monitor daemons due to systemd rules.
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
Sage Weil [Thu, 6 Jul 2017 21:32:27 +0000 (17:32 -0400)]
qa/workunits/cephtool/test.sh: remove two crushtool validation tests
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 29 Jun 2017 19:15:32 +0000 (15:15 -0400)]
crush/CrushTester: remove old test_with_crushtool helper
test_with_fork is superior in all ways :)
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 29 Jun 2017 19:14:40 +0000 (15:14 -0400)]
mon/OSDMonitor: test crush with fork but not crushtool spawn
We see timeouts here, but I very much suspect they are due to the overhead
of launching the crushtool process and not the test itself. We have
perfectly code already in our process, though; we just want to isolate
failure and time out reliably. So, fork and timeout, without executing
a new binary.
Hopefully-fixes: http://tracker.ceph.com/issues/19964
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 7 Jul 2017 12:35:56 +0000 (08:35 -0400)]
common/fork_function: close all fds in children
Not strictly necessary, but a tidier.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 29 Jun 2017 19:12:58 +0000 (15:12 -0400)]
common/fork_function: helper to run a function, forked, with a timeout
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 7 Jul 2017 15:10:04 +0000 (10:10 -0500)]
Merge pull request #16128 from liewegas/wip-20475
mon: debug session feature tracking
Sage Weil [Fri, 7 Jul 2017 15:08:57 +0000 (10:08 -0500)]
Merge pull request #16157 from xiexingguo/wip-bluestore-cache
os/bluestore: differ default cache size for hdd/ssd backends
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 7 Jul 2017 15:08:35 +0000 (10:08 -0500)]
Merge pull request #16188 from liewegas/wip-device-class-guard
mon/OSDMonitor: do not allow crush device classes until luminous
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Fri, 7 Jul 2017 15:08:05 +0000 (10:08 -0500)]
Merge pull request #16194 from cbodley/wip-20534
msg: QueueStrategy::wait() joins all threads
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Sage Weil [Fri, 7 Jul 2017 15:07:44 +0000 (10:07 -0500)]
Merge pull request #16196 from liewegas/wip-19518
ceph_test_rados_api_c_read_operations: do not assert per-op rval is correct
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 7 Jul 2017 15:04:36 +0000 (11:04 -0400)]
qa/tasks/radosbench: longer timeout
Hit another timeout due to aggressive thrashing with size==min_size.
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Fri, 7 Jul 2017 14:44:20 +0000 (10:44 -0400)]
qa/tasks/ceph: don't hard-code cluster name when copying fsid
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Fri, 7 Jul 2017 14:40:57 +0000 (22:40 +0800)]
Merge pull request #16201 from tchaikov/wip-20432
common/Timer: do not add event if already shutdown
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Boris Ranto [Fri, 7 Jul 2017 14:20:15 +0000 (16:20 +0200)]
Merge pull request #16208 from ceph/wip-base-postun
rpm: Fix undefined FIRST_ARG
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Boris Ranto [Fri, 7 Jul 2017 10:37:55 +0000 (12:37 +0200)]
rpm: Fix undefined FIRST_ARG
If FIRST_ARG is undefined, the rpms will show an error on upgrade
because the condition in the postun script gets broken.
This was a regression introduced by commit for issue 20077 that moved
ceph-disk unit files to ceph-base.
Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Fri, 7 Jul 2017 12:29:18 +0000 (14:29 +0200)]
Merge pull request #16126 from ktdreyer/rpm-epoch-2
rpm: bump epoch ahead of RHEL base
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
James Page [Fri, 7 Jul 2017 09:09:03 +0000 (10:09 +0100)]
build: build erasure-code isa lib without versions
As erasure coding modules are loaded dynamically by Ceph, there
is no need to build the backend modules with library versioning.
This change brings the isa library inline with other erasure-code
sub-modules.
Signed-off-by: James Page <james.page@ubuntu.com>
Nathan Cutler [Fri, 7 Jul 2017 07:52:06 +0000 (09:52 +0200)]
Merge pull request #16199 from tchaikov/wip-release-note-escape-stars
tools: ceph-release-notes: escape asterisks not for inline emphasis
Reviewed-by: Nathan Cutler <ncutler@suse.com>
xie xingguo [Fri, 7 Jul 2017 07:45:21 +0000 (15:45 +0800)]
mon/OSDMonitor: drop unnecessary parameter now from force_failure()
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Kefu Chai [Fri, 7 Jul 2017 07:16:09 +0000 (15:16 +0800)]
Merge pull request #15895 from ganeshmaharaj/isal-v2.18
isa-l: update isa-l to v2.18
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 7 Jul 2017 05:44:03 +0000 (13:44 +0800)]
common/Timer: do not add event if already shutdown
otherwise the callback is leaked.
Fixes: http://tracker.ceph.com/issues/20432
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 7 Jul 2017 03:48:50 +0000 (11:48 +0800)]
tools: ceph-release-notes: escape asterisks not for inline emphasis
Signed-off-by: Kefu Chai <kchai@redhat.com>
xie xingguo [Fri, 7 Jul 2017 05:52:02 +0000 (13:52 +0800)]
mon/OSDMonitor: fix error message
Actually this is not reachable...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Patrick Donnelly [Fri, 7 Jul 2017 05:15:33 +0000 (22:15 -0700)]
Merge remote-tracking branch 'upstream/pull/15844/head' into master
* commit '
47ab651a1f ':
qa: reset journal before cephfs_journal_tool_smoke.sh exits
qa: remove 'apply' from journal_tool_smoke.sh
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 7 Jul 2017 05:14:32 +0000 (22:14 -0700)]
Merge remote-tracking branch 'upstream/pull/15822/head' into master
* upstream/pull/15822/head:
qa: add timeout/repeat to pool df
Reviewed-by: John Spray <jspray@redhat.com>
Patrick Donnelly [Fri, 7 Jul 2017 05:11:18 +0000 (22:11 -0700)]
Merge remote-tracking branch 'upstream/pull/15950/head' into master
* upstream/pull/15950/head:
qa: update thrash max mds testing
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 7 Jul 2017 04:49:08 +0000 (21:49 -0700)]
Merge remote-tracking branch 'upstream/pull/15758/head' into master
* upstream/pull/15758/head:
mds: repeat dir->is_frozen in rdlock_path_xlock_dentry
Reviewed-by: Zheng Yan <zyan@redhat.com>
Patrick Donnelly [Fri, 7 Jul 2017 04:48:47 +0000 (21:48 -0700)]
Merge remote-tracking branch 'upstream/pull/15510/head' into master
* upstream/pull/15510/head:
mds: improve freeze deadlock detection
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 7 Jul 2017 04:38:45 +0000 (21:38 -0700)]
Merge remote-tracking branch 'upstream/pull/15937/head' into master
* upstream/pull/15937/head:
qa: remove unused quota config option
Reviewed-by: John Spray <jspray@redhat.com>
Patrick Donnelly [Fri, 7 Jul 2017 04:38:13 +0000 (21:38 -0700)]
Merge remote-tracking branch 'upstream/pull/15825/head' into master
* upstream/pull/15825/head:
mds: remove unused MDBalancer member
Update last_epoch_(over|under) in MDBalaner if mds0 has failed
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>