]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agodebian: package ceph.logroate properly 14600/head
Kefu Chai [Tue, 18 Apr 2017 06:07:04 +0000 (14:07 +0800)]
debian: package ceph.logroate properly

see also "man dh_installlogrotate"

Fixes: http://tracker.ceph.com/issues/19390
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14267 from yunfeiguan/master
John Spray [Sat, 15 Apr 2017 18:46:53 +0000 (19:46 +0100)]
Merge pull request #14267 from yunfeiguan/master

cephfs: fix mount point break off problem after mds switch occured

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #13587 from yanghonggang/master
John Spray [Sat, 15 Apr 2017 18:45:54 +0000 (19:45 +0100)]
Merge pull request #13587 from yanghonggang/master

cephfs: fix write_buf's _len overflow problem

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #13522 from singler/wip-reconnect-client
John Spray [Sat, 15 Apr 2017 18:44:53 +0000 (19:44 +0100)]
Merge pull request #13522 from singler/wip-reconnect-client

client/Client.cc: after reset session from MDS - reconnect

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #13466 from jcsp/wip-cephfs-ecoverwrites
John Spray [Sat, 15 Apr 2017 18:44:00 +0000 (19:44 +0100)]
Merge pull request #13466 from jcsp/wip-cephfs-ecoverwrites

Add test for is_hacky_ecoverwrites in cephfs pool checks

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14207 from jcsp/wip-19401
John Spray [Sat, 15 Apr 2017 18:40:59 +0000 (19:40 +0100)]
Merge pull request #14207 from jcsp/wip-19401

mds: ignore ENOENT on writing backtrace

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #13579 from ukernel/wip-19022
John Spray [Sat, 15 Apr 2017 11:15:04 +0000 (12:15 +0100)]
Merge pull request #13579 from ukernel/wip-19022

client: drop cap snaps when auth mds session gets closed

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14490 from liewegas/wip-no-luminous
Sage Weil [Sat, 15 Apr 2017 01:05:45 +0000 (20:05 -0500)]
Merge pull request #14490 from liewegas/wip-no-luminous

mon: add mon_debug_no_require_luminous

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14553 from guihecheng/rgw_file-revert
Matt Benjamin [Fri, 14 Apr 2017 18:30:38 +0000 (14:30 -0400)]
Merge pull request #14553 from guihecheng/rgw_file-revert

rgw_file: fix up potential race condition

verified f23

8 years agoMerge pull request #14546 from dachary/wip-19628-directory-boot
Kefu Chai [Fri, 14 Apr 2017 16:06:50 +0000 (00:06 +0800)]
Merge pull request #14546 from dachary/wip-19628-directory-boot

ceph-disk: enable directory backed OSD at boot time

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/suites/rados/thrash: do not thrash cluster full without luminous flag 14490/head
Sage Weil [Fri, 14 Apr 2017 16:04:47 +0000 (12:04 -0400)]
qa/suites/rados/thrash: do not thrash cluster full without luminous flag

The interface changes with the luminous flag; this will fail.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/suites/rados: expand other collections with no-require-luminous
Sage Weil [Fri, 14 Apr 2017 15:45:05 +0000 (11:45 -0400)]
qa/suites/rados: expand other collections with no-require-luminous

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14551 from tchaikov/wip-19584
Kefu Chai [Fri, 14 Apr 2017 14:42:34 +0000 (22:42 +0800)]
Merge pull request #14551 from tchaikov/wip-19584

mon/OSDMonitor: transit creating_pgs from pgmap when upgrading

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14435 from liewegas/wip-bluestore-deferred
Sage Weil [Fri, 14 Apr 2017 13:35:50 +0000 (08:35 -0500)]
Merge pull request #14435 from liewegas/wip-bluestore-deferred

os/bluestore: tune deferred_batch_ops separately for hdd and ssd

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #14489 from liewegas/wip-bluestore-fix-flush
Sage Weil [Fri, 14 Apr 2017 13:35:35 +0000 (08:35 -0500)]
Merge pull request #14489 from liewegas/wip-bluestore-fix-flush

os/bluestore: fix narrow osr->flush() race

8 years agomon/OSDMonitor: require_luminous_osds for pg-remap[-items]
Sage Weil [Fri, 14 Apr 2017 13:21:17 +0000 (09:21 -0400)]
mon/OSDMonitor: require_luminous_osds for pg-remap[-items]

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoceph-disk: enable directory backed OSD at boot time 14546/head
Loic Dachary [Thu, 13 Apr 2017 21:49:50 +0000 (23:49 +0200)]
ceph-disk: enable directory backed OSD at boot time

https://github.com/ceph/ceph/commit/539385b143feee3905dceaf7a8faaced42f2d3c6
introduced a regression preventing directory backed OSD from starting at
boot time.

For device backed OSD the boot sequence starts with ceph-disk@.service
and proceeds to

    systemctl enable --runtime ceph-osd@.service

where the --runtime ensure ceph-osd@12 is removed when the machine
reboots so that it does not compete with the ceph-disk@/dev/sdb1 unit at
boot time.

However directory backed OSD solely rely on the ceph-osd@.service unit
to start at boot time and will therefore fail to boot.

The --runtime flag is selectively set for device backed OSD only.

Fixes: http://tracker.ceph.com/issues/19628
Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agorgw_file: add locks to fix potential race 14553/head
Gui Hecheng [Fri, 14 Apr 2017 09:28:19 +0000 (17:28 +0800)]
rgw_file: add locks to fix potential race

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
8 years agoMerge pull request #13859 from jcsp/wip-19204
John Spray [Fri, 14 Apr 2017 09:50:14 +0000 (10:50 +0100)]
Merge pull request #13859 from jcsp/wip-19204

mds: shut down finisher before objecter

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #14505 from jcsp/wip-19566
John Spray [Fri, 14 Apr 2017 09:49:20 +0000 (10:49 +0100)]
Merge pull request #14505 from jcsp/wip-19566

mds: fix mgrc shutdown

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #14398 from jcsp/wip-19551
John Spray [Fri, 14 Apr 2017 09:48:25 +0000 (10:48 +0100)]
Merge pull request #14398 from jcsp/wip-19551

mon: emit cluster log messages on MDS health changes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoqa: add log whitelists for MDS health messages 14398/head
John Spray [Thu, 13 Apr 2017 16:01:09 +0000 (12:01 -0400)]
qa: add log whitelists for MDS health messages

Now that we send these to the cluster log, we must
whitelist them in the tests that exercise those
unhealthy states.

Fixes: http://tracker.ceph.com/issues/19551
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomon/OSDMonitor: transit creating_pgs from pgmap when upgrading 14551/head
Kefu Chai [Fri, 14 Apr 2017 07:49:14 +0000 (15:49 +0800)]
mon/OSDMonitor: transit creating_pgs from pgmap when upgrading

there could be some pg(s) still being created when we are upgrading to
luminous, and the pools holding them are not changed in the sense of
pg_pool_t::last_change after the upgrade and before we scan for
creating pgs. in that case, the existing update_pending_creatings()
will fail to collect the pgs being created before the upgrade.

with this change, the creating_pgs in pgmap are also used for updating
the OSDMonitor's creating_pgs if it's updated.

but we should stopupdating the pgmap once the upgrade completes. i.e.
stop dispatching MSG_PGSTATS messages to PGMonitor if the quorum and all
osds are luminous.

Fixes: http://tracker.ceph.com/issues/19584
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoRevert "rgw_file.h: fix potential data race condition"
Gui Hecheng [Wed, 12 Apr 2017 08:46:49 +0000 (16:46 +0800)]
Revert "rgw_file.h: fix potential data race condition"

This reverts commit 3f7b411e1e304e8a6f295dc50b8cf3c6c496f4cc.
Causing hung up due to double lock.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
8 years agoMerge pull request #10851 from atheism/rgw-s3-doc-update
Kefu Chai [Fri, 14 Apr 2017 02:18:10 +0000 (10:18 +0800)]
Merge pull request #10851 from atheism/rgw-s3-doc-update

doc/radosgw/s3/cpp.rst: update usage of libs3 APIs to make the examples work

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14469 from badone/wip-return-error-on-missing-client-id
Brad Hubbard [Thu, 13 Apr 2017 22:10:59 +0000 (08:10 +1000)]
Merge pull request #14469 from badone/wip-return-error-on-missing-client-id

mds: Return error message instead of asserting

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agomon/OSDMonitor: slightly better debug output
Sage Weil [Thu, 13 Apr 2017 18:12:42 +0000 (14:12 -0400)]
mon/OSDMonitor: slightly better debug output

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: fix creating pg trimming during upgrade
Sage Weil [Thu, 13 Apr 2017 17:30:41 +0000 (13:30 -0400)]
mon/OSDMonitor: fix creating pg trimming during upgrade

The creating pgs are in the PGMap with the CREATING
state bit set.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/suites/rados: require_luminous_osds at end of run, then scrub
Sage Weil [Mon, 10 Apr 2017 19:00:43 +0000 (15:00 -0400)]
qa/suites/rados: require_luminous_osds at end of run, then scrub

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/tasks/exec_on_cleanup.py: add
Sage Weil [Thu, 13 Apr 2017 14:09:26 +0000 (10:09 -0400)]
qa/tasks/exec_on_cleanup.py: add

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14508 from smithfarm/wip-doc-dev
Loic Dachary [Thu, 13 Apr 2017 18:54:46 +0000 (20:54 +0200)]
Merge pull request #14508 from smithfarm/wip-doc-dev

doc: dev guide: how to run s3-tests locally against vstart

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoos/bluestore: tune deferred_batch_ops separately for hdd and ssd 14435/head
Sage Weil [Mon, 10 Apr 2017 14:26:40 +0000 (10:26 -0400)]
os/bluestore: tune deferred_batch_ops separately for hdd and ssd

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14420 from optimistyzy/329
Sage Weil [Thu, 13 Apr 2017 17:34:51 +0000 (12:34 -0500)]
Merge pull request #14420 from optimistyzy/329

os/bluestore/NVMEDevice: Add multiple thread support for SPDK I/O thread

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agodoc: dev guide: how to run s3-tests locally against vstart 14508/head
Nathan Cutler [Thu, 13 Apr 2017 17:14:52 +0000 (19:14 +0200)]
doc: dev guide: how to run s3-tests locally against vstart

Add a bunch of verbiage to the Developer Guide

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #14458 from linuxbox2/wip-rgw_file-readahead
Matt Benjamin [Thu, 13 Apr 2017 17:12:27 +0000 (13:12 -0400)]
Merge pull request #14458 from linuxbox2/wip-rgw_file-readahead

rgw_file: support readdir cb type hints (plus fixes)

8 years agomds: shut down finisher before objecter 13859/head
John Spray [Wed, 8 Mar 2017 12:13:46 +0000 (12:13 +0000)]
mds: shut down finisher before objecter

Some of the finisher contexts would try to call into Objecter.
We mostly are protected from this by mds_lock+the stopping
flag, but at the Filer level there's no mds_lock, so in the
case of file size probing we have a problem.

Fixes: http://tracker.ceph.com/issues/19204
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #13966 from jcsp/wip-client-logmsg
John Spray [Thu, 13 Apr 2017 16:43:10 +0000 (17:43 +0100)]
Merge pull request #13966 from jcsp/wip-client-logmsg

client: specify inode in get_caps log message

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #14087 from jcsp/wip-doc-fscid
John Spray [Thu, 13 Apr 2017 16:42:13 +0000 (17:42 +0100)]
Merge pull request #14087 from jcsp/wip-doc-fscid

doc: how to specify filesystem for cephfs clients

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agomds: ignore ENOENT on writing backtrace 14207/head
John Spray [Tue, 28 Mar 2017 18:13:33 +0000 (14:13 -0400)]
mds: ignore ENOENT on writing backtrace

We get ENOENT when a pool doesn't exist.  This can
happen because we don't prevent people deleting
former cephfs data pools whose files may not have
had their metadata flushed yet.

http://tracker.ceph.com/issues/19401
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agorgw_file: don't expire directories being read 14458/head
Matt Benjamin [Tue, 11 Apr 2017 10:42:07 +0000 (06:42 -0400)]
rgw_file: don't expire directories being read

If a readdir expire event turns out to be older than last_readdir,
just reschedule it (but actually, we should just discard it, as
another expire event must be in queue.

Fixes: http://tracker.ceph.com/issues/19625
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agomon: emit cluster log messages on MDS health changes
John Spray [Fri, 7 Apr 2017 13:24:01 +0000 (09:24 -0400)]
mon: emit cluster log messages on MDS health changes

Previously, when we got a beacon that updated the health
metrics for an MDS, the user would just see mysterious-looking
cluster log messages indicating a rising fsmap epoch number.

It would be good to do this for health messages in general at
some point, but for now just do it for the MDS ones.

Fixes: http://tracker.ceph.com/issues/19551
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: fix mgrc shutdown 14505/head
John Spray [Thu, 13 Apr 2017 15:00:46 +0000 (11:00 -0400)]
mds: fix mgrc shutdown

Were previously only tearing MgrClient down when not
holding a rank, leading to it trying to continue
to run after monclient was shut down.

Fixes: http://tracker.ceph.com/issues/19566
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agorgw_file: chunked readdir
Matt Benjamin [Tue, 11 Apr 2017 09:56:13 +0000 (05:56 -0400)]
rgw_file:  chunked readdir

Adjust readdir callback path for new nfs-ganesha chunked readdir,
including changes to respect the result of callback to not
continue.

Pending introduction of offset name hint, our caller will just be
completely enumerating, so it is possible to remove the offset map
and just keep a last offset.

Fixes: http://tracker.ceph.com/issues/19624
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: introduce rgw_lookup type hints
Matt Benjamin [Wed, 5 Apr 2017 00:16:13 +0000 (20:16 -0400)]
rgw_file: introduce rgw_lookup type hints

The new type hints optimize object type deduction, when the
rgw_lookup is called from an rgw_readdir callback.

Fixes: http://tracker.ceph.com/issues/19623
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #14468 from tchaikov/wip-show-me-fake-plugin
Kefu Chai [Thu, 13 Apr 2017 14:24:03 +0000 (22:24 +0800)]
Merge pull request #14468 from tchaikov/wip-show-me-fake-plugin

qa/workunits/ceph-helpers: display rejected string

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agomon/OSDMonitor: fix initial map when require_luminous_osds not set on mkfs
Sage Weil [Wed, 12 Apr 2017 02:35:32 +0000 (22:35 -0400)]
mon/OSDMonitor: fix initial map when require_luminous_osds not set on mkfs

If we don't set the luminous flag, we should not set the new luninous
fields or else we'll get a crc mismatch.  (Funnily that happens in the
epoch where the flag is eventually set and the encoded map finally includes
the field we have set in memory.)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: ignore health checks about require_luminous if debug flag is set
Sage Weil [Mon, 10 Apr 2017 22:31:22 +0000 (18:31 -0400)]
mon/OSDMonitor: ignore health checks about require_luminous if debug flag is set

This makes it tedious for teuthology health checks to proceed when we
deliberately run luminous osds without this flag.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocephfs: fix write_buf's _len overflow problem 13587/head
Yang Honggang [Thu, 13 Apr 2017 12:09:07 +0000 (20:09 +0800)]
cephfs: fix write_buf's _len overflow problem

After I have set about 400 64KB xattr kv pair to a file,
mds is crashed. Every time I try to start mds, it will crash again.
The root reason is write_buf._len overflowed when doing
Journaler::append_entry().

This patch try to fix this problem through the following changes:

 1. limit file/dir's xattr size
 2. throttle journal entry append operations

Fixes: http://tracker.ceph.com/issues/19033
Signed-off-by: Yang Honggang joseph.yang@xtaotech.com
8 years agoMerge pull request #14234 from jcsp/wip-19406-dirhash
John Spray [Thu, 13 Apr 2017 11:01:28 +0000 (12:01 +0100)]
Merge pull request #14234 from jcsp/wip-19406-dirhash

tools/cephfs: set dir_layout when injecting inodes

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #14472 from joscollin/wip-warning-test
Kefu Chai [Thu, 13 Apr 2017 08:28:12 +0000 (16:28 +0800)]
Merge pull request #14472 from joscollin/wip-warning-test

test: add explicit braces to avoid ambiguous ‘else’ and to silence warnings

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14495 from tchaikov/wip-cmake-ctags-without-repo
Kefu Chai [Thu, 13 Apr 2017 07:35:09 +0000 (15:35 +0800)]
Merge pull request #14495 from tchaikov/wip-cmake-ctags-without-repo

cmake: do not try to add submodule to exclude list if .git is not around

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14404 from tchaikov/wip-another-mgr-command
Kefu Chai [Thu, 13 Apr 2017 05:57:42 +0000 (13:57 +0800)]
Merge pull request #14404 from tchaikov/wip-another-mgr-command

mon,mgr: move reweight-by-* to mgr

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agocmake: do not try to add submodule to exclude list if .git is not around 14495/head
Kefu Chai [Thu, 13 Apr 2017 05:46:31 +0000 (13:46 +0800)]
cmake: do not try to add submodule to exclude list if .git is not around

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14445 from dillaman/wip-rbd-import-diff
Mykola Golub [Thu, 13 Apr 2017 05:00:05 +0000 (08:00 +0300)]
Merge pull request #14445 from dillaman/wip-rbd-import-diff

rbd: import-diff should discard any zeroed extents

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14474 from Wilhelmshaven/fix_non-exist_string
Matt Benjamin [Thu, 13 Apr 2017 01:00:59 +0000 (21:00 -0400)]
Merge pull request #14474 from Wilhelmshaven/fix_non-exist_string

rgw: avoid using null pointer in rgw_file.cc

8 years agomds: Return error message instead of asserting 14469/head
Brad Hubbard [Wed, 12 Apr 2017 06:21:51 +0000 (16:21 +1000)]
mds: Return error message instead of asserting

For "session evict" admin socket command return an error message when we
receive an invalid/missing client_id parameter rather than asserting.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agomon/OSDMonitor: add mon_debug_no_require_luminous
Sage Weil [Wed, 22 Feb 2017 01:13:23 +0000 (19:13 -0600)]
mon/OSDMonitor: add mon_debug_no_require_luminous

Add debug option not to set the require_luminous osdmap flag on mkfs, for
debugging purposes.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14482 from trociny/wip-qa-diff
Jason Dillaman [Wed, 12 Apr 2017 20:43:21 +0000 (16:43 -0400)]
Merge pull request #14482 from trociny/wip-qa-diff

qa/workunits/rbd: diff.sh failed removing nonexistent file

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agotools/cephfs: set dir_layout when injecting inodes 14234/head
John Spray [Wed, 29 Mar 2017 18:38:37 +0000 (19:38 +0100)]
tools/cephfs: set dir_layout when injecting inodes

When we left this as zero, the MDS would interpret it was HASH_LINUX
rather than the default HASH_RJENKINS.  Potentially that
could cause problems if there perhaps were already dirfrags in
the metadata pool that were set up using rjenkins.  Mainly
it just seems more appropriate to explicitly set this field
rather than hit the fallback behaviour.

Related: http://tracker.ceph.com/issues/19406
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14463 from trociny/wip-19451
Jason Dillaman [Wed, 12 Apr 2017 19:02:16 +0000 (15:02 -0400)]
Merge pull request #14463 from trociny/wip-19451

pybind/rbd: add image metadata methods

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14471 from trociny/wip-19588
Jason Dillaman [Wed, 12 Apr 2017 19:01:56 +0000 (15:01 -0400)]
Merge pull request #14471 from trociny/wip-19588

librbd: fix rbd_metadata_list and rbd_metadata_get

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoos/bluestore: fix narrow osr->flush() race 14489/head
Sage Weil [Wed, 12 Apr 2017 18:19:46 +0000 (14:19 -0400)]
os/bluestore: fix narrow osr->flush() race

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14484 from dillaman/wip-librados-test-stub
Mykola Golub [Wed, 12 Apr 2017 18:04:42 +0000 (21:04 +0300)]
Merge pull request #14484 from dillaman/wip-librados-test-stub

test/librados_test_stub: fixed cls_cxx_map_get_keys/vals return value

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14375 from cbodley/wip-rgw-fetch-versioned-obj
Yehuda Sadeh [Wed, 12 Apr 2017 16:02:44 +0000 (09:02 -0700)]
Merge pull request #14375 from cbodley/wip-rgw-fetch-versioned-obj

8 years agoqa/suites: add mon-reweight-min-pgs-per-osd = 4 14404/head
Kefu Chai [Wed, 12 Apr 2017 15:29:08 +0000 (23:29 +0800)]
qa/suites: add mon-reweight-min-pgs-per-osd = 4

so we can run reweight commands in a small cluster with 3 OSD and 27
PGs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14476 from wjwithagen/wip-wjw-freebsd-ceph-disk-call-rc.d
Loic Dachary [Wed, 12 Apr 2017 15:04:35 +0000 (17:04 +0200)]
Merge pull request #14476 from wjwithagen/wip-wjw-freebsd-ceph-disk-call-rc.d

ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agotest/librados_test_stub: fixed cls_cxx_map_get_keys/vals return value 14484/head
Jason Dillaman [Wed, 12 Apr 2017 14:47:28 +0000 (10:47 -0400)]
test/librados_test_stub: fixed cls_cxx_map_get_keys/vals return value

Fixes: http://tracker.ceph.com/issues/19597
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14399 from ifed01/wip-bluestore-better-better-reuse
Sage Weil [Wed, 12 Apr 2017 14:31:45 +0000 (09:31 -0500)]
Merge pull request #14399 from ifed01/wip-bluestore-better-better-reuse

os/bluestore: refactor small write handling to reuse blob more effect…

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14422 from tchaikov/wip-19427
Sage Weil [Wed, 12 Apr 2017 14:28:38 +0000 (09:28 -0500)]
Merge pull request #14422 from tchaikov/wip-19427

mon/MonClient: make get_mon_log_message() atomic

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14439 from adamemerson/wip-warning-sign
Sage Weil [Wed, 12 Apr 2017 14:28:10 +0000 (09:28 -0500)]
Merge pull request #14439 from adamemerson/wip-warning-sign

misc: Warning Elimination

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/workunits/rbd: diff.sh failed removing nonexistent file 14482/head
Mykola Golub [Wed, 12 Apr 2017 14:18:52 +0000 (16:18 +0200)]
qa/workunits/rbd: diff.sh failed removing nonexistent file

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14347 from ukernel/wip-19501
John Spray [Wed, 12 Apr 2017 13:28:11 +0000 (14:28 +0100)]
Merge pull request #14347 from ukernel/wip-19501

mds: make C_MDSInternalNoop::complete() delete 'this'

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agobluestore, NVMEDevice: Add multiple thread support for SPDK I/O thread 14420/head
Ziye Yang [Wed, 29 Mar 2017 06:04:21 +0000 (14:04 +0800)]
bluestore, NVMEDevice: Add multiple thread support for SPDK I/O thread

Previously, we only have one thread to do SPDK I/O, and this patch
adds the multiple thread support.

In this first version, we use the tid of the thread to map the I/Os
of this thread to the corresponding SPDK I/O thread.

Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
8 years agorbd: import-diff should discard any zeroed extents 14445/head
Jason Dillaman [Tue, 11 Apr 2017 01:09:01 +0000 (21:09 -0400)]
rbd: import-diff should discard any zeroed extents

Sparse (zeroed) extents cannot be safely skipped. Instead, the
zeroed extent should be discarded from the image to ensure
the import remains consistent with the export.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14460 from dillaman/wip-qa-rbd-cli
Mykola Golub [Wed, 12 Apr 2017 12:44:25 +0000 (15:44 +0300)]
Merge pull request #14460 from dillaman/wip-qa-rbd-cli

qa/workunits: corrected issues with RBD cli test

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoclient/Client.cc: add feature to reconnect client after MDS reset 13522/head
Henrik Korkuc [Sun, 19 Feb 2017 09:44:20 +0000 (11:44 +0200)]
client/Client.cc: add feature to reconnect client after MDS reset

Client.cc marks session as stale instead of reconecting after received
reset from MDS. On MDS side session is closed so MDS is ignoring cap
renew. This adds option to reconnect stale client sessions instead of
just marking sessions stale.

Fixes: http://tracker.ceph.com/issues/18757
Signed-off-by: Henrik Korkuc <henrik@kirneh.eu>
8 years agoceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts 14476/head
Willem Jan Withagen [Wed, 12 Apr 2017 12:02:26 +0000 (14:02 +0200)]
ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts

 - rc.d/ceph does not really like the extra stop/start as las cmd.
 - And make Start and Stop look similar.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agotest: add explicit braces to avoid ambiguous ‘else’ and to silence warnings 14472/head
Jos Collin [Wed, 12 Apr 2017 09:18:43 +0000 (14:48 +0530)]
test: add explicit braces to avoid ambiguous ‘else’ and to silence warnings

The following warning appears during make for several files in the test submodule:
warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wdangling-else]

Fixed the review comment too.

Signed-off-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #14467 from badone/wip-debug-mon-features-api-removal-cleanup
Brad Hubbard [Wed, 12 Apr 2017 10:10:29 +0000 (20:10 +1000)]
Merge pull request #14467 from badone/wip-debug-mon-features-api-removal-cleanup

mon: Tidy up removal of debug mon features

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/workunits/ceph-helpers: do not error out if is_clean 14468/head
Kefu Chai [Wed, 12 Apr 2017 09:31:52 +0000 (17:31 +0800)]
qa/workunits/ceph-helpers: do not error out if is_clean

it would be a race otherwise, because we cannot be sure that the cluster
pgs are not all clean or not when run_osd() returns, but we can be sure
that they are expected to active+clean after a while. that's what
wait_for_clean() does.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agorgw: avoid using null pointer in rgw_file.cc 14474/head
lihongjie [Wed, 12 Apr 2017 09:18:01 +0000 (17:18 +0800)]
rgw: avoid using null pointer in rgw_file.cc

When rgw_fh doesn't exist, we should not use rgw_fh->full_object_name().

Signed-off-by: lihongjie <lihongjie@cmss.chinamobile.com>
8 years agopybind/rbd: add image metadata methods 14463/head
Mykola Golub [Tue, 11 Apr 2017 20:34:34 +0000 (22:34 +0200)]
pybind/rbd: add image metadata methods

Fixes: http://tracker.ceph.com/issues/19451
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: fix rbd_metadata_list and rbd_metadata_get 14471/head
Mykola Golub [Tue, 11 Apr 2017 20:31:43 +0000 (22:31 +0200)]
librbd: fix rbd_metadata_list and rbd_metadata_get

- properly check for val_len in rbd_metadata_list
- don't expect output buffers are zero pre-filled

Fixes: http://tracker.ceph.com/issues/19588
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoqa/workunits/ceph-helpers: display rejected string
Kefu Chai [Wed, 12 Apr 2017 04:33:53 +0000 (12:33 +0800)]
qa/workunits/ceph-helpers: display rejected string

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14361 from ShiqiCooperation/master
Haomai Wang [Wed, 12 Apr 2017 07:41:29 +0000 (15:41 +0800)]
Merge pull request #14361 from ShiqiCooperation/master

mailmap: shiqi affiliation

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14446 from badone/wip-cppcheck-errors
Brad Hubbard [Wed, 12 Apr 2017 06:25:18 +0000 (16:25 +1000)]
Merge pull request #14446 from badone/wip-cppcheck-errors

Wip cppcheck errors

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest: Suppress cppcheck error 14446/head
Brad Hubbard [Tue, 11 Apr 2017 01:54:32 +0000 (11:54 +1000)]
test: Suppress cppcheck error

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14419 from badone/wip-doc-pg-states-min_size
Sage Weil [Wed, 12 Apr 2017 02:10:35 +0000 (21:10 -0500)]
Merge pull request #14419 from badone/wip-doc-pg-states-min_size

docs: Clarify the relationship of min_size to EC pool recovery

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agomon: Tidy up removal of debug mon features 14467/head
Brad Hubbard [Wed, 12 Apr 2017 00:47:38 +0000 (10:47 +1000)]
mon: Tidy up removal of debug mon features

545bc83 removed most of the plumbing for the debug mon features admin
socket commands but failed to remove the register/unregister command
pairs. This means the monitor asserts if an attempt is made to use any
of these commands.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14290 from wjwithagen/wip-wjw-freebsd-procprefix
Yuri Weinstein [Tue, 11 Apr 2017 22:07:45 +0000 (15:07 -0700)]
Merge pull request #14290 from wjwithagen/wip-wjw-freebsd-procprefix

core: Prefix /proc/ with FreeBSD emulation

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14362 from majianpeng/fs-remove-redundant-code
Yuri Weinstein [Tue, 11 Apr 2017 22:06:44 +0000 (15:06 -0700)]
Merge pull request #14362 from majianpeng/fs-remove-redundant-code

os/fs/FS.cc: remove the redundant code.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14462 from pdinnen/patch-2
Sage Weil [Tue, 11 Apr 2017 22:00:39 +0000 (17:00 -0500)]
Merge pull request #14462 from pdinnen/patch-2

doc: correct arguments for ceph tell osd.N bench

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agodoc: correct arguments for ceph tell osd.N bench 14462/head
Patrick Dinnen [Tue, 11 Apr 2017 19:57:11 +0000 (15:57 -0400)]
doc: correct arguments for ceph tell osd.N bench

Signed-off-by: Patrick Dinnen pdinnen@gmail.com
8 years agoMerge pull request #14461 from dmick/master
Josh Durgin [Tue, 11 Apr 2017 19:35:48 +0000 (12:35 -0700)]
Merge pull request #14461 from dmick/master

stop.sh: boilerplate error (don't stop mon when stopping mgr)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agostop.sh: boilerplate error (don't stop mon when stopping mgr) 14461/head
Dan Mick [Tue, 11 Apr 2017 01:35:12 +0000 (18:35 -0700)]
stop.sh: boilerplate error (don't stop mon when stopping mgr)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoMerge pull request #14376 from cbodley/wip-rgw-forward-canned-acl
Orit Wasserman [Tue, 11 Apr 2017 17:30:33 +0000 (20:30 +0300)]
Merge pull request #14376 from cbodley/wip-rgw-forward-canned-acl

rgw: fix for EINVAL errors on forwarded bucket put_acl requests
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #13105 from rjfd/wip-18481
Jason Dillaman [Tue, 11 Apr 2017 15:24:21 +0000 (11:24 -0400)]
Merge pull request #13105 from rjfd/wip-18481

librbd: deferred image deletion

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/workunits: corrected issues with RBD cli test 14460/head
Jason Dillaman [Tue, 11 Apr 2017 15:18:29 +0000 (11:18 -0400)]
qa/workunits: corrected issues with RBD cli test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14355 from cbodley/wip-19505
Casey Bodley [Tue, 11 Apr 2017 15:13:04 +0000 (11:13 -0400)]
Merge pull request #14355 from cbodley/wip-19505

rgw: allow larger payload for period commit

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #14319 from cbodley/wip-19488
Casey Bodley [Tue, 11 Apr 2017 15:12:44 +0000 (11:12 -0400)]
Merge pull request #14319 from cbodley/wip-19488

rgw: multisite: fixes for zonegroup redirect

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>