]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoMerge pull request #14295 from theanalyst/release/10.2.7/notes
Loic Dachary [Tue, 11 Apr 2017 09:44:29 +0000 (11:44 +0200)]
Merge pull request #14295 from theanalyst/release/10.2.7/notes

doc: release notes for v10.2.7 Jewel

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14441 from theanalyst/doc/changelog/v10.2.7
Loic Dachary [Tue, 11 Apr 2017 09:43:15 +0000 (11:43 +0200)]
Merge pull request #14441 from theanalyst/doc/changelog/v10.2.7

doc: add changelog for v10.2.7

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #14426 from tchaikov/wip-13562-kefu
Kefu Chai [Tue, 11 Apr 2017 09:41:56 +0000 (17:41 +0800)]
Merge pull request #14426 from tchaikov/wip-13562-kefu

misc: SCA fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13940 from Adirl/out
Haomai Wang [Tue, 11 Apr 2017 01:13:03 +0000 (09:13 +0800)]
Merge pull request #13940 from Adirl/out

msg/async/rdma: Update fix broken compilation

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #14409 from Adirl/conn_info
Haomai Wang [Tue, 11 Apr 2017 01:11:39 +0000 (09:11 +0800)]
Merge pull request #14409 from Adirl/conn_info

msg/async/rdma: RDMA-CM, Pass specific ConnMgr info in constructor

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #14410 from Adirl/get_device
Haomai Wang [Tue, 11 Apr 2017 01:10:26 +0000 (09:10 +0800)]
Merge pull request #14410 from Adirl/get_device

msg/async/rdma: RDMA-CM, get_device() by ibv_context

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #13073 from chardan/jfw-wip-15475-admin_heap_command
Sage Weil [Mon, 10 Apr 2017 21:24:14 +0000 (16:24 -0500)]
Merge pull request #13073 from chardan/jfw-wip-15475-admin_heap_command

osd: add "heap *" admin command

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14235 from nvedant07/bug_fix_3
Sage Weil [Mon, 10 Apr 2017 21:23:18 +0000 (16:23 -0500)]
Merge pull request #14235 from nvedant07/bug_fix_3

rados: more info added to pool deletion error

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14022 from batrick/admin-socket-close-error
Sage Weil [Mon, 10 Apr 2017 21:22:59 +0000 (16:22 -0500)]
Merge pull request #14022 from batrick/admin-socket-close-error

common: do not print error when asok is closed

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14292 from joscollin/wip-radosacl-warning
Sage Weil [Mon, 10 Apr 2017 21:22:37 +0000 (16:22 -0500)]
Merge pull request #14292 from joscollin/wip-radosacl-warning

tools: warning, ‘%.16x’ directive output truncated writing 16 bytes into a region of size 9.

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14301 from Andrey1994/master
Sage Weil [Mon, 10 Apr 2017 21:22:21 +0000 (16:22 -0500)]
Merge pull request #14301 from Andrey1994/master

build: Add Virtuozzo Linux support

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14336 from Adirl/fix_sockaddr
Sage Weil [Mon, 10 Apr 2017 21:22:07 +0000 (16:22 -0500)]
Merge pull request #14336 from Adirl/fix_sockaddr

src/msg/async: Update fix broken compilation for Posix

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agodoc: add changelog for v10.2.7 14441/head
Abhishek Lekshmanan [Mon, 10 Apr 2017 20:33:23 +0000 (22:33 +0200)]
doc: add changelog for v10.2.7

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
8 years agoMerge pull request #14039 from dachary/wip-19307-set-deviceclass
Yuri Weinstein [Mon, 10 Apr 2017 20:30:32 +0000 (13:30 -0700)]
Merge pull request #14039 from dachary/wip-19307-set-deviceclass

mon/OSDMonitor: osd crush set-device-class

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14208 from dachary/wip-crush-uniform-weights
Yuri Weinstein [Mon, 10 Apr 2017 20:28:41 +0000 (13:28 -0700)]
Merge pull request #14208 from dachary/wip-crush-uniform-weights

crush: bucket: crush_add_uniform_bucket_item should check for uniformity

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14209 from dachary/wip-crush-create-default-tunables
Yuri Weinstein [Mon, 10 Apr 2017 20:27:32 +0000 (13:27 -0700)]
Merge pull request #14209 from dachary/wip-crush-create-default-tunables

crush: builder: creating crush map with optimal configurations

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14401 from dillaman/wip-rbd-import-fixes
Mykola Golub [Mon, 10 Apr 2017 19:23:53 +0000 (22:23 +0300)]
Merge pull request #14401 from dillaman/wip-rbd-import-fixes

rbd: correct issues with image importing

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14437 from cernceph/dvanders_mgrrotate
Sage Weil [Mon, 10 Apr 2017 19:20:32 +0000 (14:20 -0500)]
Merge pull request #14437 from cernceph/dvanders_mgrrotate

ceph-mgr: rotate logs on sighup

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agodoc: release notes for v10.2.7 Jewel 14295/head
Abhishek Lekshmanan [Mon, 3 Apr 2017 09:40:56 +0000 (11:40 +0200)]
doc: release notes for v10.2.7 Jewel

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
8 years agoMerge pull request #14413 from hansbogert/patch-3
Kefu Chai [Mon, 10 Apr 2017 16:25:25 +0000 (00:25 +0800)]
Merge pull request #14413 from hansbogert/patch-3

doc: rgw: remove mention of megabytes for quotas

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
8 years agologrotate.conf: also sighup the ceph-mgr 14437/head
Dan van der Ster [Mon, 10 Apr 2017 15:34:48 +0000 (17:34 +0200)]
logrotate.conf: also sighup the ceph-mgr

Tell ceph-mgr to reopen its logs postrotate.

Fixes: http://tracker.ceph.com/issues/19568
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
8 years agoceph_fuse.cc: fix 64/32bit detection 14426/head
Danny Al-Gaaf [Tue, 21 Feb 2017 15:50:13 +0000 (16:50 +0100)]
ceph_fuse.cc: fix 64/32bit detection

Fix for:

[src/ceph_fuse.cc:111]: (style) Condition 'sizeof(long)==4' is always false

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agolua_bufferlist.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 15:39:34 +0000 (16:39 +0100)]
lua_bufferlist.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agoBitAllocator_test.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 15:25:00 +0000 (16:25 +0100)]
BitAllocator_test.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agotest_librbd.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 15:24:43 +0000 (16:24 +0100)]
test_librbd.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agorgw_rest_s3.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 15:24:26 +0000 (16:24 +0100)]
rgw_rest_s3.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agoPrimaryLogPG.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 15:24:06 +0000 (16:24 +0100)]
PrimaryLogPG.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agoosd/PG.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 15:23:40 +0000 (16:23 +0100)]
osd/PG.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agoBitAllocator.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 15:23:12 +0000 (16:23 +0100)]
BitAllocator.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agoMerge pull request #14430 from jcsp/wip-19566-monassert
Kefu Chai [Mon, 10 Apr 2017 15:31:06 +0000 (23:31 +0800)]
Merge pull request #14430 from jcsp/wip-19566-monassert

mon: avoid segfault in wait_auth_rotating

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoceph-mgr: reopen logs on SIGHUP
Dan van der Ster [Mon, 10 Apr 2017 15:29:05 +0000 (17:29 +0200)]
ceph-mgr: reopen logs on SIGHUP

Wire up the sighup_handler to reopen logs, like the other daemons.

Fixes: http://tracker.ceph.com/issues/19568
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
8 years agoMerge pull request #14428 from tchaikov/wip-ceph_objectstore_tool-kill-all
Kefu Chai [Mon, 10 Apr 2017 15:16:09 +0000 (23:16 +0800)]
Merge pull request #14428 from tchaikov/wip-ceph_objectstore_tool-kill-all

tests: ceph_objectstore_tool.py: kill all daemons

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #10636 from fullerdj/wip-djf-15069
John Spray [Mon, 10 Apr 2017 12:52:04 +0000 (13:52 +0100)]
Merge pull request #10636 from fullerdj/wip-djf-15069

cephfs: Permit recovering metadata into a new RADOS pool

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agomon: avoid segfault in wait_auth_rotating 14430/head
John Spray [Mon, 10 Apr 2017 12:00:41 +0000 (13:00 +0100)]
mon: avoid segfault in wait_auth_rotating

MonClient users should not be calling into MonClient
after calling shutdown().  However, MonClient should
assert out rather than proceeding to try and
follow a maybe-null pointer.

Related to http://tracker.ceph.com/issues/19566

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agotests: ceph_objectstore_tool.py: kill all daemons 14428/head
Kefu Chai [Sat, 8 Apr 2017 14:27:33 +0000 (22:27 +0800)]
tests: ceph_objectstore_tool.py: kill all daemons

init-ceph kills all daemons that can be identified by get_name_list() by
default, so no need to list them explicitly. also, without this change,
mgr is not stopped when the test finishes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoosd/OSD.cc: use static_cast instead of c-style
Danny Al-Gaaf [Tue, 21 Feb 2017 14:56:31 +0000 (15:56 +0100)]
osd/OSD.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agorgw_rest_s3.cc: reorder checks in while loop
Danny Al-Gaaf [Tue, 21 Feb 2017 14:28:46 +0000 (15:28 +0100)]
rgw_rest_s3.cc: reorder checks in while loop

Fix for:

[src/rgw/rgw_rest_s3.cc:1224]: (style) Array index 'chunk_offset'
 is used before limits check.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agoAsyncMessenger.cc: fix FORWARD_NULL
Danny Al-Gaaf [Tue, 21 Feb 2017 13:31:53 +0000 (14:31 +0100)]
AsyncMessenger.cc: fix FORWARD_NULL

Use assert to ensure Message *m is not NULL.

Fix for:

CID 1399578 (#4 of 4): Dereference after null check (FORWARD_NULL)
 var_deref_model: Passing null pointer m to submit_message,
 which dereferences it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agorgw_file.h: fix potential data race condition
Danny Al-Gaaf [Tue, 21 Feb 2017 12:55:40 +0000 (13:55 +0100)]
rgw_file.h: fix potential data race condition

Fix for:

CID 1399581 (#1 of 1): Data race condition (MISSING_LOCK)
 missing_lock: Accessing this->state.atime without holding lock
 rgw::RGWFileHandle.mtx. Elsewhere, "_ZN3rgw13RGWFileHandle5StateE.atime"
 is accessed with rgw::RGWFileHandle.mtx held 2 out of 3 times
 (2 of these accesses strongly imply that it is necessary).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agocls_rgw_client.h: Close resource leak
Danny Al-Gaaf [Mon, 20 Feb 2017 16:08:39 +0000 (17:08 +0100)]
cls_rgw_client.h: Close resource leak

Fix for:

CID 1395687 (#1 of 1): Resource leak (RESOURCE_LEAK)
CID 1395679 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable c going out of scope leaks the storage it
 points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agomount.ceph.c: fix resource leak
Danny Al-Gaaf [Mon, 20 Feb 2017 15:41:49 +0000 (16:41 +0100)]
mount.ceph.c: fix resource leak

Addressed issue:

CID 1219611 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable saw_name going out of scope leaks
 the storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agotest_ipaddr.cc: fix UNINIT issues around sockaddr_in struct
Danny Al-Gaaf [Mon, 20 Feb 2017 14:56:40 +0000 (15:56 +0100)]
test_ipaddr.cc: fix UNINIT issues around sockaddr_in struct

Fix for:

CID 1396088 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396090 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396091 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396092 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396096 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396097 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396099 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396101 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396103 (#1 of 1): Uninitialized scalar variable (UNINIT)
CID 1396104 (#1 of 1): Uninitialized scalar variable (UNINIT)

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
8 years agoMerge pull request #14280 from tone-zhang/bug_19442
Radoslaw Zarzynski [Mon, 10 Apr 2017 09:51:55 +0000 (11:51 +0200)]
Merge pull request #14280 from tone-zhang/bug_19442

rgw: fix response header of Swift API

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #14378 from kestrels/wip-19454
Kefu Chai [Mon, 10 Apr 2017 08:01:26 +0000 (16:01 +0800)]
Merge pull request #14378 from kestrels/wip-19454

arch: fix build on PowerPC with FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #14360 from joscollin/wip-Update-organizationmap
Brad Hubbard [Mon, 10 Apr 2017 02:34:44 +0000 (12:34 +1000)]
Merge pull request #14360 from joscollin/wip-Update-organizationmap

.organizationmap: Updated authors

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #13803 from trociny/wip-18785
Jason Dillaman [Sun, 9 Apr 2017 13:59:57 +0000 (09:59 -0400)]
Merge pull request #13803 from trociny/wip-18785

rbd-mirror: separate ImageReplayer handling from Replayer

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14406 from wjwithagen/wip-wjw-freebsd.readme
Kefu Chai [Sun, 9 Apr 2017 12:34:56 +0000 (20:34 +0800)]
Merge pull request #14406 from wjwithagen/wip-wjw-freebsd.readme

README.FreeBSD: Update the status

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: rgw: remove mention of megabytes for quotas 14413/head
Hans van den Bogert [Sun, 9 Apr 2017 11:21:18 +0000 (13:21 +0200)]
doc: rgw: remove mention of megabytes for quotas

Remove mention of confusing reference to megabytes in opening paragraph of "quota management".
To remove further confusion, mention that setting a size for '--max-size' is in bytes by default.

Signed-off-by: Hans van den Bogert <hansbogert@gmail.com>
8 years agoREADME.FreeBSD: Update the status 14406/head
Willem Jan Withagen [Sat, 8 Apr 2017 16:31:13 +0000 (18:31 +0200)]
README.FreeBSD: Update the status

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #14397 from liewegas/wip-19541
Kefu Chai [Sun, 9 Apr 2017 07:59:59 +0000 (15:59 +0800)]
Merge pull request #14397 from liewegas/wip-19541

osd/PG: only correct filestore collection bits on load

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomsg/async/rdma: get_device() by ibv_context 14410/head
Amir Vadai [Thu, 23 Mar 2017 08:39:08 +0000 (10:39 +0200)]
msg/async/rdma: get_device() by ibv_context

This function will be used by RDMAConnCM

Issue: 995322
Change-Id: I52b684e8bbac14c1070801b2ba470c7c0dfe40b9
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agomsg/async/rdma: Pass specific ConnMgr info in constructor 14409/head
Amir Vadai [Thu, 30 Mar 2017 11:15:57 +0000 (14:15 +0300)]
msg/async/rdma: Pass specific ConnMgr info in constructor

Pass specific information for RDMAConnTCP (and later for RDMAConnCM) in
the constructor.
This makes set_accept_fd() redundant.

Issue: 995322
Change-Id: I10b4a626f180858465a378e886a238fe187180d5
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agoMerge pull request #14382 from zealoussnow/wip-0407
Sage Weil [Sat, 8 Apr 2017 18:28:23 +0000 (13:28 -0500)]
Merge pull request #14382 from zealoussnow/wip-0407

messages: fix return type name of MOSDMap

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14405 from wjwithagen/wip-wjw-gitignore
Sage Weil [Sat, 8 Apr 2017 18:25:43 +0000 (13:25 -0500)]
Merge pull request #14405 from wjwithagen/wip-wjw-gitignore

gitignore: Ignore rejects by patch

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14261 from liewegas/wip-15386
Sage Weil [Sat, 8 Apr 2017 18:24:22 +0000 (13:24 -0500)]
Merge pull request #14261 from liewegas/wip-15386

ceph_test_librados_api_misc: fix stupid LibRadosMiscConnectFailure.ConnectFailure test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14130 from liewegas/wip-json-slash
Sage Weil [Sat, 8 Apr 2017 18:21:44 +0000 (13:21 -0500)]
Merge pull request #14130 from liewegas/wip-json-slash

common/escape: do not escape / in json

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agoMerge pull request #14198 from liewegas/wip-fs
Sage Weil [Sat, 8 Apr 2017 18:21:03 +0000 (13:21 -0500)]
Merge pull request #14198 from liewegas/wip-fs

qa/suites: drop 'fs' facet, and add 'objectstore' facet where missing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14255 from liewegas/wip-19430
Sage Weil [Sat, 8 Apr 2017 18:19:50 +0000 (13:19 -0500)]
Merge pull request #14255 from liewegas/wip-19430

osd/PrimaryLogPG: do not expect FULL_TRY ops to get resent

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoqa/workunits/cephtool/test.sh: handle non-escaped-/ json 14130/head
Sage Weil [Sat, 8 Apr 2017 18:19:00 +0000 (14:19 -0400)]
qa/workunits/cephtool/test.sh: handle non-escaped-/ json

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agogitignore: Ignore rejects by patch 14405/head
Willem Jan Withagen [Sat, 8 Apr 2017 14:53:25 +0000 (16:53 +0200)]
gitignore: Ignore rejects by patch

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #14386 from tchaikov/wip-19515
Sage Weil [Sat, 8 Apr 2017 14:33:07 +0000 (09:33 -0500)]
Merge pull request #14386 from tchaikov/wip-19515

mon/OSDMonitor: update creating epoch if target osd changed

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14227 from ivancich/wip-perf-counter-race
Sage Weil [Sat, 8 Apr 2017 14:22:53 +0000 (09:22 -0500)]
Merge pull request #14227 from ivancich/wip-perf-counter-race

common/perf_counters: fix race condition with atomic variables

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14365 from tchaikov/wip-another-mgr-command
Sage Weil [Sat, 8 Apr 2017 14:22:13 +0000 (09:22 -0500)]
Merge pull request #14365 from tchaikov/wip-another-mgr-command

mgr: move "osd pool stats" to mgr

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14370 from chardan/jfw-wip-simple_spinlock_atomic
Sage Weil [Sat, 8 Apr 2017 14:21:38 +0000 (09:21 -0500)]
Merge pull request #14370 from chardan/jfw-wip-simple_spinlock_atomic

common: Implements simple_spin_t in terms of std::atomic_flag.

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14379 from tchaikov/wip-cmake-ctags
Kefu Chai [Sat, 8 Apr 2017 03:44:27 +0000 (11:44 +0800)]
Merge pull request #14379 from tchaikov/wip-cmake-ctags

cmake: support optional argument for overriding default ctag excludes

Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agotests: ceph_objectstore_tool.py: run vstart with MGR=1 14365/head
Kefu Chai [Sat, 8 Apr 2017 02:20:16 +0000 (10:20 +0800)]
tests: ceph_objectstore_tool.py: run vstart with MGR=1

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/workunits: partial revert of commit 5b486d9 14401/head
Jason Dillaman [Sat, 8 Apr 2017 01:00:19 +0000 (21:00 -0400)]
qa/workunits: partial revert of commit 5b486d9

Testing for disk usage and diff extents for a sparsely written
imported RBD image cannot generically be handled across different
OSD object stores and RBD image features.

The only alternatives would include grepping the rbd CLI
debug log for specific invocations of aio_write or mocking
the rbd CLI for unit testing.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd: import-diff was attempting to write empty chunks
Jason Dillaman [Sat, 8 Apr 2017 00:59:28 +0000 (20:59 -0400)]
rbd: import-diff was attempting to write empty chunks

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd: corrected typo in rbd export v2 section header
Jason Dillaman [Fri, 7 Apr 2017 17:17:04 +0000 (13:17 -0400)]
rbd: corrected typo in rbd export v2 section header

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14374 from liewegas/wip-mgr-init
Sage Weil [Fri, 7 Apr 2017 18:47:48 +0000 (13:47 -0500)]
Merge pull request #14374 from liewegas/wip-mgr-init

mgr: fix bugs in init, beacons

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14306 from liewegas/wip-bluestore-throttle-model
Sage Weil [Fri, 7 Apr 2017 15:49:32 +0000 (10:49 -0500)]
Merge pull request #14306 from liewegas/wip-bluestore-throttle-model

os/bluestore: unify throttling model

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
8 years agoos/bluestore: make deferred_aggressive a counter 14306/head
Sage Weil [Fri, 7 Apr 2017 15:31:21 +0000 (11:31 -0400)]
os/bluestore: make deferred_aggressive a counter

Multiple threads may run _osr_drain_preceding; use a count to
prevent the first finisher from prematurely disabling
aggressive mode.

Fixes: http://tracker.ceph.com/issues/19542
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14387 from wjwithagen/wip-wjw-test-osd-dup
Kefu Chai [Fri, 7 Apr 2017 15:16:13 +0000 (23:16 +0800)]
Merge pull request #14387 from wjwithagen/wip-wjw-test-osd-dup

test/osd/CMakeLists.txt: osd-dup.sh require BlueStore/AIO

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14348 from rzarzynski/wip-bs-bitmap-no-virts-in-hotspot
Sage Weil [Fri, 7 Apr 2017 14:39:18 +0000 (09:39 -0500)]
Merge pull request #14348 from rzarzynski/wip-bs-bitmap-no-virts-in-hotspot

os/bluestore: avoid the VTABLE-related burden in BitMapAllocator's hotspot

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agomon/MgrMonitor: send mgr beacons to leader 14374/head
Sage Weil [Fri, 7 Apr 2017 14:21:46 +0000 (10:21 -0400)]
mon/MgrMonitor: send mgr beacons to leader

The leader has the last_beacon map that matters; make sure all
beacons go there.

At the same time drop the somewhat redundant checks in
preprocess_beaon and just send *everything* to prepare_beacon,
which is smart enough to do no update if there is none.

Fixes: http://tracker.ceph.com/issues/19502
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agorbd-mirror A/A: separate ImageReplayer handling from Replayer 13803/head
Mykola Golub [Sat, 18 Mar 2017 17:09:44 +0000 (18:09 +0100)]
rbd-mirror A/A: separate ImageReplayer handling from Replayer

Fixes: http://tracker.ceph.com/issues/18785
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd-mirror A/A: InstanceReplayer class to acquire and release images
Mykola Golub [Fri, 7 Apr 2017 12:14:29 +0000 (14:14 +0200)]
rbd-mirror A/A: InstanceReplayer class to acquire and release images

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoosd/PG: only correct filestore collection bits on load 14397/head
Sage Weil [Fri, 7 Apr 2017 13:50:12 +0000 (09:50 -0400)]
osd/PG: only correct filestore collection bits on load

PG::update_store_with_options() is called on load *and* when the pool
properties change, but if we only need to fix bits right at load time.
More importantly, but doing a second check on pool change, we may race
with a previously queued collection create that is not yet readable via
filestore, try to (synchronously) set the property again, and deadlock.

Fixes: http://tracker.ceph.com/issues/19541
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agorbd-mirror: add set_remote_images method to ImageReplayer
Mykola Golub [Fri, 10 Mar 2017 16:03:52 +0000 (17:03 +0100)]
rbd-mirror: add set_remote_images method to ImageReplayer

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14366 from wjin/clean_mgr
Kefu Chai [Fri, 7 Apr 2017 08:16:37 +0000 (16:16 +0800)]
Merge pull request #14366 from wjin/clean_mgr

mgr: remove unused function declarations

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest/osd/CMakeLists.txt: osd-dup.sh require BlueStore/AIO 14387/head
Willem Jan Withagen [Fri, 7 Apr 2017 08:05:25 +0000 (10:05 +0200)]
test/osd/CMakeLists.txt: osd-dup.sh require BlueStore/AIO

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agocommon: Implements simple_spin_t in terms of std::atomic_flag 14370/head
Jesse Williamson [Thu, 6 Apr 2017 11:59:37 +0000 (04:59 -0700)]
common: Implements simple_spin_t in terms of std::atomic_flag

Removes the requirement of machine-specific code in favor of the standard
library. See also PR #14337.

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
8 years agomon/OSDMonitor: update creating epoch if target osd changed 14386/head
Kefu Chai [Fri, 7 Apr 2017 07:28:37 +0000 (15:28 +0800)]
mon/OSDMonitor: update creating epoch if target osd changed

there is chance that the acting_primary of a PG being created changes
across osdmap updates, in that case we should update the new creating_pgs
with the mapping's epoch, not the stale one when the PG was originally
created. otherwise the new target OSD won't get the pg-create message.

Fixes: http://tracker.ceph.com/issues/19515
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agomessages: fix return type name of MOSDMap 14382/head
Leo Zhang [Fri, 7 Apr 2017 06:32:42 +0000 (14:32 +0800)]
messages: fix return type name of MOSDMap

Signed-off-by: Leo Zhang <nguzcf@gmail.com>
8 years agoMerge pull request #14029 from dachary/wip-osd-crushmap
Kefu Chai [Fri, 7 Apr 2017 04:42:20 +0000 (12:42 +0800)]
Merge pull request #14029 from dachary/wip-osd-crushmap

mon: osd crush set crushmap need sanity check

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agocmake: support optional argument for overriding default ctag excludes 14379/head
Kefu Chai [Fri, 7 Apr 2017 03:55:10 +0000 (11:55 +0800)]
cmake: support optional argument for overriding default ctag excludes

so instead of excluding all submodules, one can just exclude boost and
rocksdb using:

  cmake -DCTAG_EXCLUDES="boost;rocksdb" ..

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14334 from tchaikov/wip-cmake-ctags
Dan Mick [Fri, 7 Apr 2017 02:34:05 +0000 (19:34 -0700)]
Merge pull request #14334 from tchaikov/wip-cmake-ctags

cmake: Add simple recursive ctags target for Ceph source only

Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agoMerge pull request #14320 from Adirl/poll_blocking
Haomai Wang [Fri, 7 Apr 2017 00:23:27 +0000 (08:23 +0800)]
Merge pull request #14320 from Adirl/poll_blocking

msg/async/rdma: Make poll_blocking() poll for async events in additio…

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #14340 from oritwas/wip-rgw-fix-zone-create
Casey Bodley [Thu, 6 Apr 2017 18:21:16 +0000 (14:21 -0400)]
Merge pull request #14340 from oritwas/wip-rgw-fix-zone-create

radosgw-admin: use zone id when creating a zone

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14262 from guihecheng/rgw_file-fix-rmdir
Matt Benjamin [Thu, 6 Apr 2017 18:00:51 +0000 (14:00 -0400)]
Merge pull request #14262 from guihecheng/rgw_file-fix-rmdir

rgw_file: fix missing unlock in unlink

8 years agoMerge pull request #14216 from dongbula/add-multi-zonegroup-for-test
Casey Bodley [Thu, 6 Apr 2017 17:22:36 +0000 (13:22 -0400)]
Merge pull request #14216 from dongbula/add-multi-zonegroup-for-test

rgw: add --num-zonegroups option for multi test

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14354 from mogeb/cmake-lttng
Casey Bodley [Thu, 6 Apr 2017 17:09:40 +0000 (13:09 -0400)]
Merge pull request #14354 from mogeb/cmake-lttng

cmake: build tracepoint libraries for vstart target

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agomgr/Mgr: unlock lock while blocking for metadata load
Sage Weil [Thu, 6 Apr 2017 15:40:27 +0000 (11:40 -0400)]
mgr/Mgr: unlock lock while blocking for metadata load

Fixes: http://tracker.ceph.com/issues/19516
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14115 from liewegas/wip-bluestore-metadata
Sage Weil [Thu, 6 Apr 2017 15:16:17 +0000 (10:16 -0500)]
Merge pull request #14115 from liewegas/wip-bluestore-metadata

os/bluestore: implement collect_metadata

8 years agoMerge pull request #14304 from rchagam/18576_bug_fix
Sage Weil [Thu, 6 Apr 2017 15:15:17 +0000 (10:15 -0500)]
Merge pull request #14304 from rchagam/18576_bug_fix

tracing: fix segv

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14328 from liewegas/wip-mgrmap-features
Sage Weil [Thu, 6 Apr 2017 15:14:09 +0000 (10:14 -0500)]
Merge pull request #14328 from liewegas/wip-mgrmap-features

mgr: fix several init/re-init bugs

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14333 from liewegas/wip-bluestore-misc
Sage Weil [Thu, 6 Apr 2017 15:13:43 +0000 (10:13 -0500)]
Merge pull request #14333 from liewegas/wip-bluestore-misc

os/bluestore: misc fixes

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agomsg/async/rdma: Make poll_blocking() poll for async events in addition to tx/rx 14320/head
Amir Vadai [Tue, 28 Mar 2017 14:52:58 +0000 (17:52 +0300)]
msg/async/rdma: Make poll_blocking() poll for async events in addition to tx/rx

Issue: 995322
Change-Id: I62e75f4c4e574ba97e24b20a4d7b94c56c605bb5
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agoMerge pull request #14210 from liewegas/wip-osd-dup
Sage Weil [Thu, 6 Apr 2017 14:51:18 +0000 (09:51 -0500)]
Merge pull request #14210 from liewegas/wip-osd-dup

os: allow offline conversion of filestore -> bluestore (or anything else)

Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #12175 from dongbula/fix-slavezonegroup-cannot-enable-bucket-versi...
Casey Bodley [Thu, 6 Apr 2017 14:41:18 +0000 (10:41 -0400)]
Merge pull request #12175 from dongbula/fix-slavezonegroup-cannot-enable-bucket-versioning

rgw: fix slave zonegroup cannot enable the bucket versioning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>