]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agomsg/msg_type: entity_addr_t: fix legacy decode 25934/head
Sage Weil [Wed, 16 Jan 2019 13:13:14 +0000 (07:13 -0600)]
msg/msg_type: entity_addr_t: fix legacy decode

If we decode a zeroed sockaddr, we should end up with a TYPE_NONE
entity_addr_t, not v1::/0.

This was obscured by unit test TestAddrvecEncodeAddrDecode3, which
took an addrvec with all v2 addrs, decoded to an addr variable that
previously had v1:1.2.3.4:/0, and asserted the result was not v1::/0.
The test passed before because the set_sockaddr() failed on AF_UNSPEC
and the addr kept v1:1.2.3.4, but with the previous commit it failed
because it equaled v1::/0.  In reality, addr should get - (addr TYPE_NONE).

The TestEmptyAddrvecEncodeAddrDecode test case is similarly adjusted.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: make set_sockaddr() work with AF_UNSPEC (i.e., zeroed)
Sage Weil [Tue, 15 Jan 2019 14:24:48 +0000 (08:24 -0600)]
msg/msg_types: make set_sockaddr() work with AF_UNSPEC (i.e., zeroed)

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/msg_types: make set_sockaddr() a bit more robust
Sage Weil [Tue, 15 Jan 2019 02:48:36 +0000 (20:48 -0600)]
msg/msg_types: make set_sockaddr() a bit more robust

We should keep the unused parts of u zeroed.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async: fix IP inference
Sage Weil [Sat, 12 Jan 2019 12:47:59 +0000 (06:47 -0600)]
msg/async: fix IP inference

socket_addr is *our* socket address; target_addr is the remote peer's
socket address.  We are inferring the remote's IP address here.

Fixes: http://tracker.ceph.com/issues/37882
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25273 into master
Sage Weil [Sat, 12 Jan 2019 11:56:41 +0000 (05:56 -0600)]
Merge PR #25273 into master

* refs/pull/25273/head:
doc/rados/operations/health-checks: Add LARGE_OMAP_OBJECTS

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25828 into master
Sage Weil [Sat, 12 Jan 2019 11:45:45 +0000 (05:45 -0600)]
Merge PR #25828 into master

* refs/pull/25828/head:
osd, mgr, mds: make timeout of updating rotating keys configurable

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25886 into master
Sage Weil [Sat, 12 Jan 2019 11:44:00 +0000 (05:44 -0600)]
Merge PR #25886 into master

* refs/pull/25886/head:
qa/tasks/rebuild_mondb: use monmap to properly name the mons
ceph-monstore-tool: add --monmap <path> argument to rebuild command
ceph-mon: dump monmap to debug logs
Revert "mon/MonMap: no noname- mon name prefix when for_mkfs"
mon/MonMap: improve/fix initial monmap generation for mkfs
ceph-mon: make membership check with public_addr more robust
ceph-mon: make mkfs check whether I am in monmap more robust

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #25806 into master
Sage Weil [Sat, 12 Jan 2019 11:13:32 +0000 (05:13 -0600)]
Merge PR #25806 into master

* refs/pull/25806/head:
mgr: diskprediction_cloud Add nvme devcie support

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25662 from yangdongsheng/abort_on_full
Ilya Dryomov [Sat, 12 Jan 2019 09:29:56 +0000 (10:29 +0100)]
Merge pull request #25662 from yangdongsheng/abort_on_full

rbd: introduce abort_on_full option for rbd map

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
6 years agorbd: introduce abort_on_full option for rbd map 25662/head
Dongsheng Yang [Wed, 19 Dec 2018 08:16:35 +0000 (03:16 -0500)]
rbd: introduce abort_on_full option for rbd map

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
6 years agodoc/rados/operations/health-checks: Add LARGE_OMAP_OBJECTS 25273/head
Brad Hubbard [Tue, 27 Nov 2018 03:50:24 +0000 (13:50 +1000)]
doc/rados/operations/health-checks: Add LARGE_OMAP_OBJECTS

Document LARGE_OMAP_OBJECTS health check

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
6 years agoMerge pull request #25924 from neha-ojha/wip-fix-scrub-doc
Neha Ojha [Fri, 11 Jan 2019 23:05:02 +0000 (15:05 -0800)]
Merge pull request #25924 from neha-ojha/wip-fix-scrub-doc

doc/rados/configuration: add osd scrub {begin,end} week day

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoqa/tasks/rebuild_mondb: use monmap to properly name the mons 25886/head
Sage Weil [Wed, 9 Jan 2019 22:05:40 +0000 (16:05 -0600)]
qa/tasks/rebuild_mondb: use monmap to properly name the mons

We used to rely on the monmap bootstrap code to magically create a valid
monmap with named mons because our old-style ceph.conf had mon_addr
values in each mon.foo section.  Instead, just feed it a real monmap
from pre-destruction.

In practice, a user can manually generate this monmap, or rename the
mons after the fact with --inject-monmap, or whatever.  Out of scope
for this test, so we just do the simplest thing to make the rebuild test
work.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-monstore-tool: add --monmap <path> argument to rebuild command
Sage Weil [Thu, 10 Jan 2019 17:01:19 +0000 (11:01 -0600)]
ceph-monstore-tool: add --monmap <path> argument to rebuild command

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-mon: dump monmap to debug logs
Sage Weil [Wed, 9 Jan 2019 16:11:39 +0000 (10:11 -0600)]
ceph-mon: dump monmap to debug logs

Verbosely during mkfs, at level 10 on normal startup.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/rados/configuration: add osd scrub {begin,end} week day 25924/head
Neha Ojha [Fri, 11 Jan 2019 20:55:51 +0000 (12:55 -0800)]
doc/rados/configuration: add osd scrub {begin,end} week day

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #24427 from thmour/thmour_api_purge
Jason Dillaman [Fri, 11 Jan 2019 19:43:08 +0000 (14:43 -0500)]
Merge pull request #24427 from thmour/thmour_api_purge

librbd: add trash purge api calls

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25908 from trociny/wip-dperf-bytes
Jason Dillaman [Fri, 11 Jan 2019 19:42:40 +0000 (14:42 -0500)]
Merge pull request #25908 from trociny/wip-dperf-bytes

mgr: change 'bytes' dynamic perf counters to COUNTER type

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25887 from neha-ojha/wip-hide-flag
Neha Ojha [Fri, 11 Jan 2019 17:21:50 +0000 (09:21 -0800)]
Merge pull request #25887 from neha-ojha/wip-hide-flag

include/rados.h: hide CEPH_OSDMAP_PGLOG_HARDLIMIT from ceph -s

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
6 years agolibrbd: tweaked trash purge API 24427/head
Jason Dillaman [Thu, 10 Jan 2019 14:43:25 +0000 (09:43 -0500)]
librbd: tweaked trash purge API

Removed the internal usage of the public librbd API, avoided double-opening
image to determine data pool, and fixed issues with the unit test case.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agocls/rbd: reduce erroneous error messages when omap keys don't exist
Jason Dillaman [Thu, 10 Jan 2019 14:26:52 +0000 (09:26 -0500)]
cls/rbd: reduce erroneous error messages when omap keys don't exist

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agotest/librbd: fix librbrd test relative to trash purge
Julien Collet [Thu, 1 Nov 2018 09:02:40 +0000 (10:02 +0100)]
test/librbd: fix librbrd test relative to trash purge

Signed-off-by: Julien Collet <julien.collet@cern.ch>
6 years agolibrbd: add trash purge api calls
Theofilos Mouratidis [Wed, 3 Oct 2018 11:42:26 +0000 (13:42 +0200)]
librbd: add trash purge api calls

Add trash purge api calls and fix the docs of some other rbd trash functions

Signed-off-by: Theofilos Mouratidis <mtheofilos@gmail.com>
6 years agoMerge pull request #25529 from Songweibin/wip-fix-rbd-migration
Jason Dillaman [Fri, 11 Jan 2019 14:03:58 +0000 (09:03 -0500)]
Merge pull request #25529 from Songweibin/wip-fix-rbd-migration

librbd: disallow trash restoring when image being migrated

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25765 from Songweibin/wip-fix-migrate-parent
Jason Dillaman [Fri, 11 Jan 2019 14:03:39 +0000 (09:03 -0500)]
Merge pull request #25765 from Songweibin/wip-fix-migrate-parent

librbd/api: misc fix migration

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25834 from trociny/wip-21392
Jason Dillaman [Fri, 11 Jan 2019 14:02:19 +0000 (09:02 -0500)]
Merge pull request #25834 from trociny/wip-21392

rbd-mirror: create and export replication perf counters to mgr

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25896 from trociny/wip-37861
Jason Dillaman [Fri, 11 Jan 2019 14:01:49 +0000 (09:01 -0500)]
Merge pull request #25896 from trociny/wip-37861

rbd: fix delay time calculation for trash move

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25656 from tspmelo/wip-npm-update
Lenz Grimmer [Fri, 11 Jan 2019 13:11:36 +0000 (14:11 +0100)]
Merge pull request #25656 from tspmelo/wip-npm-update

mgr/dashboard: Update npm packages

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #25883 from dillaman/wip-37745
Mykola Golub [Fri, 11 Jan 2019 11:30:40 +0000 (13:30 +0200)]
Merge pull request #25883 from dillaman/wip-37745

librbd: keep access/modified timestamp updates out of IO path

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #25894 from Devp00l/wip-kv-table-update
Lenz Grimmer [Fri, 11 Jan 2019 09:29:39 +0000 (10:29 +0100)]
Merge pull request #25894 from Devp00l/wip-kv-table-update

mgr/dashboard: Hide empty fields and render all objects in KV-table

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agomgr: change 'bytes' dynamic perf counters to COUNTER type 25908/head
Mykola Golub [Fri, 11 Jan 2019 09:13:45 +0000 (09:13 +0000)]
mgr: change 'bytes' dynamic perf counters to COUNTER type

(so they are of the same type as in static perf)

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agomgr/dashboard: Render all objects in KV-table 25894/head
Stephan Müller [Thu, 10 Jan 2019 13:58:39 +0000 (14:58 +0100)]
mgr/dashboard: Render all objects in KV-table

The problem was that the key value table didn't render all objects in
the given object, even if 'renderObjects' was set to true.

For example you give it an object with 2 attributes each of them holds a
non empty object, this will result in a table data that is not fully
converted to key value objects, which will result as text '[Object
object]' in the table view.

Now every object will be rendered and the key value array will be sorted
by key.

Fixes: https://tracker.ceph.com/issues/37859
Signed-off-by: Stephan Müller <smueller@suse.com>
6 years agomgr/dashboard: Hide empty fields in KV-table
Stephan Müller [Thu, 10 Jan 2019 13:58:08 +0000 (14:58 +0100)]
mgr/dashboard: Hide empty fields in KV-table

It exends the key value table by the option to hide empty fields.

Fixes: https://tracker.ceph.com/issues/37860
Signed-off-by: Stephan Müller <smueller@suse.com>
6 years agoRevert "mon/MonMap: no noname- mon name prefix when for_mkfs"
Sage Weil [Wed, 9 Jan 2019 22:04:11 +0000 (16:04 -0600)]
Revert "mon/MonMap: no noname- mon name prefix when for_mkfs"

This reverts commit c078c810313ece647db6d9056c0eca5256a91a34.

# Conflicts:
# src/mon/MonMap.cc

The ceph_mon.cc bootstrap code expects a noname- prefix to identify which
unamed mons (i.e., generated from mon_host) in the initial monmap can be
taken over as itself.

At the same time, the mon recovery code needs a way to know how to name
the monitors.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/MonMap: improve/fix initial monmap generation for mkfs
Sage Weil [Wed, 9 Jan 2019 20:11:10 +0000 (14:11 -0600)]
mon/MonMap: improve/fix initial monmap generation for mkfs

The monmap generation from mon_host for mon mkfs was pretty much completely
broken.  Restructure the code.

Generally, prefer v2+v1 addrvecs, unless a specific addr type and/or
port is specified.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-mon: make membership check with public_addr more robust
Sage Weil [Tue, 8 Jan 2019 19:38:53 +0000 (13:38 -0600)]
ceph-mon: make membership check with public_addr more robust

If the public_addr has no port, we will check v1 and v2 addresses.
MonMap::contains() checks for *any* overlap/match, so we should find
ourselves.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph-mon: make mkfs check whether I am in monmap more robust
Sage Weil [Tue, 8 Jan 2019 19:36:18 +0000 (13:36 -0600)]
ceph-mon: make mkfs check whether I am in monmap more robust

If we have a local address, check for both v1 and v2 variants in the
monmap.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25755 into master
Sage Weil [Fri, 11 Jan 2019 00:12:47 +0000 (18:12 -0600)]
Merge PR #25755 into master

* refs/pull/25755/head:
msg/async/Protocol*: bump global_seq when retrying connection
msg/async/Protocol*: unregister con from accept vs mark_down race

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
6 years agoMerge PR #25840 into master
Sage Weil [Thu, 10 Jan 2019 23:20:10 +0000 (17:20 -0600)]
Merge PR #25840 into master

* refs/pull/25840/head:
qa/msgr: add async-v1only case

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #25792 into master
Sage Weil [Thu, 10 Jan 2019 22:50:38 +0000 (16:50 -0600)]
Merge PR #25792 into master

* refs/pull/25792/head:
common/numa: remove unused _mask variants
osd: support osd_numa_node, osd_numa_auto_affinity, osd_numa_prefer_iface
mon/OSDMonitor: add 'osd numa-status' command
osd: report numa node for network interface(s)
common/pick_address: get numa node info for a interface
os/bluestore: report numa node info for storage
os/bluestore/KernelDevice: report numa info for each device
os/bluestore: allow get_devices() to run without bluestore started
common/blkdev: query numa info
common/numa: cpu_set helpers and numa helpers
common/blkdev: drop debug statements

Reviewed-by: Mark Nelson <mnelson@redhat.com>
6 years agoMerge PR #25841 into master
Sage Weil [Thu, 10 Jan 2019 22:50:09 +0000 (16:50 -0600)]
Merge PR #25841 into master

* refs/pull/25841/head:
mon/MonClient: make mon hunt more aggressive

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #25827 into master
Sage Weil [Thu, 10 Jan 2019 22:29:10 +0000 (16:29 -0600)]
Merge PR #25827 into master

* refs/pull/25827/head:
test/cls_rgw: fix signed/unsigned warning
test/msgr/test_msgr: fix signed/unsigned warning
msg/Connection: protect peer_addrs with safe_item_history<>

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge pull request #25704 from tchaikov/wip-36737-unittest-log
Josh Durgin [Thu, 10 Jan 2019 21:33:57 +0000 (13:33 -0800)]
Merge pull request #25704 from tchaikov/wip-36737-unittest-log

test: write log file to current directory

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #25898 into master
Sage Weil [Thu, 10 Jan 2019 18:06:04 +0000 (12:06 -0600)]
Merge PR #25898 into master

* refs/pull/25898/head:
qa/tests: reduced nubmer of runs on 'ovh'

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoqa/tests: reduced nubmer of runs on 'ovh' 25898/head
Yuri Weinstein [Thu, 10 Jan 2019 16:50:43 +0000 (08:50 -0800)]
qa/tests: reduced nubmer of runs on 'ovh'

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge PR #25544 into master
Sage Weil [Thu, 10 Jan 2019 15:54:00 +0000 (09:54 -0600)]
Merge PR #25544 into master

* refs/pull/25544/head:
common/PriorityCache: Automatic chunk sizing

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agomsg/async/Protocol*: bump global_seq when retrying connection 25755/head
Sage Weil [Mon, 7 Jan 2019 14:34:18 +0000 (08:34 -0600)]
msg/async/Protocol*: bump global_seq when retrying connection

In the top connect retry in particular we do not bump connect_seq, so it
is critical that we bump global_seq so that the two connection attempts
are distinguishable at the peer.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25744 from cbodley/wip-test-rgw-reshard-wait
Casey Bodley [Thu, 10 Jan 2019 15:32:26 +0000 (10:32 -0500)]
Merge pull request #25744 from cbodley/wip-test-rgw-reshard-wait

test/rgw: add ifdef for HAVE_BOOST_CONTEXT

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agorbd: fix delay time calculation for trash move 25896/head
Mykola Golub [Thu, 10 Jan 2019 15:15:36 +0000 (15:15 +0000)]
rbd: fix delay time calculation for trash move

Fixes: https://tracker.ceph.com/issues/37861
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agolibrbd: keep access/modified timestamp updates out of IO path 25883/head
Jason Dillaman [Wed, 9 Jan 2019 19:46:49 +0000 (14:46 -0500)]
librbd: keep access/modified timestamp updates out of IO path

If the cache is enabled, it was possible for the timestamp updates
to cause race conditions with librbd clients (e.g. rbd export)
that had data corrupting effects since callbacks were expected to
be serialized.

Fixes: http://tracker.ceph.com/issues/37745
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25892 from theanalyst/doc-rgw-usage-fix
Casey Bodley [Thu, 10 Jan 2019 14:37:18 +0000 (09:37 -0500)]
Merge pull request #25892 from theanalyst/doc-rgw-usage-fix

doc: rgw: fix the default value of usage log setting

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agorbd-mirror: add aggregated replication perf counters 25834/head
Mykola Golub [Thu, 10 Jan 2019 10:09:31 +0000 (10:09 +0000)]
rbd-mirror: add aggregated replication perf counters

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agopybind/mgr/prometheus: export rbd-mirror metadata
Mykola Golub [Wed, 9 Jan 2019 09:27:59 +0000 (09:27 +0000)]
pybind/mgr/prometheus: export rbd-mirror metadata

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agopybind/mgr: add rbd-mirror to get_all_perf_counters by default
Mykola Golub [Tue, 8 Jan 2019 10:07:55 +0000 (10:07 +0000)]
pybind/mgr: add rbd-mirror to get_all_perf_counters by default

This effectively enables rbd-mirror stats for modules like prometheus or
influx.

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agopybind/mgr/diskprediction_cloud: only perfs for mon and osd needed
Mykola Golub [Tue, 8 Jan 2019 10:00:55 +0000 (10:00 +0000)]
pybind/mgr/diskprediction_cloud: only perfs for mon and osd needed

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agopybind/mgr: allow to specify services for get_all_perf_counters
Mykola Golub [Tue, 8 Jan 2019 09:58:53 +0000 (09:58 +0000)]
pybind/mgr: allow to specify services for get_all_perf_counters

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agorbd-mirror: create and export replication perf counters to mgr
Mykola Golub [Tue, 8 Jan 2019 09:43:15 +0000 (09:43 +0000)]
rbd-mirror: create and export replication perf counters to mgr

Fixes: https://tracker.ceph.com/issues/21392
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agodoc: rgw: fix the default value of usage log setting 25892/head
Abhishek Lekshmanan [Thu, 10 Jan 2019 10:10:41 +0000 (11:10 +0100)]
doc: rgw: fix the default value of usage log setting

Fixes: http://tracker.ceph.com/issues/37856
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #25769 from votdev/navbar_focus_color
Lenz Grimmer [Thu, 10 Jan 2019 10:01:21 +0000 (11:01 +0100)]
Merge pull request #25769 from votdev/navbar_focus_color

mgr/dashboard: Fix navbar focused color

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Neha Gupta <gnehapk@gmail.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #25791 from rhcs-dashboard/36740-pool-stats-read-write-columns
Lenz Grimmer [Thu, 10 Jan 2019 08:58:05 +0000 (09:58 +0100)]
Merge pull request #25791 from rhcs-dashboard/36740-pool-stats-read-write-columns

mgr/dashboard: add columns to Pools table

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #25839 from tchaikov/wip-37773
Sebastian Wagner [Thu, 10 Jan 2019 08:29:11 +0000 (09:29 +0100)]
Merge pull request #25839 from tchaikov/wip-37773

mgr/test_orchestrator: correct ceph-volume path

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoinclude/rados.h: hide CEPH_OSDMAP_PGLOG_HARDLIMIT from ceph -s 25887/head
Neha Ojha [Thu, 10 Jan 2019 02:12:17 +0000 (18:12 -0800)]
include/rados.h: hide CEPH_OSDMAP_PGLOG_HARDLIMIT from ceph -s

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years agomgr/dashboard: Update bootstrap to 3.4.0 25656/head
Tiago Melo [Wed, 9 Jan 2019 10:02:14 +0000 (09:02 -0100)]
mgr/dashboard: Update bootstrap to 3.4.0

Fixes: https://tracker.ceph.com/issues/37834
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Update npm packages
Tiago Melo [Thu, 20 Dec 2018 11:39:58 +0000 (10:39 -0100)]
mgr/dashboard: Update npm packages

Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agotest/journal: ReplayEntry::get_data is const
Mykola Golub [Tue, 8 Jan 2019 12:01:06 +0000 (12:01 +0000)]
test/journal: ReplayEntry::get_data is const

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #25816 from neha-ojha/wip-36686
Josh Durgin [Wed, 9 Jan 2019 21:17:30 +0000 (13:17 -0800)]
Merge pull request #25816 from neha-ojha/wip-36686

osd/mon: fix upgrades for pg log hard limit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25321 from votdev/fix_dict_changed_size
Alfredo Deza [Wed, 9 Jan 2019 18:29:54 +0000 (13:29 -0500)]
Merge pull request #25321 from votdev/fix_dict_changed_size

ceph-volume: Add unit test

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agopybind/mgr/dashboard: add modified messages.xlf 25816/head
Neha Ojha [Wed, 9 Jan 2019 18:17:35 +0000 (10:17 -0800)]
pybind/mgr/dashboard: add modified messages.xlf

This is to fix the make check failure in
mgr-dashboard-frontend-unittests.

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years agocommon/numa: remove unused _mask variants 25792/head
Sage Weil [Tue, 8 Jan 2019 15:54:04 +0000 (09:54 -0600)]
common/numa: remove unused _mask variants

These parse the 'local_cpus' file that has a hex bitmask, but I didn't end
up using them.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25863 from trociny/wip-rbd-mirror-mock-warnings
Jason Dillaman [Wed, 9 Jan 2019 15:04:47 +0000 (10:04 -0500)]
Merge pull request #25863 from trociny/wip-rbd-mirror-mock-warnings

 test/rbd_mirror: fix gmock warnings

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agomgr/test_orchestrator: correct ceph-volume path 25839/head
Kefu Chai [Tue, 8 Jan 2019 18:59:15 +0000 (02:59 +0800)]
mgr/test_orchestrator: correct ceph-volume path

s/ceph_volume/ceph-volume/

Fixes: http://tracker.ceph.com/issues/37773
Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #25860 from trociny/wip-prometheus-rbd_stats_pools
Jason Dillaman [Wed, 9 Jan 2019 13:49:17 +0000 (08:49 -0500)]
Merge pull request #25860 from trociny/wip-prometheus-rbd_stats_pools

pybind/mgr/prometheus: improve 'rbd_stats_pools' param parsing

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25300 from votdev/improve_rgw_user_list
Lenz Grimmer [Wed, 9 Jan 2019 13:40:21 +0000 (14:40 +0100)]
Merge pull request #25300 from votdev/improve_rgw_user_list

mgr/dashboard: Improve RgwUser controller

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #25634 from sebastian-philipp/doc-orchestrator-wal
Sebastian Wagner [Wed, 9 Jan 2019 13:39:37 +0000 (14:39 +0100)]
Merge pull request #25634 from sebastian-philipp/doc-orchestrator-wal

doc/mgr/orchestrator: add `wal` to blink lights

Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #25813 from rhcs-dashboard/updated-test-full-health
Lenz Grimmer [Wed, 9 Jan 2019 13:32:40 +0000 (14:32 +0100)]
Merge pull request #25813 from rhcs-dashboard/updated-test-full-health

mgr/dashboard: updated health API test

6 years agoMerge pull request #25743 from trociny/wip-37541
Jason Dillaman [Wed, 9 Jan 2019 13:31:36 +0000 (08:31 -0500)]
Merge pull request #25743 from trociny/wip-37541

 journal: set max journal order to 26

6 years agoMerge pull request #25789 from trociny/wip-36038
Jason Dillaman [Wed, 9 Jan 2019 13:30:55 +0000 (08:30 -0500)]
Merge pull request #25789 from trociny/wip-36038

rbd_mirror: don't report error if image replay canceled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25832 from trociny/wip-37729-1
Jason Dillaman [Wed, 9 Jan 2019 13:30:12 +0000 (08:30 -0500)]
Merge pull request #25832 from trociny/wip-37729-1

test/pybind/test_rbd: filter out unknown list_children2 keys

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25861 from tchaikov/wip-seastar-connect-fix
Kefu Chai [Wed, 9 Jan 2019 12:08:35 +0000 (20:08 +0800)]
Merge pull request #25861 from tchaikov/wip-seastar-connect-fix

seastar: pickup fix for segfault in POSIX stack

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agotest/rbd_mirror: expect service daemon update instance_id attribute 25863/head
Mykola Golub [Wed, 9 Jan 2019 11:52:00 +0000 (11:52 +0000)]
test/rbd_mirror: expect service daemon update instance_id attribute

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agotest/rbd_mirror: fix gmock warnings when running with debug
Mykola Golub [Wed, 9 Jan 2019 11:49:41 +0000 (11:49 +0000)]
test/rbd_mirror: fix gmock warnings when running with debug

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #25572 from nathan-weinberg/pools-tests
Lenz Grimmer [Wed, 9 Jan 2019 10:54:49 +0000 (11:54 +0100)]
Merge pull request #25572 from nathan-weinberg/pools-tests

mgr/dashboard: Added breadcrumb and tab tests to Pools menu

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agoseastar: pickup fix for segfault in POSIX stack 25861/head
Kefu Chai [Wed, 9 Jan 2019 09:57:30 +0000 (17:57 +0800)]
seastar: pickup fix for segfault in POSIX stack

see
https://github.com/scylladb/seastar/commit/5e399906d1efa9e5ca9d121d09c6d2b1cdc41404

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agopybind/mgr/prometheus: improve 'rbd_stats_pools' param parsing 25860/head
Mykola Golub [Wed, 9 Jan 2019 09:29:56 +0000 (09:29 +0000)]
pybind/mgr/prometheus: improve 'rbd_stats_pools' param parsing

re.split can still produce a list with empty string elements (e.g. if
'rbd_stats_pools' is just an empty string) and we want to filter out
those.

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agomgr/dashboard: add columns to Pools table 25791/head
alfonsomthd [Wed, 9 Jan 2019 07:58:54 +0000 (08:58 +0100)]
mgr/dashboard: add columns to Pools table

* Added columns:
Usage, Read bytes, Write bytes, Read ops, Write ops.

* TableKeyValueComponent:
Bugfix in method: _insertFlattenObjects

* Updated jest global mock:
Now window.getComputedStyle returns an object
that has getPropertyValue defined
(otherwise jest pool tests involving chart.js threw error). See:
https://developer.mozilla.org/en-US/docs/Web/API/Window/getComputedStyle

Fixes: https://tracker.ceph.com/issues/37717
Fixes: https://tracker.ceph.com/issues/34320
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
6 years agoosd, mgr, mds: make timeout of updating rotating keys configurable 25828/head
xie xingguo [Tue, 8 Jan 2019 05:30:11 +0000 (13:30 +0800)]
osd, mgr, mds: make timeout of updating rotating keys configurable

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #25621 into master
Patrick Donnelly [Tue, 8 Jan 2019 23:56:16 +0000 (15:56 -0800)]
Merge PR #25621 into master

* refs/pull/25621/head:
mds: allow boot on read-only
mds: setup readonly mode for PurgeQueue
mds: return string_view for type str
mds: add missing locks for PurgeQueue methods
mds: delete on_error context on des

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #24556 into master
Patrick Donnelly [Tue, 8 Jan 2019 23:10:28 +0000 (15:10 -0800)]
Merge PR #24556 into master

* refs/pull/24556/head:
tools/cephfs: make 'cephfs-data-scan scan_links' update snaptable
tools/cephfs: make 'cephfs-data-scan scan_links' update inotable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #25818 into master
Sage Weil [Tue, 8 Jan 2019 20:15:28 +0000 (14:15 -0600)]
Merge PR #25818 into master

* refs/pull/25818/head:
mon: adjust mon sync, extra_probe_peers to use addrvec

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agomon/MonClient: make mon hunt more aggressive 25841/head
Sage Weil [Tue, 8 Jan 2019 20:04:37 +0000 (14:04 -0600)]
mon/MonClient: make mon hunt more aggressive

With v2 and v1 addresses, it helps to be a bit more aggressive
searching for mons since the v1 or v2 ports may not be in use.

- try 3 parallel connection attempts, not 2
- increase the timeout interval more slowly

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/msgr: add async-v1only case 25840/head
Sage Weil [Tue, 8 Jan 2019 19:21:56 +0000 (13:21 -0600)]
qa/msgr: add async-v1only case

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon: adjust mon sync, extra_probe_peers to use addrvec 25818/head
Sage Weil [Mon, 7 Jan 2019 18:52:43 +0000 (12:52 -0600)]
mon: adjust mon sync, extra_probe_peers to use addrvec

The peer addr stuff via asok is a bit fragile because the user must
provide an exact addrvec matching the mon to avoid some weirdness, but
it's rarely used, and the fix would be some robustness/tolerance in the
messenger that is a bigger project than this.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #25823 into master
Sage Weil [Tue, 8 Jan 2019 19:05:11 +0000 (13:05 -0600)]
Merge PR #25823 into master

* refs/pull/25823/head:
msg/async/Protocol*: fix mark_down vs accept race

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoosd: support osd_numa_node, osd_numa_auto_affinity, osd_numa_prefer_iface
Sage Weil [Fri, 4 Jan 2019 18:11:04 +0000 (12:11 -0600)]
osd: support osd_numa_node, osd_numa_auto_affinity, osd_numa_prefer_iface

- osd_numa_node manually specifies a numa node.
- osd_numa_prefer_iface makes us prefer IPs in public_network that are
  on the same numa node as the storage
- osd_numa_auto_affinity will set affinity to a numa node when both the
  store and network(s) are on the same numa node.

These options are all flagged as 'startup', although osd_numa_node and
osd_numa_auto_affinity takes effect when the OSD is marked up, so doing
'ceph osd down ...' is sufficient to induce an update.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: add 'osd numa-status' command
Sage Weil [Fri, 4 Jan 2019 15:34:29 +0000 (09:34 -0600)]
mon/OSDMonitor: add 'osd numa-status' command

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd: report numa node for network interface(s)
Sage Weil [Fri, 4 Jan 2019 02:51:01 +0000 (20:51 -0600)]
osd: report numa node for network interface(s)

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/pick_address: get numa node info for a interface
Sage Weil [Fri, 4 Jan 2019 02:50:42 +0000 (20:50 -0600)]
common/pick_address: get numa node info for a interface

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25381 from cbodley/wip-qa-rgw-cls
Casey Bodley [Tue, 8 Jan 2019 18:05:11 +0000 (13:05 -0500)]
Merge pull request #25381 from cbodley/wip-qa-rgw-cls

qa/rgw: add cls_lock/log/refcount/version tests to verify suite

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #24027 from theanalyst/wip-civetweb-poll
Matt Benjamin [Tue, 8 Jan 2019 17:50:49 +0000 (12:50 -0500)]
Merge pull request #24027 from theanalyst/wip-civetweb-poll

rgw: civetweb: use poll instead of select while waiting on sockets

6 years agoMerge PR #25835 into master
Sage Weil [Tue, 8 Jan 2019 17:19:21 +0000 (11:19 -0600)]
Merge PR #25835 into master

* refs/pull/25835/head:
mgr/ServiceMap: print daemon addr in legacy format

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>