]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agocommon/strtol: add string_view interface and use string_view internally
Jan Fajerski [Tue, 30 Jan 2018 08:50:25 +0000 (09:50 +0100)]
common/strtol: add string_view interface and use string_view internally

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agocommon/util: remove unit_to_bytesize, use strict_iecstrtoll instead
Jan Fajerski [Tue, 30 Jan 2018 08:48:05 +0000 (09:48 +0100)]
common/util: remove unit_to_bytesize, use strict_iecstrtoll instead

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agocommon/strtol: add strict_iecstrtoll; strict_sistrtoll uses base 10
Jan Fajerski [Tue, 20 Feb 2018 16:38:05 +0000 (17:38 +0100)]
common/strtol: add strict_iecstrtoll; strict_sistrtoll uses base 10

This adds parsing of iec units (IEC units Ki, Mi, ...) besides the parsing
of the usual unit multipliers (SI units K, M, ...). Both unit prefixes are
parsed with base 2. While SI units should be parsed with base 10, this
would likely confuse users.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agoinclude/types: format decimal numbers with decimal factor
Jan Fajerski [Tue, 21 Nov 2017 17:34:28 +0000 (18:34 +0100)]
include/types: format decimal numbers with decimal factor

Until now bytes and objects were formatted using si_t which used 1024 as
the factor to pretty print large numbers. For object counts a factor of
1000 is preferred. This commit retires the si_t formatting (as well as
prettybyte_t, kb_t and pretty_si_t) completely and adds structs and
formatting for binary and decimal units, bin_u_t and dec_u_t respectively.
Fixes: http://tracker.ceph.com/issues/22095
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge PR #20855 into master
Patrick Donnelly [Tue, 3 Apr 2018 04:15:20 +0000 (21:15 -0700)]
Merge PR #20855 into master

* refs/pull/20855/head:
client: add the fuse parameter max_write

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21096 into master
Patrick Donnelly [Tue, 3 Apr 2018 04:10:56 +0000 (21:10 -0700)]
Merge PR #21096 into master

* refs/pull/21096/head:
pybind/cephfs: added comments to cephfs.pyx

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21183 from neha-ojha/wip-minor-fix-perf-suite
Yuri Weinstein [Mon, 2 Apr 2018 20:56:08 +0000 (13:56 -0700)]
Merge pull request #21183 from neha-ojha/wip-minor-fix-perf-suite

qa/suites/perf-basic: add desc regarding test machines

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoMerge pull request #21075 from ceph/wip-yuriw-try-crontab
David Galloway [Mon, 2 Apr 2018 20:08:02 +0000 (16:08 -0400)]
Merge pull request #21075 from ceph/wip-yuriw-try-crontab

test:qa:infra - teuthology crontab items as of 3/27/18

7 years agoqa/suites/perf-basic: add desc regarding test machines 21183/head
Neha Ojha [Mon, 2 Apr 2018 19:43:20 +0000 (12:43 -0700)]
qa/suites/perf-basic: add desc regarding test machines

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge pull request #21165 from Songweibin/wip-drop-redefine-func
Jason Dillaman [Mon, 2 Apr 2018 15:17:04 +0000 (11:17 -0400)]
Merge pull request #21165 from Songweibin/wip-drop-redefine-func

librbd: minor code cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #21143 from wjwithagen/wjw-ipaddr-ipv6
Kefu Chai [Mon, 2 Apr 2018 14:10:30 +0000 (22:10 +0800)]
Merge pull request #21143 from wjwithagen/wjw-ipaddr-ipv6

common: FreeBSD wants the correct struct selection for ipv6

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21136 from kungf/io_events
Kefu Chai [Mon, 2 Apr 2018 14:08:17 +0000 (22:08 +0800)]
Merge pull request #21136 from kungf/io_events

bluestore: fix aio_t::rval  type

Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20820 from guzhongyan/nodels-improve
Kefu Chai [Mon, 2 Apr 2018 14:06:49 +0000 (22:06 +0800)]
Merge pull request #20820 from guzhongyan/nodels-improve

mon: node ls improvement

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20298 from markhpc/wip-osd-check_full
Kefu Chai [Mon, 2 Apr 2018 14:05:57 +0000 (22:05 +0800)]
Merge pull request #20298 from markhpc/wip-osd-check_full

osd: don't process ostream strings when not debugging.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #21159 from tchaikov/wip-no-more-use-wheel
Kefu Chai [Mon, 2 Apr 2018 12:00:51 +0000 (20:00 +0800)]
Merge pull request #21159 from tchaikov/wip-no-more-use-wheel

src: s/pip --use-wheel/pip/

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agopybind/rbd: normalize errno exception 21165/head
songweibin [Mon, 2 Apr 2018 03:31:04 +0000 (11:31 +0800)]
pybind/rbd: normalize errno exception

The code meant to do so but actually it does not ...

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agolibrbd: return error when r < 0
songweibin [Mon, 2 Apr 2018 03:09:26 +0000 (11:09 +0800)]
librbd: return error when r < 0

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agolibrbd: drop a duplicate definition function
songweibin [Mon, 2 Apr 2018 01:29:26 +0000 (09:29 +0800)]
librbd: drop a duplicate definition function

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agosrc: s/--use-wheel// 21159/head
Kefu Chai [Sun, 1 Apr 2018 12:27:24 +0000 (20:27 +0800)]
src: s/--use-wheel//

--use-wheel was deprecated in favor of --only-binary in pip v7.0.0. and
--use-wheel was removed in a recent release of pip. but some packages
are source packages, so we cannot simply replace use-wheel with
only-binary. so a simpler approach is to drop --use-wheel option, as pip
respects --find-links, and will find the required package from the
wheelhouse.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #20132 into master
Patrick Donnelly [Sat, 31 Mar 2018 05:25:10 +0000 (22:25 -0700)]
Merge PR #20132 into master

* refs/pull/20132/head:
qa/cephfs: update TestDamage for open file table
mds: allow storing open file table in multiple omaps
mds: differentiate Anchor types to clarify purpose
mds: add perf counter for 'open ino' operation
mds: protect open file table against partial omap update
mds: add dirfrags whose child inodes have caps to open file table
mds: don't try prefetching destroyed inodes
mds: don't try opening inodes that haven't been created
mds: don't re-requeue open files to head of log
mds: use open file table to speed up mds recovery
mds: introduce open file table
mds: track how many clients/mds want caps for each inode
mds: cleanup MDCache::opening_inodes access
mds: cleanup CInode/CDir states definition

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21147 from rjfd/wip-dashboard-fix-notification-queue-test
Kefu Chai [Sat, 31 Mar 2018 00:59:07 +0000 (08:59 +0800)]
Merge pull request #21147 from rjfd/wip-dashboard-fix-notification-queue-test

mgr/dashboard: notification queue: fix priority tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomgr/dashboard: notification queue: fix priority tests 21147/head
Ricardo Dias [Fri, 30 Mar 2018 22:18:05 +0000 (23:18 +0100)]
mgr/dashboard: notification queue: fix priority tests

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20979 from ceph/wip-cd-smoke-fix
vasukulkarni [Fri, 30 Mar 2018 19:20:09 +0000 (12:20 -0700)]
Merge pull request #20979 from ceph/wip-cd-smoke-fix

qa/tests: use ceph-deploy stable branch for single node tests

7 years agoqa/tests: use stable branch for single node tests 20979/head
Vasu Kulkarni [Fri, 16 Mar 2018 23:25:09 +0000 (16:25 -0700)]
qa/tests: use stable branch for single node tests

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agocommon: FreeBSD wants the correct struct selection for ipv6 21143/head
Willem Jan Withagen [Fri, 30 Mar 2018 14:53:48 +0000 (16:53 +0200)]
common: FreeBSD wants the correct struct selection for ipv6

Lets see if this also works for Linux

Fixes: http://tracker.ceph.com/issues/21813
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #18317 from hitoshikamei/master-rbd
Jason Dillaman [Fri, 30 Mar 2018 12:45:15 +0000 (08:45 -0400)]
Merge pull request #18317 from hitoshikamei/master-rbd

rbd: eager-thick provisioning support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20868 from shun-s/fix-same-cookie
Jason Dillaman [Fri, 30 Mar 2018 12:44:49 +0000 (08:44 -0400)]
Merge pull request #20868 from shun-s/fix-same-cookie

librbd: fix refuse to release lock when cookie is the same at rewatch

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20935 from trociny/wip-get-name
Jason Dillaman [Fri, 30 Mar 2018 12:44:28 +0000 (08:44 -0400)]
Merge pull request #20935 from trociny/wip-get-name

librbd: add API function to get image name

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoos/bluestore: change the type of aio_t:res to long 21136/head
kungf [Fri, 30 Mar 2018 12:15:42 +0000 (20:15 +0800)]
os/bluestore: change the type of aio_t:res to long

io_event::res was assigned to io_t::rval, but io_event::res
is long, if rval is int, this will cause overflow.

Fixes: http://tracker.ceph.com/issues/23527
Signed-off-by: kungf <yang.wang@easystack.cn>
7 years agoMerge pull request #21117 from smithfarm/wip-23504
Kefu Chai [Fri, 30 Mar 2018 01:45:44 +0000 (09:45 +0800)]
Merge pull request #21117 from smithfarm/wip-23504

tests: remove TestPGLog ASSERT_DEATH test

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #20927 into master
Patrick Donnelly [Thu, 29 Mar 2018 21:03:36 +0000 (14:03 -0700)]
Merge PR #20927 into master

* refs/pull/20927/head:
doc: use actual entity address for clarity
doc: make minor grammatical rectifications

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21131 from trociny/wip-23502
Jason Dillaman [Thu, 29 Mar 2018 19:45:07 +0000 (15:45 -0400)]
Merge pull request #21131 from trociny/wip-23502

qa/suites/rbd: set qemu task time_wait param

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd/OSD: make dout in _check_full conditional 20298/head
Mark Nelson [Thu, 29 Mar 2018 17:47:19 +0000 (12:47 -0500)]
osd/OSD: make dout in _check_full conditional

Signed-off-by: Mark Nelson <mnelson@redhat.com>
7 years agoMerge PR #20983 into master
Patrick Donnelly [Thu, 29 Mar 2018 16:47:59 +0000 (09:47 -0700)]
Merge PR #20983 into master

* refs/pull/20983/head:
ceph_authtool: add mode option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoceph_authtool: add mode option 20983/head
Sébastien Han [Fri, 23 Jun 2017 13:45:57 +0000 (15:45 +0200)]
ceph_authtool: add mode option

We now have the ability to set the keyring file mode with the help of
'--mode MODE'. The mode needs to be specified in octal using the format:
0600.

Closes: http://tracker.ceph.com/issues/23513
Signed-off-by: Sébastien Han <seb@redhat.com>
7 years agoqa/suites/rbd: set qemu task time_wait param 21131/head
Mykola Golub [Thu, 29 Mar 2018 11:10:58 +0000 (14:10 +0300)]
qa/suites/rbd: set qemu task time_wait param

so workloads qemu_dynamic_features.sh and qemu_rebuild_object_map.sh,
which check if qemu is finished with periodicity 60 sec, have enough
time to detect this before the rbd image is removed.

Fixes: https://tracker.ceph.com/issues/23502
Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoqa/tasks/qemu: add a parameter to wait for workloads detect qemu finished
Mykola Golub [Thu, 29 Mar 2018 11:06:13 +0000 (14:06 +0300)]
qa/tasks/qemu: add a parameter to wait for workloads detect qemu finished

In the case when a workload needs to detect qemu finished by running a
check with a periodicity of N sec it needs to set time_wait to 2 * N
in order to avoid races on finish.

Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agotest:qa:infra - teuthology crontab items as of 3/27/18 21075/head
Yuri Weinstein [Sun, 25 Mar 2018 00:42:36 +0000 (17:42 -0700)]
test:qa:infra - teuthology crontab items as of 3/27/18

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #21121 from tchaikov/wip-no-relicensing
Kefu Chai [Thu, 29 Mar 2018 13:21:49 +0000 (21:21 +0800)]
Merge pull request #21121 from tchaikov/wip-no-relicensing

msg/async/dpdk: remove xsky copyright and LGPL copying

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #21105 from ashitakasam/wip-bug
Casey Bodley [Thu, 29 Mar 2018 13:19:22 +0000 (09:19 -0400)]
Merge pull request #21105 from ashitakasam/wip-bug

rgw: comparison between signed and unsigned integer expressions

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21074 from trociny/wip-librados_test_stub-append
Jason Dillaman [Thu, 29 Mar 2018 12:18:32 +0000 (08:18 -0400)]
Merge pull request #21074 from trociny/wip-librados_test_stub-append

test/librados_test_stub: always create copy of buffers passed to operation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #21116 from trociny/wip-23499
Jason Dillaman [Thu, 29 Mar 2018 12:17:51 +0000 (08:17 -0400)]
Merge pull request #21116 from trociny/wip-23499

qa/workunits/rbd: remove sanity check in test_admin_socket.sh

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agomsg/async/dpdk: remove xsky copyright and LGPL copying 21121/head
Kefu Chai [Thu, 29 Mar 2018 11:33:44 +0000 (19:33 +0800)]
msg/async/dpdk: remove xsky copyright and LGPL copying

it's not legitimate to relicense source code without original author's
permission. some of the source files are copied from seastar project
with minor changes. so xsky cannot claim the copyright of them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21107 from tchaikov/wip-pg-stat-cap-trimq
Kefu Chai [Thu, 29 Mar 2018 10:54:56 +0000 (18:54 +0800)]
Merge pull request #21107 from tchaikov/wip-pg-stat-cap-trimq

osd: cap snaptrimq_len at 2^32

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #21106 from tchaikov/wip-compressor-zstd
Kefu Chai [Thu, 29 Mar 2018 10:54:22 +0000 (18:54 +0800)]
Merge pull request #21106 from tchaikov/wip-compressor-zstd

compressor: add zstd back

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #21097 from ceph/wip-ifed-fix-reclaim-cap-bug
Kefu Chai [Thu, 29 Mar 2018 10:53:07 +0000 (18:53 +0800)]
Merge pull request #21097 from ceph/wip-ifed-fix-reclaim-cap-bug

os/bluestore: fix broken cap in _balance_bluefs_freespace()

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20556 from yanghonggang/master
Kefu Chai [Thu, 29 Mar 2018 10:44:39 +0000 (18:44 +0800)]
Merge pull request #20556 from yanghonggang/master

lttng: Trace rgw data transfer, bi entry and object header update processes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agotests: remove TestPGLog ASSERT_DEATH test 21117/head
Nathan Cutler [Thu, 29 Mar 2018 09:40:09 +0000 (11:40 +0200)]
tests: remove TestPGLog ASSERT_DEATH test

Fixes: http://tracker.ceph.com/issues/23504
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoqa/workunits/rbd: remove sanity check in test_admin_socket.sh 21116/head
Mykola Golub [Thu, 29 Mar 2018 09:29:40 +0000 (12:29 +0300)]
qa/workunits/rbd: remove sanity check in test_admin_socket.sh

Fixes: https://tracker.ceph.com/issues/23499
Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoosd: cap snaptrimq_len at 2^32 21107/head
Kefu Chai [Thu, 29 Mar 2018 01:38:29 +0000 (09:38 +0800)]
osd: cap snaptrimq_len at 2^32

(uint64_t)(1 << 31) evaluates to 0xffffffff80000000 instead of 0x80000000,
because the converted signed number is sign-extended.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21104 from neha-ojha/wip-minimal-perf-suite
Neha Ojha [Thu, 29 Mar 2018 03:31:30 +0000 (20:31 -0700)]
Merge pull request #21104 from neha-ojha/wip-minimal-perf-suite

qa/suites: add minimal performance suite

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Varada Kari <varada.kari@gmail.com>
7 years agoMerge pull request #21092 from runsisi/wip-osdmon-log
Kefu Chai [Thu, 29 Mar 2018 01:06:57 +0000 (09:06 +0800)]
Merge pull request #21092 from runsisi/wip-osdmon-log

mon/OSDMonitor: logging non-active osd id when handling osd beacon

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #21091 from runsisi/wip-elector-cleanup
Kefu Chai [Thu, 29 Mar 2018 01:06:25 +0000 (09:06 +0800)]
Merge pull request #21091 from runsisi/wip-elector-cleanup

mon/Elector: remove unused member fields start_stamp and ack_stamp

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21085 from xiexingguo/wip-kill-p2-macros
Kefu Chai [Thu, 29 Mar 2018 01:05:47 +0000 (09:05 +0800)]
Merge pull request #21085 from xiexingguo/wip-kill-p2-macros

intarith: get rid of  P2* and ROUND_UP* macros

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21082 from zhsj/fix-java9
Kefu Chai [Thu, 29 Mar 2018 01:04:42 +0000 (09:04 +0800)]
Merge pull request #21082 from zhsj/fix-java9

cmake: bump target jdk to 1.7

Reviewed-by: Wido den Hollander <wido@42on.com>
7 years agoMerge pull request #21062 from xiexingguo/wip-hobject-cmp
Kefu Chai [Thu, 29 Mar 2018 01:04:02 +0000 (09:04 +0800)]
Merge pull request #21062 from xiexingguo/wip-hobject-cmp

common/hobject: compare two objects' key directly

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20862 from wido/ipv6-local-address
Kefu Chai [Thu, 29 Mar 2018 00:59:09 +0000 (08:59 +0800)]
Merge pull request #20862 from wido/ipv6-local-address

common/ipaddr: Do not select link-local IPv6 addresses

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21081 from majianpeng/rbd-remove-unused-func
Kefu Chai [Thu, 29 Mar 2018 00:58:27 +0000 (08:58 +0800)]
Merge pull request #21081 from majianpeng/rbd-remove-unused-func

osdc: remove unused function.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agocompressor: add zstd back 21106/head
Kefu Chai [Thu, 29 Mar 2018 00:54:29 +0000 (08:54 +0800)]
compressor: add zstd back

it's a regression introduced by 16c3552a

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorgw: comparison between signed and unsigned integer expressions 21105/head
ashitakasam [Thu, 29 Mar 2018 00:30:13 +0000 (08:30 +0800)]
rgw: comparison between signed and unsigned integer expressions

Fixes: Change the data type of 'c' from int to size_t in
src/rgw/rgw_civetweb.cc RGWCivetWeb::read_data

Signed-off-by: ashitakasam <694240887@qq.com>
7 years agoqa/suites: add minimal performance suite 21104/head
Neha Ojha [Wed, 28 Mar 2018 20:43:28 +0000 (13:43 -0700)]
qa/suites: add minimal performance suite

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge pull request #20040 from liewegas/wip-snapmapper
Kefu Chai [Thu, 29 Mar 2018 00:29:19 +0000 (08:29 +0800)]
Merge pull request #20040 from liewegas/wip-snapmapper

osd: make snapmapper warn+clean up instead of assert

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agopybind/cephfs: added comments to cephfs.pyx 21096/head
Pavani Rajula [Wed, 28 Mar 2018 11:55:47 +0000 (17:25 +0530)]
pybind/cephfs: added comments to cephfs.pyx
Signed-off-by: Pavani Rajula<rpavani1998@gmail.com>
7 years agoos/bluestore: fix broken cap in _balance_bluefs_freespace() 21097/head
Igor Fedotov [Wed, 28 Mar 2018 12:55:48 +0000 (15:55 +0300)]
os/bluestore: fix broken cap in _balance_bluefs_freespace()

1 << 31 is cast to signed int that results in huge value when casting to
uint64_t making min() call ineffective.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #21071 from mkoderer/vstart-fix
Kefu Chai [Wed, 28 Mar 2018 12:31:43 +0000 (20:31 +0800)]
Merge pull request #21071 from mkoderer/vstart-fix

vstart.sh: Fix help text in vstart.sh

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20961 from smithfarm/wip-dashboard-rst
Lenz Grimmer [Wed, 28 Mar 2018 12:31:25 +0000 (14:31 +0200)]
Merge pull request #20961 from smithfarm/wip-dashboard-rst

doc: mgr/dashboard.rst: mention ceph.conf and ceph mgr services

Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoosdc: remove unused function. 21081/head
Jianpeng Ma [Wed, 28 Mar 2018 12:17:12 +0000 (20:17 +0800)]
osdc: remove unused function.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agovstart.sh: Fix help text 21071/head
Marc Koderer [Tue, 27 Mar 2018 15:38:14 +0000 (17:38 +0200)]
vstart.sh: Fix help text

Signed-off-by: Marc Koderer <marc.koderer@sap.com>
7 years agoMerge pull request #21077 from Ashid6/master
Kefu Chai [Wed, 28 Mar 2018 11:04:29 +0000 (19:04 +0800)]
Merge pull request #21077 from Ashid6/master

doc: typo fix

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20660 from Leeshine/wip-mon-op-tracker
Kefu Chai [Wed, 28 Mar 2018 11:02:35 +0000 (19:02 +0800)]
Merge pull request #20660 from Leeshine/wip-mon-op-tracker

mon,mgr: make  osd_metric more popular and report slow ops to mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21057 from tchaikov/wip-22114
Kefu Chai [Wed, 28 Mar 2018 11:01:58 +0000 (19:01 +0800)]
Merge pull request #21057 from tchaikov/wip-22114

mon: mark mgr reports as no_reply

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
7 years agodoc: typo fix 21077/head
Ashita Dashottar [Tue, 27 Mar 2018 22:42:33 +0000 (04:12 +0530)]
doc: typo fix

Signed-off-by: Ashita Dashottar <AshitaDashottar6@gmail.com>
7 years agocmake: bump target jdk to 1.7 21082/head
Shengjing Zhu [Wed, 28 Mar 2018 04:54:31 +0000 (12:54 +0800)]
cmake: bump target jdk to 1.7

jdk 1.7 was released on 2011. For CentOS 6/7, both have openjdk
1.8. For Debian 8(jessie), Ubuntu 14.04(trusty) have openjdk 1.7.
These are the oldest distributions officially built for during
luminous release.

Since jdk 1.9/9, the minimal supported version is 1.6/6.
jdk 1.0/10(recently released) only supports 1.7/7.
http://openjdk.java.net/jeps/182

Fixes: http://tracker.ceph.com/issues/23458
Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>
7 years agodoc: mgr/dashboard.rst: adjust TCP port wording 20961/head
Nathan Cutler [Wed, 28 Mar 2018 09:01:03 +0000 (11:01 +0200)]
doc: mgr/dashboard.rst: adjust TCP port wording

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agomon/OSDMonitor: logging non-active osd id when handling osd beacon 21092/head
runsisi [Wed, 28 Mar 2018 08:52:58 +0000 (16:52 +0800)]
mon/OSDMonitor: logging non-active osd id when handling osd beacon

Signed-off-by: runsisi <runsisi@zte.com.cn>
7 years agoMerge pull request #20976 from sebastian-philipp/dashboard-restcontroller-default-get
Ricardo Dias [Wed, 28 Mar 2018 07:37:04 +0000 (08:37 +0100)]
Merge pull request #20976 from sebastian-philipp/dashboard-restcontroller-default-get

mgr/dashboard: Fix objects named `default` are inaccessible

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
7 years agoMerge pull request #20870 from rjfd/wip-dashboard-tasks
Ricardo Dias [Wed, 28 Mar 2018 07:27:51 +0000 (08:27 +0100)]
Merge pull request #20870 from rjfd/wip-dashboard-tasks

mgr/dashboard: asynchronous task support

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20884 from zouaiguo/wip_for_mgr_rbd_info
Ricardo Dias [Wed, 28 Mar 2018 07:22:52 +0000 (08:22 +0100)]
Merge pull request #20884 from zouaiguo/wip_for_mgr_rbd_info

mgr/dashboard: add image id to mgr rbd info instead of block_name_prefix

Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agointarith: get rid of ROUND_UP* macros 21085/head
xie xingguo [Wed, 28 Mar 2018 06:19:49 +0000 (14:19 +0800)]
intarith: get rid of ROUND_UP* macros

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agointarith: kill P2* macros
xie xingguo [Wed, 28 Mar 2018 06:08:16 +0000 (14:08 +0800)]
intarith: kill P2* macros

These macros are originally introduced in https://github.com/ceph/ceph/pull/10128
and get replaced by https://github.com/ceph/ceph/pull/19913.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agomon/Elector: remove unused member fields start_stamp and ack_stamp 21091/head
runsisi [Wed, 28 Mar 2018 03:32:18 +0000 (11:32 +0800)]
mon/Elector: remove unused member fields start_stamp and ack_stamp

Signed-off-by: runsisi <runsisi@zte.com.cn>
7 years agomgr: summarize mon metrics in MMgrReport and sent it 20660/head
lvshanchun [Tue, 13 Mar 2018 06:43:22 +0000 (14:43 +0800)]
mgr: summarize mon metrics in MMgrReport and sent it

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
7 years agomon: send health_metrics to mgr
lvshanchun [Tue, 13 Mar 2018 06:42:17 +0000 (14:42 +0800)]
mon: send health_metrics to mgr

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
7 years agomgr,osd: make osd_metric more popular
lvshanchun [Tue, 13 Mar 2018 06:41:14 +0000 (14:41 +0800)]
mgr,osd: make osd_metric more popular

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
7 years agomon: add admin command to dump historic/slow ops
lvshanchun [Tue, 13 Mar 2018 06:37:31 +0000 (14:37 +0800)]
mon: add admin command to dump historic/slow ops

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
7 years ago[mgr/dashboard] add image id to rbd info instead of block_name_prefix 20884/head
zouaiguo [Tue, 13 Mar 2018 09:30:16 +0000 (17:30 +0800)]
[mgr/dashboard] add image id to rbd info instead of block_name_prefix

when create images use data_pool parameter, such as:
rbd create -p pool1 -s 1G --data-pool pool2  image1

then get image info from mgr use request http://192.7.7.36:7000/rbd_pool_data/pool1
we got the response:
[{"parent_name": "", "parent_pool": 18446744073709551615, "name": "image1", "num_objs": 256, "block_name_prefix": "rbd_data.14.f561643c986", "obj_size": 4194304, "features": 189, "features_name": "fast-diff, layering, exclusive-lock, deep-flatten, object-map, data-pool", "order": 22, "size": 1073741824}]

notice:
since block_name_prefix is deprecated,
from block_name_prefix we can not get image id(the real id is ''f561643c9869')
we need add image id to rbd info instead block_name_prefix

Python 2.7.5 (default, Jun 17 2014, 18:11:42)
[GCC 4.8.2 20140120 (Red Hat 4.8.2-16)] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import rados
>>> import rbd
>>> RADOS_NAME = 'client.admin'
>>> cluster_name="ceph"
>>> cluster_handle = rados.Rados(name=RADOS_NAME, clustername=cluster_name, conffile='')
>>> cluster_handle.connect()
>>> ioctx = cluster_handle.open_ioctx("pool1")
>>> image_inst = rbd.Image(ioctx, "image1")
>>> image_inst.stat()
{'parent_name': '', 'parent_pool': 18446744073709551615L, 'num_objs': 256L, 'block_name_prefix': u'rbd_data.14.f561643c986', 'obj_size': 4194304L, 'order': 22, 'size': 1073741824L}
>>> image_inst.id()
u'f561643c9869'

after fix:

[root@tfg36 site-packages]# curl http://192.7.7.36:7000/rbd_pool_data/pool1
[{"parent_name": "", "parent_pool": 18446744073709551615, "name": "image1", "num_objs": 256, "block_name_prefix": "rbd_data.14.f561643c986", "obj_size": 4194304, "features": 189, "id": "f561643c9869", "features_name": "fast-diff, layering, exclusive-lock, deep-flatten, object-map, data-pool", "order": 22, "size": 1073741824}]

Signed-off-by: zouaiguo <zou.aiguo@zte.com.cn>
7 years agoMerge pull request #21064 from Songweibin/wip-spell-error
Kefu Chai [Wed, 28 Mar 2018 02:03:05 +0000 (10:03 +0800)]
Merge pull request #21064 from Songweibin/wip-spell-error

osd: correct several spell errors in comments

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21051 from neha-ojha/wip-doc-async-recovery
Josh Durgin [Wed, 28 Mar 2018 00:55:20 +0000 (17:55 -0700)]
Merge pull request #21051 from neha-ojha/wip-doc-async-recovery

doc: dev description of async recovery

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21023 from Liuchang0812/delete-asok-directories
Kefu Chai [Wed, 28 Mar 2018 00:38:50 +0000 (08:38 +0800)]
Merge pull request #21023 from Liuchang0812/delete-asok-directories

test: delete asok directories correctly

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21052 from zhsj/fix-distro-detect-test
Kefu Chai [Wed, 28 Mar 2018 00:30:06 +0000 (08:30 +0800)]
Merge pull request #21052 from zhsj/fix-distro-detect-test

test: remove distro_version assert in distro detect test

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agodoc: dev description of async recovery 21051/head
Neha Ojha [Mon, 26 Mar 2018 22:08:12 +0000 (15:08 -0700)]
doc: dev description of async recovery

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge PR #20798 into master
Patrick Donnelly [Tue, 27 Mar 2018 21:54:47 +0000 (14:54 -0700)]
Merge PR #20798 into master

* refs/pull/20798/head:
ceph-fuse: trim ceph-fuse -V output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20828 into master
Patrick Donnelly [Tue, 27 Mar 2018 21:54:40 +0000 (14:54 -0700)]
Merge PR #20828 into master

* refs/pull/20828/head:
client: cleanup ::_read return

Reviewed-by: Jeff Layton <jlayton@redhat.com>
7 years agoMerge PR #20854 into master
Patrick Donnelly [Tue, 27 Mar 2018 21:54:34 +0000 (14:54 -0700)]
Merge PR #20854 into master

* refs/pull/20854/head:
client: add ctime/btime to Inode dump

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agoMerge PR #20908 into master
Patrick Donnelly [Tue, 27 Mar 2018 21:54:27 +0000 (14:54 -0700)]
Merge PR #20908 into master

* refs/pull/20908/head:
ceph-fuse: Fix Segmentation fault --localize-reads

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20913 into master
Patrick Donnelly [Tue, 27 Mar 2018 21:54:21 +0000 (14:54 -0700)]
Merge PR #20913 into master

* refs/pull/20913/head:
client: add ceph_ll_sync_inode

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #20997 into master
Patrick Donnelly [Tue, 27 Mar 2018 21:54:15 +0000 (14:54 -0700)]
Merge PR #20997 into master

* refs/pull/20997/head:
client: fix Client::_read return

7 years agoMerge PR #21012 into master
Patrick Donnelly [Tue, 27 Mar 2018 21:46:56 +0000 (14:46 -0700)]
Merge PR #21012 into master

* refs/pull/21012/head:
Document the new '$' suite file

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agodoc: mgr/dashboard.rst: mgr initial modules can take a list
Nathan Cutler [Tue, 27 Mar 2018 19:42:43 +0000 (21:42 +0200)]
doc: mgr/dashboard.rst: mgr initial modules can take a list

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agodoc: mgr/dashboard.rst: mention ceph.conf and ceph mgr services
Nathan Cutler [Mon, 19 Mar 2018 13:21:14 +0000 (14:21 +0100)]
doc: mgr/dashboard.rst: mention ceph.conf and ceph mgr services

Also break down the "Configuration" section into three separate sub-sections
for clarity.

Signed-off-by: Nathan Cutler <ncutler@suse.com>