]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agocephfs: fix missing ll_get for ll_walk 12061/head
Gui Hecheng [Thu, 17 Nov 2016 10:01:22 +0000 (18:01 +0800)]
cephfs: fix missing ll_get for ll_walk

Fixs: http://tracker.ceph.com/issues/18086

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
8 years agoMerge pull request #12178 from liupan1111/wip-fix-bug-hb-out
Josh Durgin [Tue, 29 Nov 2016 22:26:04 +0000 (14:26 -0800)]
Merge pull request #12178 from liupan1111/wip-fix-bug-hb-out

osd: replace hb_out and hb_in with a single hb_peers

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12220 from liewegas/wip-coverity
Jason Dillaman [Tue, 29 Nov 2016 20:47:36 +0000 (15:47 -0500)]
Merge pull request #12220 from liewegas/wip-coverity

librbd/ImageCtx: no need for virtual dtor

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12219 from zealoussnow/wip-1130
Sage Weil [Tue, 29 Nov 2016 20:14:25 +0000 (15:14 -0500)]
Merge pull request #12219 from zealoussnow/wip-1130

osdc: pass a string reference type to "osdmap->lookup_pg_pool_name"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12166 from liewegas/wip-osdmap-encoding
Sage Weil [Tue, 29 Nov 2016 20:10:04 +0000 (15:10 -0500)]
Merge pull request #12166 from liewegas/wip-osdmap-encoding

osd: condition OSDMap encoding on features

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12202 from liewegas/wip-bluestore-coverity
Mark Nelson [Tue, 29 Nov 2016 19:44:55 +0000 (13:44 -0600)]
Merge pull request #12202 from liewegas/wip-bluestore-coverity

os/bluestore: misc coverity fixes/cleanups

8 years agoMerge pull request #12047 from rzarzynski/wip-rgw-17931
Matt Benjamin [Tue, 29 Nov 2016 19:27:09 +0000 (14:27 -0500)]
Merge pull request #12047 from rzarzynski/wip-rgw-17931

rgw: add support for the prefix parameter in account listing of Swift API

8 years agoMerge pull request #11671 from linuxbox2/rgw_file-17663
Yehuda Sadeh [Tue, 29 Nov 2016 18:42:12 +0000 (10:42 -0800)]
Merge pull request #11671 from linuxbox2/rgw_file-17663

rgw_file:  apply missed base64 try-catch

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11751 from yehudasa/wip-17788
Matt Benjamin [Tue, 29 Nov 2016 18:41:36 +0000 (13:41 -0500)]
Merge pull request #11751 from yehudasa/wip-17788

rgw: extract host name from host:port string

8 years agoMerge pull request #12217 from dzafman/wip-tests-off
Samuel Just [Tue, 29 Nov 2016 18:13:54 +0000 (10:13 -0800)]
Merge pull request #12217 from dzafman/wip-tests-off

Turn off tests again due to Jenkins failures

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12204 from liewegas/wip-bluestore-17824
Mark Nelson [Tue, 29 Nov 2016 17:20:31 +0000 (11:20 -0600)]
Merge pull request #12204 from liewegas/wip-bluestore-17824

os/bluestore/KernelDevice: fix race in aio_thread vs aio_wait

8 years agoMerge pull request #12130 from liupan1111/wip-osd-hearteat
Sage Weil [Tue, 29 Nov 2016 17:13:19 +0000 (12:13 -0500)]
Merge pull request #12130 from liupan1111/wip-osd-hearteat

osd: remove redudant call of heartbeat_check

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12169 from liewegas/wip-rados-bench-hints
Sage Weil [Tue, 29 Nov 2016 17:11:53 +0000 (12:11 -0500)]
Merge pull request #12169 from liewegas/wip-rados-bench-hints

rados: add hints to rados bench

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoosdc: pass a string reference type to "osdmap->lookup_pg_pool_name" 12219/head
Leo Zhang [Tue, 29 Nov 2016 16:32:29 +0000 (00:32 +0800)]
osdc: pass a string reference type to "osdmap->lookup_pg_pool_name"

Signed-off-by: Leo Zhang <nguzcf@gmail.com>
8 years agotest: Turn off test-erasure-eio.sh due to Jenkins failures 12217/head
David Zafman [Tue, 29 Nov 2016 16:04:19 +0000 (08:04 -0800)]
test: Turn off test-erasure-eio.sh due to Jenkins failures

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agotest: Turn off osd-scrub-repair.sh due to Jenkins failures
David Zafman [Tue, 29 Nov 2016 16:02:50 +0000 (08:02 -0800)]
test: Turn off osd-scrub-repair.sh due to Jenkins failures

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #11764 from bassamtabbara/wip-embedded
Kefu Chai [Tue, 29 Nov 2016 11:53:45 +0000 (19:53 +0800)]
Merge pull request #11764 from bassamtabbara/wip-embedded

cmake: Support for embedding Ceph Daemons

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12097 from ceph/wip-17837
John Spray [Tue, 29 Nov 2016 11:50:09 +0000 (11:50 +0000)]
Merge pull request #12097 from ceph/wip-17837

src/mds: fix MDSMap upgrade decoding

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #12090 from wjwithagen/wip-wjw-do_freebsd.sh
Kefu Chai [Tue, 29 Nov 2016 11:45:07 +0000 (19:45 +0800)]
Merge pull request #12090 from wjwithagen/wip-wjw-do_freebsd.sh

FreeBSD: do_freebsd.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoosd: replace hb_out and hb_in with a single hb_peers 12178/head
Pan Liu [Tue, 29 Nov 2016 09:39:51 +0000 (17:39 +0800)]
osd: replace hb_out and hb_in with a single hb_peers

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agoMerge pull request #12200 from ddiss/tracker18049_ceph_disk_trigger_flock_timeout
Loic Dachary [Tue, 29 Nov 2016 08:08:49 +0000 (09:08 +0100)]
Merge pull request #12200 from ddiss/tracker18049_ceph_disk_trigger_flock_timeout

systemd/ceph-disk: reduce ceph-disk flock contention

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12180 from tchaikov/wip-silence-get_timeout_delays
Loic Dachary [Tue, 29 Nov 2016 08:06:43 +0000 (09:06 +0100)]
Merge pull request #12180 from tchaikov/wip-silence-get_timeout_delays

tests: disable the echo when running get_timeout_delays()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoembedded: Add RADOS classes to embedded cephd library 11764/head
Bassam Tabbara [Sat, 5 Nov 2016 01:10:08 +0000 (18:10 -0700)]
embedded: Add RADOS classes to embedded cephd library

RADOS classes can now be statically compiled and added to
the embedded cephd library.

The RADOS ClassHandler now has an option to skip calling dlclose
just like PluginRegistry.

All RADOS classes where changed to use a CLS_INIT macro that
will either use __cls_init or classname_cls_init. this enables
the static compiling of all RADOS classes in a single library. Also
global method definitions where moved to inside cls_init.

Also added a few aconfig defines including WITH_EMBEDDED, WITH_CEPHFS,
WITH_RBD, and WITH_KVS. Note that WITH_RBD was not defined before
and the ceph-dencoder was broken when it was turned on.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoembedded: Add librbd and librados to embedded ceph
Bassam Tabbara [Sat, 5 Nov 2016 01:10:08 +0000 (18:10 -0700)]
embedded: Add librbd and librados to embedded ceph

This commit add librados, librbd to the embedded ceph static library. This is needed to support daemons built with libcephd that want to run mon commands, create rbd volumes, snapshots etc.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoembedded: Support for running MON and OSD from libcephd
Bassam Tabbara [Sat, 5 Nov 2016 01:10:08 +0000 (18:10 -0700)]
embedded: Support for running MON and OSD from libcephd

Added supported for running MON and OSD daemon code almost
untouched directly from libcephd.

Also added two API functions for generating an FSID and secret
key that can be used to bootstrap a new cluster.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoembedded: add compression and EC plugins to libcephd
Bassam Tabbara [Sat, 5 Nov 2016 01:10:08 +0000 (18:10 -0700)]
embedded: add compression and EC plugins to libcephd

Compression and erasure coding plugins are now statically compiled
into libcephd. A new method is added to load them into the
respective registry.

The static libraries are only built when WITH_EMBEDDED is enabled
and existing plugins are unaffected.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoembedded: Add a skeleton libcephd library
Bassam Tabbara [Sat, 5 Nov 2016 01:10:08 +0000 (18:10 -0700)]
embedded: Add a skeleton libcephd library

libcephd is a library that contains ceph daemon code
that can be statically linked in other applications.

Added MergeStaticLibraries.cmake that can merge static libraries
to form a bigger one. This approach avoids the need to mess with
STATIC libraries all over the code base.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agolibrbd/ImageCtx: no need for virtual dtor 12220/head
Sage Weil [Tue, 29 Nov 2016 03:47:53 +0000 (22:47 -0500)]
librbd/ImageCtx: no need for virtual dtor

CID 1396232 (#1 of 1): Non-virtual destructor (VIRTUAL_DTOR)
1. nonvirtual_dtor: Class librbd::<unnamed>::SafeTimerSingleton has a destructor and a pointer to it is upcast to class SafeTimer which doesn't have a virtual destructor.

The SafeTimerSingleton is not polymorphic; no need for
a virtual dtor.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12170 from dzafman/wip-ec-error-tests
Kefu Chai [Tue, 29 Nov 2016 03:47:35 +0000 (11:47 +0800)]
Merge pull request #12170 from dzafman/wip-ec-error-tests

test: test-erasure-eio.sh fix recovery testing and enable it

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #10672 from ceph/wip-rgw-http-getcmd
Yehuda Sadeh [Mon, 28 Nov 2016 23:06:12 +0000 (15:06 -0800)]
Merge pull request #10672 from ceph/wip-rgw-http-getcmd

RGWHTTPArgs::get_str() - return argument string that was set.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #10546 from cbodley/wip-rgw-log-trim-lease
Yehuda Sadeh [Mon, 28 Nov 2016 23:04:15 +0000 (15:04 -0800)]
Merge pull request #10546 from cbodley/wip-rgw-log-trim-lease

rgw multisite: use a rados lock to coordinate data log trimming

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #12114 from liewegas/wip-bluestore-failops
Sage Weil [Mon, 28 Nov 2016 22:06:19 +0000 (17:06 -0500)]
Merge pull request #12114 from liewegas/wip-bluestore-failops

os/bluestore: mark ops that can't tolerate ENOENT

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12022 from jcsp/wip-17853
Gregory Farnum [Mon, 28 Nov 2016 21:28:21 +0000 (16:28 -0500)]
Merge pull request #12022 from jcsp/wip-17853

mds: more deterministic timing on frag split/join

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #12094 from 363921219/cleanup_C_CompleteSplits
Sage Weil [Mon, 28 Nov 2016 21:21:52 +0000 (16:21 -0500)]
Merge pull request #12094 from 363921219/cleanup_C_CompleteSplits

osd: cleanup C_CompleteSplits::finish()

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12148 from tchaikov/wip-scan-build-fixes
Sage Weil [Mon, 28 Nov 2016 21:21:08 +0000 (16:21 -0500)]
Merge pull request #12148 from tchaikov/wip-scan-build-fixes

scan build fixes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12099 from wjin/fix_filestore_perfcounter
Sage Weil [Mon, 28 Nov 2016 21:18:56 +0000 (16:18 -0500)]
Merge pull request #12099 from wjin/fix_filestore_perfcounter

os/filestore: fix journal logger

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoos/bluestore/KernelDevice: fix race in aio_thread vs aio_wait 12204/head
Sage Weil [Mon, 28 Nov 2016 20:56:29 +0000 (15:56 -0500)]
os/bluestore/KernelDevice: fix race in aio_thread vs aio_wait

The caller is free to destroy the aio vector contents
once aio_wait completes.  This is exactly what
BlueFS::_fsync() does.  Delay the num_running dec
(which is what aio_wait waits for) until after we've
examined the aios.

Fixes: http://tracker.ceph.com/issues/17824
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/Transaction: add missing break 12202/head
Sage Weil [Mon, 28 Nov 2016 19:26:51 +0000 (14:26 -0500)]
os/Transaction: add missing break

CID 1395137 (#1 of 1): Missing break in switch (MISSING_BREAK)
unterminated_case: The case for value ObjectStore::Transaction::OP_TRY_RENAME is not terminated by a 'break' statement.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/ObjectStore: pass by ref to clone
Sage Weil [Mon, 28 Nov 2016 19:26:21 +0000 (14:26 -0500)]
os/ObjectStore: pass by ref to clone

CID 1395658 (#1 of 1): Big parameter passed by value (PASS_BY_VALUE)
pass_by_value: Passing parameter noid of type ghobject_t (size 144 bytes) by value.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/ObjectStore: pass by ref to clone_range
Sage Weil [Mon, 28 Nov 2016 19:25:39 +0000 (14:25 -0500)]
os/ObjectStore: pass by ref to clone_range

CID 1395650 (#1 of 1): Big parameter passed by value (PASS_BY_VALUE)
pass_by_value: Passing parameter noid of type ghobject_t (size 144 bytes) by value.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/ObjectStore: add missing break
Sage Weil [Mon, 28 Nov 2016 19:24:57 +0000 (14:24 -0500)]
os/ObjectStore: add missing break

CID 1394998 (#1 of 1): Missing break in switch (MISSING_BREAK)
unterminated_case: The case for value ObjectStore::Transaction::OP_TRY_RENAME is not terminated by a 'break' statement.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: be pedantic about kv_stop locking
Sage Weil [Mon, 28 Nov 2016 19:23:36 +0000 (14:23 -0500)]
os/bluestore: be pedantic about kv_stop locking

Makes coverity happy.

CID 1395346 (#1 of 1): Data race condition (MISSING_LOCK)
1. missing_lock: Accessing this->kv_stop without holding lock BlueStore.kv_lock. Elsewhere, "BlueStore.kv_stop" is accessed with BlueStore.kv_lock held 1 out of 2 times (1 of these accesses strongly imply that it is necessary).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: init all fields
Sage Weil [Mon, 28 Nov 2016 19:22:32 +0000 (14:22 -0500)]
os/bluestore: init all fields

9. uninit_member: Non-static class member block_size is not initialized in this constructor nor in any functions that it calls.
     11. uninit_member: Non-static class member block_mask is not initialized in this constructor nor in any functions that it calls.
     13. uninit_member: Non-static class member block_size_order is not initialized in this constructor nor in any functions that it calls.

CID 1396159 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
15. uninit_member: Non-static class member max_alloc_size is not initialized in this constructor nor in any functions that it calls.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/ObjectStore: pass by ref to collection_list
Sage Weil [Mon, 28 Nov 2016 19:21:27 +0000 (14:21 -0500)]
os/ObjectStore: pass by ref to collection_list

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: pass by ref to _collection_list
Sage Weil [Mon, 28 Nov 2016 19:15:33 +0000 (14:15 -0500)]
os/bluestore: pass by ref to _collection_list

CID 1395617 (#1 of 1): Big parameter passed by value (PASS_BY_VALUE)
pass_by_value: Passing parameter end of type ghobject_t (size 144 bytes) by value.
     pass_by_value: Passing parameter start of type ghobject_t (size 144 bytes) by value.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlueRocksEnv: fix strerror args
Sage Weil [Mon, 28 Nov 2016 19:11:54 +0000 (14:11 -0500)]
os/bluestore/BlueRocksEnv: fix strerror args

CID 1395399 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
negative_returns: A negative constant -2 is passed as an argument to a parameter that cannot be negative.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlueFS: init iocv
Sage Weil [Mon, 28 Nov 2016 19:09:45 +0000 (14:09 -0500)]
os/bluestore/BlueFS: init iocv

CID 1396119 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member field iocv._M_elems is not initialized in this constructor nor in any functions that it calls.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlueFS: check flush result
Sage Weil [Mon, 28 Nov 2016 18:45:35 +0000 (13:45 -0500)]
os/bluestore/BlueFS: check flush result

CID 1394759 (#1 of 1): Unchecked return value (CHECKED_RETURN)
20. check_return: Calling _flush without checking return value (as is done elsewhere 4 out of 5 times).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlockDevice: init rotational
Sage Weil [Mon, 28 Nov 2016 18:44:05 +0000 (13:44 -0500)]
os/bluestore/BlockDevice: init rotational

CID 1396126 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
2. uninit_member: Non-static class member rotational is not initialized in this constructor nor in any functions that it calls.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12201 from tchaikov/wip-memstore-leak
Kefu Chai [Mon, 28 Nov 2016 17:08:14 +0000 (01:08 +0800)]
Merge pull request #12201 from tchaikov/wip-memstore-leak

os/memstore: fix a mem leak in MemStore::Collection::create_object()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agosystemd/ceph-disk: reduce ceph-disk flock contention 12200/head
David Disseldorp [Mon, 28 Nov 2016 13:16:22 +0000 (14:16 +0100)]
systemd/ceph-disk: reduce ceph-disk flock contention

"ceph-disk trigger" invocation is currently performed in a mutually
exclusive fashion, with each call first taking an flock on the path
/var/lock/ceph-disk. On systems with a lot of osds, this leads to a
large amount of lock contention during boot-up, and can cause some
service instances to trip the 120 second timeout.

Take an flock on a device specific path instead of /var/lock/ceph-disk,
so that concurrent "ceph-disk trigger" invocations are permitted for
independent osds. This greatly reduces lock contention and consequently
the chance of service timeout. Per-device concurrency restrictions
required for http://tracker.ceph.com/issues/13160 are maintained.

Fixes: http://tracker.ceph.com/issues/18049
Signed-off-by: David Disseldorp <ddiss@suse.de>
8 years agoos/memstore: fix a mem leak in MemStore::Collection::create_object() 12201/head
Kefu Chai [Mon, 28 Nov 2016 14:47:19 +0000 (22:47 +0800)]
os/memstore: fix a mem leak in MemStore::Collection::create_object()

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agorados: add hints to rados bench 12169/head
Sage Weil [Wed, 23 Nov 2016 23:16:56 +0000 (18:16 -0500)]
rados: add hints to rados bench

By default, hint with the rados bench IO size and with sequential read
and write flags.  Unless the --no-hints option is passed.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12168 from liewegas/doc-perf
Kefu Chai [Mon, 28 Nov 2016 07:27:52 +0000 (15:27 +0800)]
Merge pull request #12168 from liewegas/doc-perf

doc/dev/perf: a few notes on perf

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12176 from ovh/wip-doc-osd-scrub-during-recovery-chunk-min-max...
Kefu Chai [Mon, 28 Nov 2016 03:40:18 +0000 (11:40 +0800)]
Merge pull request #12176 from ovh/wip-doc-osd-scrub-during-recovery-chunk-min-max-sleep

doc: Add doc about osd scrub {during recovery|chunk {min|max}| sleep}

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #10297 from Yan-waller/yj-wip-msgsimple-0714
Kefu Chai [Mon, 28 Nov 2016 03:07:54 +0000 (11:07 +0800)]
Merge pull request #10297 from Yan-waller/yj-wip-msgsimple-0714

msg/simple: save the errno in case being changed by subsequent codes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11154 from stiopaa1/osd_pg_useMoveOnSharedPtr
Kefu Chai [Mon, 28 Nov 2016 03:07:07 +0000 (11:07 +0800)]
Merge pull request #11154 from stiopaa1/osd_pg_useMoveOnSharedPtr

osd/PG.h: move shared ptr instead of copying it

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12186 from chrone81/patch-1
Kefu Chai [Mon, 28 Nov 2016 03:01:03 +0000 (11:01 +0800)]
Merge pull request #12186 from chrone81/patch-1

doc: Remove duplicate command for Ubuntu

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12106 from ceph/wip-jlayton-libcephfs
John Spray [Mon, 28 Nov 2016 00:00:20 +0000 (00:00 +0000)]
Merge pull request #12106 from ceph/wip-jlayton-libcephfs

API cleanup for libcephfs interfaces

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agodoc: Remove duplicate command for Ubuntu 12186/head
chrone [Fri, 25 Nov 2016 11:45:33 +0000 (18:45 +0700)]
doc: Remove duplicate command for Ubuntu

Remove duplicate "sudo service radosgw restart id=rgw.<short-hostname>" command for Ubuntu in Configure Bucket Sharding.

Signed-off-by: chrone <charlesalva@gmail.com>
8 years agoMerge pull request #11982 from zhouruisong/master
Orit Wasserman [Fri, 25 Nov 2016 16:30:44 +0000 (17:30 +0100)]
Merge pull request #11982 from zhouruisong/master

rgw:bugfix for deleting objects name beginning and ending with underscores of one bucket using POST method of AWS's js sdk.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #9859 from x11562/OSDMap
Kefu Chai [Fri, 25 Nov 2016 15:16:36 +0000 (23:16 +0800)]
Merge pull request #9859 from x11562/OSDMap

mon: osdmap's epoch should be more than 0

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
8 years agoMerge pull request #9172 from majianpeng/librados-add-fullforce
Kefu Chai [Fri, 25 Nov 2016 15:12:45 +0000 (23:12 +0800)]
Merge pull request #9172 from majianpeng/librados-add-fullforce

librados:  For C-API, expose LIBRADOS_OPERATION_FULL_FORCE flag

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #10553 from songbaisen/c3
Kefu Chai [Fri, 25 Nov 2016 15:10:05 +0000 (23:10 +0800)]
Merge pull request #10553 from songbaisen/c3

osd:  remove the redundant clear method in consume_map function

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #12117 from 363921219/cleanup_PeeringWQ_dequeue
Kefu Chai [Fri, 25 Nov 2016 15:07:44 +0000 (23:07 +0800)]
Merge pull request #12117 from 363921219/cleanup_PeeringWQ_dequeue

osd: clean up PeeringWQ::_dequeue(), remove unnecessary variable

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11841 from hjwsm1989/filestore
Kefu Chai [Fri, 25 Nov 2016 15:05:29 +0000 (23:05 +0800)]
Merge pull request #11841 from hjwsm1989/filestore

os/filestore: avoid to get the wrong hardlink number.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11913 from wjwithagen/wip-wjw-freebsd-aio-inline
Kefu Chai [Fri, 25 Nov 2016 15:03:41 +0000 (23:03 +0800)]
Merge pull request #11913 from wjwithagen/wip-wjw-freebsd-aio-inline

os/fs/FS.cc: condition on WITH_AIO for FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #9062 from majianpeng/aio-pwritev
Kefu Chai [Fri, 25 Nov 2016 15:01:07 +0000 (23:01 +0800)]
Merge pull request #9062 from majianpeng/aio-pwritev

os/fs/FS: optimize aio::pwritev which make caller provide length.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #12183 from dachary/wip-17830-eio
Kefu Chai [Fri, 25 Nov 2016 03:20:21 +0000 (11:20 +0800)]
Merge pull request #12183 from dachary/wip-17830-eio

tests: facilitate background process debug in ceph-helpers.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12184 from SUSE/wip-18040
John Spray [Thu, 24 Nov 2016 20:35:00 +0000 (20:35 +0000)]
Merge pull request #12184 from SUSE/wip-18040

doc: we can now run multiple MDS, so qualify warning

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agodoc: we can now run multiple MDS, so qualify warning 12184/head
Nathan Cutler [Thu, 24 Nov 2016 19:29:31 +0000 (20:29 +0100)]
doc: we can now run multiple MDS, so qualify warning

Fixes: http://tracker.ceph.com/issues/18040
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agotests: facilitate background process debug in ceph-helpers.sh 12183/head
Loic Dachary [Thu, 24 Nov 2016 18:52:14 +0000 (19:52 +0100)]
tests: facilitate background process debug in ceph-helpers.sh

When displaying the output of a background process, do it on stderr so
that it is not bufferized. Otherwise the output of the background
process may be displayed after it completed.

Prefix the output of a background process with the PID of the process
known to the parent instead of the PID of the awk process processing the
output. When wait_background loops, it will print the process on which
it is waiting and it is confusing that they do not match with the PID
prefixing the process output.

Refs: http://tracker.ceph.com/issues/17830

Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #11733 from tchaikov/wip-17762
Kefu Chai [Thu, 24 Nov 2016 17:27:53 +0000 (01:27 +0800)]
Merge pull request #11733 from tchaikov/wip-17762

common: release g_ceph_context before returns

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12172 from dachary/wip-17830-eio
Kefu Chai [Thu, 24 Nov 2016 17:24:13 +0000 (01:24 +0800)]
Merge pull request #12172 from dachary/wip-17830-eio

tests: osd-scrub-repair.sh abort if add_something fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotests: disable the echo when running get_timeout_delays() 12180/head
Kefu Chai [Thu, 24 Nov 2016 16:12:57 +0000 (00:12 +0800)]
tests: disable the echo when running get_timeout_delays()

this function is very distracting when one is looking at the log

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocrushtool: do not release g_ceph_context at exit 11733/head
Kefu Chai [Wed, 23 Nov 2016 11:45:57 +0000 (19:45 +0800)]
crushtool: do not release g_ceph_context at exit

it is but a work around of occasionally timeout.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon,test: g_ceph_context->put() upon return
Kefu Chai [Tue, 15 Nov 2016 06:21:03 +0000 (14:21 +0800)]
common,test: g_ceph_context->put() upon return

prior to this change, global_init() could create a new CephContext
and assign it to g_ceph_context. it's our responsibilty to release
the CephContext explicitly using cct->put() before the application
quits. but sometimes, we fail to do so.

in this change, global_init() will return an intrusive_ptr<CephContext>,
which calls `g_ceph_context->put()` in its dtor. this ensures that
the CephContext is always destroyed before main() returns. so the
log is flushed before _log_exp_length is destroyed.

there are two cases where global_pre_init() is called directly.
- ceph_conf.cc: g_ceph_context->put() will be called by an intrusive_ptr<>
  deleter.
- rgw_main.cc: global_init() is called later on on the success code
  path, so it will be taken care of.

Fixes: http://tracker.ceph.com/issues/17762
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: Add doc about osd scrub {during recovery|chunk {min|max}| sleep} 12176/head
Paweł Sadowski [Mon, 21 Nov 2016 09:31:29 +0000 (10:31 +0100)]
doc: Add doc about osd scrub {during recovery|chunk {min|max}| sleep}

Signed-off-by: Paweł Sadowski <pawel.sadowski@corp.ovh.com>
8 years agoMerge pull request #10296 from songbaisen/b4
Loic Dachary [Thu, 24 Nov 2016 13:27:10 +0000 (14:27 +0100)]
Merge pull request #10296 from songbaisen/b4

mon: small change on the HealthMonitor start_epoch  function

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agodoc: explain directory fragmenation settings 12022/head
John Spray [Thu, 17 Nov 2016 17:27:37 +0000 (17:27 +0000)]
doc: explain directory fragmenation settings

...and update the config ref.

Includes the new mds_bal_fragment_fast_factor setting.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: try fragmenting new fragments during split
John Spray [Thu, 24 Nov 2016 10:28:09 +0000 (10:28 +0000)]
mds: try fragmenting new fragments during split

In case insertions have occurred during the split that would
immediately take the new fragments over the split threshold.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: maybe_fragment earlier in openc
John Spray [Thu, 17 Nov 2016 17:05:19 +0000 (17:05 +0000)]
mds: maybe_fragment earlier in openc

Check it during the initial request, not just
on completion, so that when doing lots of creates
we get a chance to split the directory before
it zooms past the size threshold.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds/MDBalancer: separate out fragmentation from hit_dir
John Spray [Thu, 24 Nov 2016 10:27:06 +0000 (10:27 +0000)]
mds/MDBalancer: separate out fragmentation from hit_dir

In _fragment_finish we would like to try splitting
the new frags without applying a spurious hit to their
temperatures.  Same for the start of openc where we would
like to do an early check for splitting without hitting
the dir twice.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: more deterministic timing on frag split/join
John Spray [Wed, 16 Nov 2016 14:08:36 +0000 (14:08 +0000)]
mds: more deterministic timing on frag split/join

...by using timer instead of tick()

Fixes: http://tracker.ceph.com/issues/17853
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds/MDBalancer: remove stale show_imports fn
John Spray [Thu, 17 Nov 2016 23:14:53 +0000 (23:14 +0000)]
mds/MDBalancer: remove stale show_imports fn

This was just dropping its argument and
calling through to show_subtrees.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: remove unused mds_bal_merge_[rd|wr]
John Spray [Thu, 17 Nov 2016 17:09:19 +0000 (17:09 +0000)]
common: remove unused mds_bal_merge_[rd|wr]

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: fix fragment thrasher
John Spray [Thu, 17 Nov 2016 23:19:33 +0000 (23:19 +0000)]
mds: fix fragment thrasher

The allows_dirfrags() test was in the wrong place, causing
in some cases a root fragment to be passed into queue_merge.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: tweak merge/split counters
John Spray [Wed, 16 Nov 2016 22:05:22 +0000 (22:05 +0000)]
mds: tweak merge/split counters

Increment these when we have finished splitting
or merging, not partway through the process.

This makes testing more deterministic: once I've seen
the counter increment, I'm sure that the children
no longer have STATE_FRAGMENTING set as a result of
their parent's split-in-progress.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: include fragmenting in state print
John Spray [Wed, 16 Nov 2016 21:13:12 +0000 (21:13 +0000)]
mds: include fragmenting in state print

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: add a performance counter for dirfrag merge
John Spray [Thu, 10 Nov 2016 15:19:19 +0000 (15:19 +0000)]
mds: add a performance counter for dirfrag merge

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomon: small change on the HealthMonitor start_epoch function 10296/head
songbaisen [Thu, 24 Nov 2016 08:35:44 +0000 (16:35 +0800)]
mon: small change on the HealthMonitor start_epoch function

No need to call start_epoch function each time in the loop.

Signed-off-by: songbaisen <song.baisen@zte.com.cn>
8 years agoMerge pull request #9513 from songbaisen/a5
Loic Dachary [Thu, 24 Nov 2016 07:32:33 +0000 (08:32 +0100)]
Merge pull request #9513 from songbaisen/a5

mon: Forbidden copy and assignment function in monoprequest

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #12085 from wjwithagen/wip-freebsd-ceph-helpers-2
Loic Dachary [Thu, 24 Nov 2016 07:01:51 +0000 (08:01 +0100)]
Merge pull request #12085 from wjwithagen/wip-freebsd-ceph-helpers-2

workunits/ceph-helpers.sh: Fixes for FreeBSD

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agotests: osd-scrub-repair.sh abort if add_something fails 12172/head
Loic Dachary [Thu, 24 Nov 2016 06:52:56 +0000 (07:52 +0100)]
tests: osd-scrub-repair.sh abort if add_something fails

If the script keeps going after this function fails, it will be non
trivial to find the root cause of the problem.

Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoosd: remove the redundant clear method in consume_map function 10553/head
songbaisen [Thu, 28 Jul 2016 11:26:17 +0000 (19:26 +0800)]
osd:  remove the redundant clear method in consume_map function

In the above loop before this to_remove to clear,we have remove all

the element.So this clear method is redundant.

Signed-off-by: song baisen <song.baisen@zte.com.cn>
8 years agoMerge pull request #11943 from wido/docs-pool-remove
Kefu Chai [Thu, 24 Nov 2016 03:53:32 +0000 (11:53 +0800)]
Merge pull request #11943 from wido/docs-pool-remove

doc: Add documentation about mon_allow_pool_delete before pool remove

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agorgw:fix for deleting objects name beginning and ending with underscores of one bucket... 11982/head
root [Mon, 14 Nov 2016 02:41:26 +0000 (10:41 +0800)]
rgw:fix for deleting objects name beginning and ending with underscores of one bucket using POST method of AWS's js sdk.
Fixes: http://tracker.ceph.com/issues/17888
Signed-off-by: zhouruisong 236131368@qq.com
8 years agotest: test-erasure-eio.sh fix recovery testing and enable it 12170/head
David Zafman [Wed, 23 Nov 2016 19:50:52 +0000 (11:50 -0800)]
test: test-erasure-eio.sh fix recovery testing and enable it

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoOSD: remove redudant call of heartbeat_check. Heartbeat_check is already called in... 12130/head
Pan Liu [Thu, 24 Nov 2016 01:43:42 +0000 (09:43 +0800)]
OSD: remove redudant call of heartbeat_check. Heartbeat_check is already called in tick_without_osd_lock.

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agoworkunits/ceph-helpers.sh: Fixes for FreeBSD 12085/head
Willem Jan Withagen [Sun, 20 Nov 2016 19:57:53 +0000 (20:57 +0100)]
workunits/ceph-helpers.sh: Fixes for FreeBSD

 - stat(1) does not have '%T'

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>