]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agodoc: Fix typo in ceph-fuse 22214/head
Jos Collin [Thu, 24 May 2018 11:57:02 +0000 (17:27 +0530)]
doc: Fix typo in ceph-fuse

Fixes: https://github.com/ceph/ceph/pull/21616#pullrequestreview-122923127
Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #21845 from tchaikov/wip-gcc-warnings
Kefu Chai [Tue, 8 May 2018 06:03:12 +0000 (14:03 +0800)]
Merge pull request #21845 from tchaikov/wip-gcc-warnings

mds,messages: silence -Wclass-memaccess warnings

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #21856 from tchaikov/wip-drop-dpdk-submodule
Kefu Chai [Tue, 8 May 2018 05:22:32 +0000 (13:22 +0800)]
Merge pull request #21856 from tchaikov/wip-drop-dpdk-submodule

dpdk: drop dpdk submodule

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
7 years agoMerge PR #21712 into master
Patrick Donnelly [Mon, 7 May 2018 22:53:32 +0000 (15:53 -0700)]
Merge PR #21712 into master

* refs/pull/21712/head:
qa/tasks/cephfs: add test for renewing stale session
client: invalidate caps and leases when session becomes stale
client: fix race in concurrent readdir

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21688 into master
Patrick Donnelly [Mon, 7 May 2018 22:43:45 +0000 (15:43 -0700)]
Merge PR #21688 into master

* refs/pull/21688/head:
client: change vxattr flags field to unsigned int

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21668 into master
Patrick Donnelly [Mon, 7 May 2018 22:43:34 +0000 (15:43 -0700)]
Merge PR #21668 into master

* refs/pull/21668/head:
mds: include nfiles/nsubdirs of directory inode in MClientCaps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21858 from yuriw/wip-yuriw-crontab
David Galloway [Mon, 7 May 2018 19:03:41 +0000 (15:03 -0400)]
Merge pull request #21858 from yuriw/wip-yuriw-crontab

qa/tests: fixed typo

7 years agoMerge pull request #21707 from cbodley/wip-qa-upgrade-ragweed
Casey Bodley [Mon, 7 May 2018 16:21:01 +0000 (12:21 -0400)]
Merge pull request #21707 from cbodley/wip-qa-upgrade-ragweed

qa/rgw: move ragweed upgrade test into upgrade/luminous-x

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21794 from rjfd/wip-dashboard-fix-awsauth
Volker Theile [Mon, 7 May 2018 15:28:46 +0000 (17:28 +0200)]
Merge pull request #21794 from rjfd/wip-dashboard-fix-awsauth

mgr/dashboard: awsauth: fix python3 string decode problem

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Lenz Grimmer <LGrimmer@suse.com>
7 years agodpdk: drop dpdk submodule 21856/head
Kefu Chai [Mon, 7 May 2018 14:31:51 +0000 (22:31 +0800)]
dpdk: drop dpdk submodule

we are using spdk/dpdk for async msgr's dpdk backend since 01a9f178. so
no need to keep dpdk submodule anymore.

Fixes: http://tracker.ceph.com/issues/24032
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/tests: fixed typo 21858/head
Yuri Weinstein [Mon, 7 May 2018 14:41:05 +0000 (07:41 -0700)]
qa/tests: fixed typo

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #21784 from votdev/fix_rgw_backend
Ricardo Marques [Mon, 7 May 2018 14:27:19 +0000 (15:27 +0100)]
Merge pull request #21784 from votdev/fix_rgw_backend

mgr/dashboard: Refactor RGW backend

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
7 years agoMerge pull request #21839 from yuriw/wip-yuriw-crontab
Sage Weil [Mon, 7 May 2018 11:32:58 +0000 (06:32 -0500)]
Merge pull request #21839 from yuriw/wip-yuriw-crontab

qa/test: Added rados, rbd and fs to run two time a week only

7 years agomgr/dashboard: Refactor RGW backend 21784/head
Volker Theile [Wed, 2 May 2018 15:33:24 +0000 (17:33 +0200)]
mgr/dashboard: Refactor RGW backend

- Do some polishing in the docs.
- Refactor RgwClient::is_service_online() method. The system is considered as online if the response structure is valid. The response content itself is not validated in this case.
- Relocate NoCredentialsException and derive it from RequestException.

Signed-off-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21673 from votdev/refactor_perf_counters
Ricardo Dias [Mon, 7 May 2018 09:12:04 +0000 (10:12 +0100)]
Merge pull request #21673 from votdev/refactor_perf_counters

mgr/dashboard: Refactor perf counters

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #21582 from jan--f/test-case-strtoll-hex
Kefu Chai [Mon, 7 May 2018 09:06:48 +0000 (17:06 +0800)]
Merge pull request #21582 from jan--f/test-case-strtoll-hex

test/strtol: add test case for parsing hex numbers

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotest: silence -Wformat-truncation= warnings 21845/head
Kefu Chai [Mon, 7 May 2018 07:19:37 +0000 (15:19 +0800)]
test: silence -Wformat-truncation= warnings

this change silences following warnings:

: warning: ‘%s’ directive output may be truncated writing up to 127
bytes into a region of size between 109 and 119 [-W
format-truncation=]
     snprintf(m_id_str, SysTestRunnable::ID_STR_SZ, "process_%d%s",
m_id, extra);
                                                    ^~~~~~~~~~~~~~
~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoauth: silence -Wparentheses warning
Kefu Chai [Mon, 7 May 2018 07:18:40 +0000 (15:18 +0800)]
auth: silence -Wparentheses warning

this change silences following warning:

warning: unnecessary parentheses in declaration of ‘os’ [-Wparentheses]
   std::ostringstream(os);
                     ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomds,messages: silence -Wclass-memaccess warnings
Kefu Chai [Mon, 7 May 2018 06:42:52 +0000 (14:42 +0800)]
mds,messages: silence -Wclass-memaccess warnings

this change silences warnings like:

warning: ‘void* memset(void*, int, size_t)’ writing to an object of
non-trivial type ‘struct uuid_d’; use assignment instead [-Wcla
ss-memaccess]
   memset(&z.cluster_fsid, 1, sizeof(z.cluster_fsid));
                                                    ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21748 from b-ranto/wip-fix-prom-shutdown
Kefu Chai [Mon, 7 May 2018 02:34:29 +0000 (10:34 +0800)]
Merge pull request #21748 from b-ranto/wip-fix-prom-shutdown

prometheus: Fix prometheus shutdown/restart

Reveiwed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #21793 from b-ranto/wip-expose-objects
Kefu Chai [Mon, 7 May 2018 02:33:03 +0000 (10:33 +0800)]
Merge pull request #21793 from b-ranto/wip-expose-objects

prometheus: Expose number of degraded/misplaced/unfound objects

Reveiwed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #21837 from tchaikov/wip-gcc-8
Kefu Chai [Mon, 7 May 2018 02:31:31 +0000 (10:31 +0800)]
Merge pull request #21837 from tchaikov/wip-gcc-8

cmake,common,filestore: silence gcc-8 warnings/errors

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoqa/test: Added rados, rbd and fs to run two time a week only 21839/head
Yuri Weinstein [Sun, 6 May 2018 21:00:25 +0000 (14:00 -0700)]
qa/test: Added rados, rbd and fs to run two time a week only

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #21827 from yuriw/wip-yuriw-crontab
Yuri Weinstein [Sun, 6 May 2018 20:36:34 +0000 (13:36 -0700)]
Merge pull request #21827 from yuriw/wip-yuriw-crontab

qa/tests: Added mimic runs, removed large suites (rados, rbd, etc) ru…

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoos/filestore: silence -Wformat-truncation= warning 21837/head
Kefu Chai [Sun, 6 May 2018 07:25:00 +0000 (15:25 +0800)]
os/filestore: silence -Wformat-truncation= warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoos/filestore: silence error from libstdc++ in gcc-8
Kefu Chai [Sun, 6 May 2018 06:52:06 +0000 (14:52 +0800)]
os/filestore: silence error from libstdc++ in gcc-8

this change silences following error

stl_tree.h:452:21: error: static assertion failed: comparison object
must be invocable with two arguments of key type
static_assert(__is_invocable<_Compare&, const _Key&, const _Key&>{},
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomessages,mon,osd: silence gcc-8 warnings related to memset()
Kefu Chai [Sun, 6 May 2018 06:39:38 +0000 (14:39 +0800)]
messages,mon,osd: silence gcc-8 warnings related to memset()

this silences warnings like:

warning: ‘void* memset(void*, int, size_t)’ writing to an object of
non-trivial type ‘struct uuid_d’; use assignment instead [-Wcl\
ass-memaccess]

uuid_d only contains boost::uuids::uuid, which is "nil" initialized in
uuid_d's ctor. so we don't need to bother with memset() it with 0.
the same applies to entity_inst_t.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocommon,filestore: silence GCC-8 warnings
Kefu Chai [Sun, 6 May 2018 06:39:18 +0000 (14:39 +0800)]
common,filestore: silence GCC-8 warnings

should catch polymorphic exceptions by reference. this silences warnings
like:

error: catching polymorphic type ‘class std::RetryException’ by value
[-Werror=catch-value=]
     } catch (std::RetryException) {

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: specify missing settings for dpdk
Kefu Chai [Sun, 6 May 2018 06:32:45 +0000 (14:32 +0800)]
cmake: specify missing settings for dpdk

* after upgrading to gcc-8, seems dpdk requires more settings to compile.
  in which, CONFIG_RTE_MAX_VFIO_GROUPS=64 is copied from config/common_base.
* librte_bus_pci.a depends on librte_pci.a, so reorder the libraries
  in DPDK_LIBRARIES.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21637 from ceph/wip-da-SCA-20180423
Kefu Chai [Sun, 6 May 2018 03:34:52 +0000 (11:34 +0800)]
Merge pull request #21637 from ceph/wip-da-SCA-20180423

misc: mark constructors as explicit

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19041 from dragonylffly/wip-list-objects-in-a-pg
Kefu Chai [Sun, 6 May 2018 03:33:47 +0000 (11:33 +0800)]
Merge pull request #19041 from dragonylffly/wip-list-objects-in-a-pg

tools/rados: allow list objects in a specific pg in a pool

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21765 from yunfeiguan/wip-23962
Kefu Chai [Sun, 6 May 2018 03:29:26 +0000 (11:29 +0800)]
Merge pull request #21765 from yunfeiguan/wip-23962

pybind/ceph_daemon: expand the order of magnitude of daemonperf statistics to ZB

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21815 from xiexingguo/wip-23921
Kefu Chai [Sun, 6 May 2018 03:25:36 +0000 (11:25 +0800)]
Merge pull request #21815 from xiexingguo/wip-23921

crush, osd: handle multiple parents properly when applying pg upmaps

Reviewed-by: huangjun <hjwsm1989@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21811 from tchaikov/wip-23627
Kefu Chai [Sat, 5 May 2018 11:02:25 +0000 (19:02 +0800)]
Merge pull request #21811 from tchaikov/wip-23627

librados: block MgrClient::start_command until mgrmap

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21790 from dalgaaf/SCA-override-specifier
Kefu Chai [Sat, 5 May 2018 10:59:25 +0000 (18:59 +0800)]
Merge pull request #21790 from dalgaaf/SCA-override-specifier

misc: mark functions with 'override' specifier

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21829 from tchaikov/wip-qa-cephfs-snap
Kefu Chai [Sat, 5 May 2018 10:39:59 +0000 (18:39 +0800)]
Merge pull request #21829 from tchaikov/wip-qa-cephfs-snap

qa: fix test on "ceph fs set cephfs allow_new_snaps"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoqa: fix test on "ceph fs set cephfs allow_new_snaps" 21829/head
Kefu Chai [Sat, 5 May 2018 01:38:29 +0000 (09:38 +0800)]
qa: fix test on "ceph fs set cephfs allow_new_snaps"

snapshot is now enabled for new fs in 81d0554e, so this test should be
updated accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/tests: Added mimic runs, removed large suites (rados, rbd, etc) runs on luminous 21827/head
Yuri Weinstein [Fri, 4 May 2018 20:05:27 +0000 (13:05 -0700)]
qa/tests: Added mimic runs, removed large suites (rados, rbd, etc) runs on luminous

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #21816 from xiexingguo/wip-wrong-unregister-pg
Sage Weil [Fri, 4 May 2018 20:25:38 +0000 (15:25 -0500)]
Merge pull request #21816 from xiexingguo/wip-wrong-unregister-pg

osd/OSD: drop extra/wrong *unregister_pg*

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21822 from tchaikov/wip-24012
Kefu Chai [Fri, 4 May 2018 16:08:23 +0000 (00:08 +0800)]
Merge pull request #21822 from tchaikov/wip-24012

cmake: use javac -h for creating JNI native headers

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agocmake: bump up JDK version to 1.8 21822/head
Kefu Chai [Fri, 4 May 2018 14:55:43 +0000 (22:55 +0800)]
cmake: bump up JDK version to 1.8

as JDK 7 is EOL. see
http://www.oracle.com/technetwork/java/eol-135779.html and
https://www.java.com/en/download/faq/java_7.xml

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: use javac -h for creating JNI native headers
Kefu Chai [Fri, 4 May 2018 14:32:35 +0000 (22:32 +0800)]
cmake: use javac -h for creating JNI native headers

JDK 1.10 does not offer javah anymore, so we need to use "javac -h" or
add_jar(... GENERATE_NATIVE_HEADERS) instead.

Fixes: http://tracker.ceph.com/issues/24012
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge remote-tracking branch 'gh/mimic'
Sage Weil [Fri, 4 May 2018 13:44:36 +0000 (08:44 -0500)]
Merge remote-tracking branch 'gh/mimic'

7 years agoosd/OSD: drop extra/wrong *unregister_pg* 21816/head
xiexingguo [Fri, 4 May 2018 13:43:51 +0000 (21:43 +0800)]
osd/OSD: drop extra/wrong *unregister_pg*

Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
7 years agomgr: Include daemon details in SLOW_OPS output
Brad Hubbard [Tue, 1 May 2018 01:15:28 +0000 (11:15 +1000)]
mgr: Include daemon details in SLOW_OPS output

Currently there is no way to see which daemons were involved in a slow
op after the op has cleared. This change allows us to record which
daemons were implicated in the logs.

Partially fixes: http://tracker.ceph.com/issues/23205

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit b5263176dea6d204c2caa52043cefc94dd5e475f)

7 years agocrush, osd: handle multiple parents properly when applying pg upmaps 21815/head
xiexingguo [Fri, 4 May 2018 13:20:29 +0000 (21:20 +0800)]
crush, osd: handle multiple parents properly when applying pg upmaps

Fixes: http://tracker.ceph.com/issues/23921
Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
7 years agoMerge pull request #21750 from badone/wip-summarise-osds-when-issuing-slow-request...
Sage Weil [Fri, 4 May 2018 13:36:02 +0000 (08:36 -0500)]
Merge pull request #21750 from badone/wip-summarise-osds-when-issuing-slow-request-warning-post-luminous

mgr: Include daemon details in SLOW_OPS output

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agolibrados: timeout on mgr_command() 21811/head
Kefu Chai [Fri, 4 May 2018 08:11:53 +0000 (16:11 +0800)]
librados: timeout on mgr_command()

because the mgrclient will be waiting for the mgrmap if the mgrmap
is not available, when the client is about to send a mgr command.
and monitor will drop the subscription requests if the client does not
have enough cap for reading mon, so unlike mon commands, the client
won't get an EACCES return code in this case.

in this change, a timeout machinary is introduced. and the client
will wait for "rados-mon-op-timeout" before it gives up. if this
setting is 0, it will wait forever.

Fixes: https://tracker.ceph.com/issues/23627
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21520 from jan--f/doc-fix-pg-state-names
John Spray [Fri, 4 May 2018 09:57:47 +0000 (10:57 +0100)]
Merge pull request #21520 from jan--f/doc-fix-pg-state-names

doc/rados/operations/pg-states: fix PG state names

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #21557 from jan--f/mgr-prometheus-fix-metadata-labels
John Spray [Fri, 4 May 2018 09:56:24 +0000 (10:56 +0100)]
Merge pull request #21557 from jan--f/mgr-prometheus-fix-metadata-labels

mgr: prometheus fix metadata labels

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #21797 from tomkukral/remove-cz-mirror
Kefu Chai [Fri, 4 May 2018 08:54:32 +0000 (16:54 +0800)]
Merge pull request #21797 from tomkukral/remove-cz-mirror

doc: remove CZ mirror

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agodoc: remove CZ mirror 21797/head
Tomáš Kukrál [Thu, 3 May 2018 10:47:07 +0000 (12:47 +0200)]
doc: remove CZ mirror

CZ mirror is no longer running because company sponsoring this mirror
isn't able to provide it anymore.

I'm removing this mirror from list of official mirrors.

Signed-off-by: Tomáš Kukrál <tom@6shore.net>
7 years agolibrados: fix locking on get_required_monitor_features
John Spray [Mon, 30 Apr 2018 15:35:18 +0000 (11:35 -0400)]
librados: fix locking on get_required_monitor_features

This wasn't taking the MonClient lock: should use
with_monmap to protect access to MonClient::monmap.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agolibrados: config mgrclient for pre-luminous cluster
John Spray [Mon, 30 Apr 2018 15:31:27 +0000 (11:31 -0400)]
librados: config mgrclient for pre-luminous cluster

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/MgrClient: add mgr_optional mode
John Spray [Mon, 30 Apr 2018 13:32:43 +0000 (09:32 -0400)]
mgr/MgrClient: add mgr_optional mode

This is for use when talking to pre-luminous
clusters, where we should not block waiting
for MgrMap because it might never come.

Fixes: https://tracker.ceph.com/issues/23627
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agodoc/rados/operations/pg-states: fix PG state names 21520/head
Jan Fajerski [Thu, 19 Apr 2018 10:34:28 +0000 (12:34 +0200)]
doc/rados/operations/pg-states: fix PG state names

Change pg state names according to osd/osd_types.cc as this is what
ceph -s and the prometheus exporter will present to users.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #21461 from yaozongyou/calculate-stddev-on-the-fly
Kefu Chai [Fri, 4 May 2018 04:06:10 +0000 (12:06 +0800)]
Merge pull request #21461 from yaozongyou/calculate-stddev-on-the-fly

common: calculate stddev on the fly

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #21805 into master
Patrick Donnelly [Fri, 4 May 2018 02:05:50 +0000 (19:05 -0700)]
Merge PR #21805 into master

* refs/pull/21805/head:
qa: move snap-hierarchy out of snaps workunits
qa: try snap format upgrade with multimds cluster
qa: add mds deactivation procedure for upgrades

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21807 from smithfarm/wip-python-encoding
Kefu Chai [Fri, 4 May 2018 01:33:45 +0000 (09:33 +0800)]
Merge pull request #21807 from smithfarm/wip-python-encoding

script: build-integration-branch: avoid Unicode error

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19714 from qwren/qatzip-compressor
Kefu Chai [Fri, 4 May 2018 01:17:17 +0000 (09:17 +0800)]
Merge pull request #19714 from qwren/qatzip-compressor

compressor: add QAT support

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21242 from majianpeng/objecter-calc-budget
Kefu Chai [Fri, 4 May 2018 01:16:14 +0000 (09:16 +0800)]
Merge pull request #21242 from majianpeng/objecter-calc-budget

osdc: Change 'bool budgeted' to 'int budget' to avoid recalculating.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21487 from yanghonggang/kstore-statistic
Kefu Chai [Fri, 4 May 2018 01:14:24 +0000 (09:14 +0800)]
Merge pull request #21487 from yanghonggang/kstore-statistic

os/kstore: support db statistic

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21299 from yanghonggang/pool-create
Kefu Chai [Fri, 4 May 2018 01:13:17 +0000 (09:13 +0800)]
Merge pull request #21299 from yanghonggang/pool-create

librados: Reject the invalid pool create request at client side, rath…

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge PR #21759 into master
Patrick Donnelly [Fri, 4 May 2018 00:54:39 +0000 (17:54 -0700)]
Merge PR #21759 into master

* refs/pull/21759/head:
script: Fix ceph-debug-docker.sh script create --tag in correct format

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: move snap-hierarchy out of snaps workunits 21805/head
Patrick Donnelly [Thu, 3 May 2018 22:07:21 +0000 (15:07 -0700)]
qa: move snap-hierarchy out of snaps workunits

The snapshot hierarchy it leaves behind can't be cleaned up by `rm -rf` which
breaks workunit cleanup. So, don't run this as part of normal snaps test.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: try snap format upgrade with multimds cluster
Patrick Donnelly [Thu, 3 May 2018 20:15:35 +0000 (13:15 -0700)]
qa: try snap format upgrade with multimds cluster

Fixes: http://tracker.ceph.com/issues/24002
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: add mds deactivation procedure for upgrades
Patrick Donnelly [Thu, 3 May 2018 20:12:54 +0000 (13:12 -0700)]
qa: add mds deactivation procedure for upgrades

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21553 from dragonylffly/wip-improve-rados-ls
Sage Weil [Thu, 3 May 2018 22:34:13 +0000 (17:34 -0500)]
Merge pull request #21553 from dragonylffly/wip-improve-rados-ls

tools/rados: improve the ls command usage

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21795 from wido/influx-string-split
Sage Weil [Thu, 3 May 2018 22:32:29 +0000 (17:32 -0500)]
Merge pull request #21795 from wido/influx-string-split

mgr/influx: Only split string on first occurence of dot (.)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #21798 from liewegas/wip-23980
Sage Weil [Thu, 3 May 2018 22:29:53 +0000 (17:29 -0500)]
Merge pull request #21798 from liewegas/wip-23980

osd/PG: fix uninit read in Incomplete::react(AdvMap&)

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoscript: build-integration-branch: avoid Unicode error 21807/head
Nathan Cutler [Thu, 3 May 2018 20:42:04 +0000 (22:42 +0200)]
script: build-integration-branch: avoid Unicode error

When run on PRs that have non-ASCII characters in their titles, the script
fails like this when run in a non UTF-8 environment:

UnicodeEncodeError: 'latin-1' codec can't encode character u'\u2026' in
position 651: ordinal not in range(256)

Since failing like that is not useful, avoid the error by forcing ASCII
encoding and filtering out any non-ASCII characters.

Fixes: http://tracker.ceph.com/issues/24003
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #21766 from majianpeng/osd-remove-useless-conditon
Yuri Weinstein [Thu, 3 May 2018 20:31:35 +0000 (13:31 -0700)]
Merge pull request #21766 from majianpeng/osd-remove-useless-conditon

osd: Remove useless conditon.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: huangjun <hjwsm1989@gmail.com>
7 years agoMerge pull request #21771 from majianpeng/osd-remove-pgslot
Yuri Weinstein [Thu, 3 May 2018 20:28:40 +0000 (13:28 -0700)]
Merge pull request #21771 from majianpeng/osd-remove-pgslot

osd: fix bug which cause can't erase OSDShardPGSlot.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa: add ragweed to luminous-x upgrade suite 21707/head
Casey Bodley [Fri, 9 Mar 2018 21:26:09 +0000 (16:26 -0500)]
qa: add ragweed to luminous-x upgrade suite

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoqa/rgw: remove rgw/upgrade suite
Casey Bodley [Thu, 12 Apr 2018 20:54:54 +0000 (16:54 -0400)]
qa/rgw: remove rgw/upgrade suite

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21546 from dzafman/wip-22881
Josh Durgin [Thu, 3 May 2018 17:07:57 +0000 (10:07 -0700)]
Merge pull request #21546 from dzafman/wip-22881

osd: process _scan_snaps() with all snapshots with head

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge PR #21374 into master
Patrick Donnelly [Thu, 3 May 2018 16:45:04 +0000 (09:45 -0700)]
Merge PR #21374 into master

* refs/pull/21374/head:
qa: add test for snap format upgrade
mds: initialize SnapServer::snaprealm_v2_since after journal replay
mds: properly distinguish cap update from snap flush
mds: update dev document of cephfs snapshot
doc: add release notes for cephfs snapshot
mds: allow snapshot by default for new filesystem
mds: close past parents after snaprealm format gets converted
mds: automaticly allow multi-active MDS after scrubbing all inodes
mds: don't mark primary dentry damaged if inode has been repaired
mds: upgrade snaprealm format during scrub
mds: allow scrubbing mdsdir
mds: cleanup scrub code
mds: show health warning if multimds with old format snapshots
mds: automaticly allow multi-active MDS after removing all old snapshots
mds: disallow multi-active MDS if snapshot was ever created by pre-mimic mds
mds: validate SnapInfo::long_name before using it
mds: don't bump snaptable last_snap when renaming snapshot
mds: properly save snaptable after upgrading version

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: add test for snap format upgrade 21374/head
Patrick Donnelly [Mon, 30 Apr 2018 21:43:28 +0000 (14:43 -0700)]
qa: add test for snap format upgrade

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21677 from Devp00l/wip-convert-floating-values
Lenz Grimmer [Thu, 3 May 2018 14:18:51 +0000 (16:18 +0200)]
Merge pull request #21677 from Devp00l/wip-convert-floating-values

mgr/dashboard: Convert floating values to bytes

Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoprometheus: Expose number of degraded/misplaced/unfound objects 21793/head
Boris Ranto [Wed, 2 May 2018 21:32:35 +0000 (23:32 +0200)]
prometheus: Expose number of degraded/misplaced/unfound objects

These come from the pg dump by polling the pg_stas_sum.

Signed-off-by: Boris Ranto <branto@redhat.com>
7 years agomgr: Expose pg_sum in pg_summary
Boris Ranto [Thu, 3 May 2018 12:25:30 +0000 (14:25 +0200)]
mgr: Expose pg_sum in pg_summary

Signed-off-by: Boris Ranto <branto@redhat.com>
7 years agotools/rados: allow list objects in a pg 19041/head
Li Wang [Thu, 3 May 2018 14:04:05 +0000 (14:04 +0000)]
tools/rados: allow list objects in a pg

When the cluster is not healthy, normally only a very few pgs encounter
problems, and the operator wants to know which objects may potentially
get lost.

Signed-off-by: Li Wang <laurence.liwang@gmail.com>
7 years agoMerge pull request #21780 from votdev/use_bootstrap_css
Lenz Grimmer [Thu, 3 May 2018 14:01:37 +0000 (16:01 +0200)]
Merge pull request #21780 from votdev/use_bootstrap_css

mgr/dashboard: Use Bootstrap CSS

Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/influx: Only split string on first occurence of dot (.) 21795/head
Wido den Hollander [Thu, 3 May 2018 10:11:58 +0000 (12:11 +0200)]
mgr/influx: Only split string on first occurence of dot (.)

Service names are not always osd.X or mon.X, they might be
rgw.radosgw.rgw1

This would lead to:

  Unhandled exception from module 'influx' while running on mgr.mon01: too many values to unpack

Only split on the first dot as the rest is the service name

Fixes: http://tracker.ceph.com/issues/23996
Signed-off-by: Wido den Hollander <wido@42on.com>
7 years agoosd/PG: fix uninit read in Incomplete::react(AdvMap&) 21798/head
Sage Weil [Thu, 3 May 2018 13:45:09 +0000 (08:45 -0500)]
osd/PG: fix uninit read in Incomplete::react(AdvMap&)

If a PG is incomplete when the pool is deleted we'll dereference invalid
iterators here.

Fixes: http://tracker.ceph.com/issues/23980
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21684 from liewegas/wip-23769
Sage Weil [Thu, 3 May 2018 13:40:25 +0000 (08:40 -0500)]
Merge pull request #21684 from liewegas/wip-23769

mon: fix slow op warning on mon, improve slow op warnings

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21694 from sebastian-philipp/dashboard-review-pylint
Lenz Grimmer [Thu, 3 May 2018 10:50:05 +0000 (12:50 +0200)]
Merge pull request #21694 from sebastian-philipp/dashboard-review-pylint

mgr/dashboard: Clean up Pylint warnings

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21774 from sebastian-philipp/dashboard-mypy-fixes
Lenz Grimmer [Thu, 3 May 2018 10:04:15 +0000 (12:04 +0200)]
Merge pull request #21774 from sebastian-philipp/dashboard-mypy-fixes

mgr/dashboard: fix two type errors found by mypy

Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21787 from tspmelo/fix-checkbox-fork-awesome
Lenz Grimmer [Thu, 3 May 2018 10:02:30 +0000 (12:02 +0200)]
Merge pull request #21787 from tspmelo/fix-checkbox-fork-awesome

mgr/dashboard: Change font-family of checkbox

Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/dashboard: awsauth: fix python3 string decode problem 21794/head
Ricardo Dias [Fri, 27 Apr 2018 11:38:41 +0000 (12:38 +0100)]
mgr/dashboard: awsauth: fix python3 string decode problem

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr: Include daemon details in SLOW_OPS output 21750/head
Brad Hubbard [Tue, 1 May 2018 01:15:28 +0000 (11:15 +1000)]
mgr: Include daemon details in SLOW_OPS output

Currently there is no way to see which daemons were involved in a slow
op after the op has cleared. This change allows us to record which
daemons were implicated in the logs.

Partially fixes: http://tracker.ceph.com/issues/23205

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agomds: include nfiles/nsubdirs of directory inode in MClientCaps 21668/head
Yan, Zheng [Thu, 26 Apr 2018 07:12:48 +0000 (15:12 +0800)]
mds: include nfiles/nsubdirs of directory inode in MClientCaps

Directory inode's dirstat gets updated by request reply, but not by
cap message. This causes problem for following case.

1. MDS modifies a directory
2. MDS issues CEPH_CAP_ANY_SHARED to client
3. The client satifies stat(2) by its cached metadata.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23855
7 years agoqa/tasks/cephfs: add test for renewing stale session 21712/head
Yan, Zheng [Tue, 1 May 2018 04:26:51 +0000 (12:26 +0800)]
qa/tasks/cephfs: add test for renewing stale session

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agoclient: invalidate caps and leases when session becomes stale
Yan, Zheng [Sat, 28 Apr 2018 04:36:43 +0000 (12:36 +0800)]
client: invalidate caps and leases when session becomes stale

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/23894
7 years agoclient: fix race in concurrent readdir
Yan, Zheng [Fri, 27 Apr 2018 01:13:51 +0000 (09:13 +0800)]
client: fix race in concurrent readdir

For a large directory, program needs to issue multiple readdir
syscalls to get all dentries. When there are multiple programs
read the directory concurrently. Following sequence of events
can happen.

 - program calls readdir with pos = 2. ceph sends readdir request
   to mds. The reply contains N1 entries. ceph adds these N1 entries
   to readdir cache.
 - program calls readdir with pos = N1+2. The readdir is satisfied
   by the readdir cache, N2 entries are returned. (Other program
   calls readdir in the middle, which fills the cache)
 - program calls readdir with pos = N1+N2+2. ceph sends readdir
   request to mds. The reply contains N3 entries and it reaches
   directory end. ceph adds these N3 entries to the readdir cache
   and marks directory complete.

The second readdir call does not update dirp->cache_index. ceph adds
the last N3 entries to wrong places.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23894
7 years agoMerge PR #21789 into master
Patrick Donnelly [Wed, 2 May 2018 22:56:54 +0000 (15:56 -0700)]
Merge PR #21789 into master

* refs/pull/21789/head:
qa: fix blacklisted check for test_lifecycle

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: fix blacklisted check for test_lifecycle 21789/head
Patrick Donnelly [Wed, 2 May 2018 19:50:53 +0000 (12:50 -0700)]
qa: fix blacklisted check for test_lifecycle

Caused by: 36f89c5acf0385f13be2f39bc8d30621f4bf0115

Fixes: http://tracker.ceph.com/issues/23975
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21791 from cbodley/wip-23974
Matt Benjamin [Wed, 2 May 2018 20:40:49 +0000 (16:40 -0400)]
Merge pull request #21791 from cbodley/wip-23974

rgw: raise log level on coroutine shutdown errors

7 years agorgw: raise log level on coroutine shutdown errors 21791/head
Casey Bodley [Wed, 2 May 2018 20:11:29 +0000 (16:11 -0400)]
rgw: raise log level on coroutine shutdown errors

Fixes: http://tracker.ceph.com/issues/23974
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agomon/MDSMonitor: no_reply on MMDSLoadTargets 21684/head
Sage Weil [Wed, 2 May 2018 19:48:31 +0000 (14:48 -0500)]
mon/MDSMonitor: no_reply on MMDSLoadTargets

If we don't note that we don't reply then we don't close out the routed
mon request and the op will appear as slow on the forwarding mon.

Fixes: http://tracker.ceph.com/issues/23769
Signed-off-by: Sage Weil <sage@redhat.com>