]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoclient/inode: fix the dump type of Inode::dump() 15198/head
huanwen ren [Mon, 22 May 2017 12:02:05 +0000 (20:02 +0800)]
client/inode: fix the dump type of Inode::dump()

Signed-off-by: huanwen ren ren.huanwen@zte.com.cn
8 years agoMerge pull request #14919 from tchaikov/wip-19825
Sage Weil [Mon, 8 May 2017 03:26:03 +0000 (22:26 -0500)]
Merge pull request #14919 from tchaikov/wip-19825

mon: check is_shutdown() in timer callbacks

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14968 from TsaiJin/wip-lock-pg-when-scrub-available
Sage Weil [Mon, 8 May 2017 03:23:55 +0000 (22:23 -0500)]
Merge pull request #14968 from TsaiJin/wip-lock-pg-when-scrub-available

osd: sched_scrub() lock pg only if all scrubbing conditions are fulfilled

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
8 years agoMerge pull request #14970 from dachary/wip-crush-documentation
Loic Dachary [Sat, 6 May 2017 06:09:03 +0000 (08:09 +0200)]
Merge pull request #14970 from dachary/wip-crush-documentation

crush: update documentation for negative choose step

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #14979 from liewegas/wip-19874
Sage Weil [Fri, 5 May 2017 22:42:38 +0000 (17:42 -0500)]
Merge pull request #14979 from liewegas/wip-19874

mon: fix prime_pg_temp overrun
common/Finisher: fix uninitialized variable warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14958 from ovh/bp-fix-finisher-warning
Sage Weil [Fri, 5 May 2017 22:42:26 +0000 (17:42 -0500)]
Merge pull request #14958 from ovh/bp-fix-finisher-warning

common/Finisher: fix uninitialized variable warning
common/Finisher: fix uninitialized variable warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14793 from dmick/wip-prio-and-daemonperf
Sage Weil [Fri, 5 May 2017 22:41:55 +0000 (17:41 -0500)]
Merge pull request #14793 from dmick/wip-prio-and-daemonperf

ceph: perfcounter priorities and daemonperf updates to use them

8 years agoMerge pull request #14510 from liewegas/wip-bluefs-sync-write
Sage Weil [Fri, 5 May 2017 22:41:22 +0000 (17:41 -0500)]
Merge pull request #14510 from liewegas/wip-bluefs-sync-write

os/bluestore/BlueFS: add bluefs_sync_write option

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #14305 from liewegas/wip-zipkin-partial
Sage Weil [Fri, 5 May 2017 22:40:58 +0000 (17:40 -0500)]
Merge pull request #14305 from liewegas/wip-zipkin-partial

osd: zipkin tracing

8 years agoMerge pull request #14981 from cbodley/wip-rgw-bi-list-plain
Orit Wasserman [Fri, 5 May 2017 21:04:11 +0000 (00:04 +0300)]
Merge pull request #14981 from cbodley/wip-rgw-bi-list-plain

cls/rgw: list_plain_entries() stops before bi_log entries
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agocls/rgw: list_plain_entries() stops before bi_log entries 14981/head
Casey Bodley [Fri, 5 May 2017 18:56:40 +0000 (14:56 -0400)]
cls/rgw: list_plain_entries() stops before bi_log entries

list_plain_entries() was using encode_obj_versioned_data_key() to set
its end_key, which gives a prefix of BI_BUCKET_OBJ_INSTANCE_INDEX[=2]

that range between start_key and end_key would not only span the
BI_BUCKET_OBJS_INDEX[=0] prefixes, but BI_BUCKET_LOG_INDEX[=1] prefixes
as well. this can result in list_plain_entries() trying and failing to
decode a rgw_bi_log_entry as a rgw_bucket_dir_entry

Fixes: http://tracker.ceph.com/issues/19876
Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14051 from SpandanKumarSahu/bug#17195
Jason Dillaman [Fri, 5 May 2017 18:40:55 +0000 (14:40 -0400)]
Merge pull request #14051 from SpandanKumarSahu/bug#17195

rbd: stop indefinite thread waiting in krbd udev handling

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoCMakeLists.txt: WITH_BLKIN off for now 14305/head
Sage Weil [Fri, 5 May 2017 17:59:35 +0000 (13:59 -0400)]
CMakeLists.txt: WITH_BLKIN off for now

We are unconditionally linking lttng-ust, which make selinux complain. We
should either

 - fix selinux rules and unconditionally link
 - dlopen at runtime based on an option (like we do for the current
   tracepoints)
 - ???

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoblkin: fix test
Sage Weil [Fri, 21 Apr 2017 16:01:54 +0000 (12:01 -0400)]
blkin: fix test

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoblkin: fix cmake compile options
Sage Weil [Tue, 18 Apr 2017 16:35:11 +0000 (12:35 -0400)]
blkin: fix cmake compile options

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoblkin: remove installed files
Sage Weil [Fri, 14 Apr 2017 17:27:44 +0000 (13:27 -0400)]
blkin: remove installed files

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoblkin: fix -fPIC option
Sage Weil [Wed, 12 Apr 2017 15:34:03 +0000 (11:34 -0400)]
blkin: fix -fPIC option

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoblkin: drop boost dependency
Sage Weil [Mon, 10 Apr 2017 20:03:13 +0000 (16:03 -0400)]
blkin: drop boost dependency

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/zipkin_trace: fix blkin_trace_info encoding
Sage Weil [Fri, 7 Apr 2017 19:50:25 +0000 (15:50 -0400)]
common/zipkin_trace: fix blkin_trace_info encoding

- encode the same regardless of whether it is compiled in (!)
- encode in endian- and struct alignment-safe way.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomsg/Message: make {encode,decode}_trace unconditional
Sage Weil [Fri, 7 Apr 2017 19:40:21 +0000 (15:40 -0400)]
msg/Message: make {encode,decode}_trace unconditional

These are protocol features and cannot vary based on our compilation.
Encode and decode unconditionally.  The callers have already guarded these
field additions with a message version bump and are conditionally calling
decode_trace.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoCMakeLists.txt: fix libcommon link to blkin
Sage Weil [Fri, 7 Apr 2017 19:26:57 +0000 (15:26 -0400)]
CMakeLists.txt: fix libcommon link to blkin

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoCMakeLists.txt: default WITH_BLKIN=ON
Sage Weil [Fri, 7 Apr 2017 19:14:56 +0000 (15:14 -0400)]
CMakeLists.txt: default WITH_BLKIN=ON

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocmake: build blkin instead of using find_package
Casey Bodley [Wed, 17 Aug 2016 18:15:14 +0000 (14:15 -0400)]
cmake: build blkin instead of using find_package

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agosrc/blkin: add blkin submodule
Sage Weil [Fri, 7 Apr 2017 18:15:35 +0000 (14:15 -0400)]
src/blkin: add blkin submodule

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agolibrados: Overload aio_operate with blkin trace info parameter
Victor Araujo [Thu, 18 Aug 2016 11:25:33 +0000 (13:25 +0200)]
librados: Overload aio_operate with blkin trace info parameter

This will enable passing trace information from rbd to librados for
aio_reads and aio_writes.

Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
8 years agocmake: Add blkin libs to target_link_libraries
vears91 [Sat, 25 Jun 2016 18:21:24 +0000 (21:21 +0300)]
cmake: Add blkin libs to target_link_libraries

Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
8 years agoblkin: add config variable osdc_blkin_trace_all
Casey Bodley [Thu, 12 Nov 2015 21:33:04 +0000 (16:33 -0500)]
blkin: add config variable osdc_blkin_trace_all

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add traces to librados and Objecter
Casey Bodley [Fri, 23 Oct 2015 13:33:36 +0000 (09:33 -0400)]
blkin: add traces to librados and Objecter

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add config variable osd_blkin_trace_all
Casey Bodley [Tue, 27 Oct 2015 16:18:33 +0000 (12:18 -0400)]
blkin: add config variable osd_blkin_trace_all

when set, Message::decode_trace() will always create a trace for
incoming messages, even if they didn't pass trace information

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agofilestore: Initialize Zipkin traces when there is a store trace
Victor Araujo [Mon, 5 Sep 2016 12:15:03 +0000 (14:15 +0200)]
filestore: Initialize Zipkin traces when there is a store trace

Avoids creating orphaned traces.

Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
8 years agoblkin: add traces to FileStore/Journal
Casey Bodley [Fri, 28 Aug 2015 14:32:40 +0000 (10:32 -0400)]
blkin: add traces to FileStore/Journal

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add traces to ECBackend
Sage Weil [Wed, 15 Feb 2017 23:17:33 +0000 (18:17 -0500)]
blkin: add traces to ECBackend

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add traces to ReplicatedBackend
Casey Bodley [Fri, 28 Aug 2015 19:33:46 +0000 (15:33 -0400)]
blkin: add traces to ReplicatedBackend

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: set up tracing in PGs
Casey Bodley [Fri, 28 Aug 2015 20:22:06 +0000 (16:22 -0400)]
blkin: set up tracing in PGs

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: set up tracing in the OSD
Casey Bodley [Fri, 28 Aug 2015 16:08:14 +0000 (12:08 -0400)]
blkin: set up tracing in the OSD

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: osd op messages carry trace information
Casey Bodley [Tue, 25 Aug 2015 19:26:03 +0000 (15:26 -0400)]
blkin: osd op messages carry trace information

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add traces to AsyncMessenger
Casey Bodley [Tue, 25 Aug 2015 18:40:48 +0000 (14:40 -0400)]
blkin: add traces to AsyncMessenger

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add traces to XioMessenger
Casey Bodley [Tue, 25 Aug 2015 18:18:07 +0000 (14:18 -0400)]
blkin: add traces to XioMessenger

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add traces to SimpleMessenger
Casey Bodley [Tue, 25 Aug 2015 16:49:50 +0000 (12:49 -0400)]
blkin: add traces to SimpleMessenger

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: Messenger integration
Casey Bodley [Mon, 17 Aug 2015 20:31:10 +0000 (16:31 -0400)]
blkin: Messenger integration

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agomsg: pass Connection to decode_message
Casey Bodley [Tue, 27 Oct 2015 13:59:46 +0000 (09:59 -0400)]
msg: pass Connection to decode_message

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoblkin: add header and initialization
Casey Bodley [Thu, 20 Aug 2015 18:03:00 +0000 (14:03 -0400)]
blkin: add header and initialization

zipkin_trace.h is a wrapper around ztracer.hpp, which provides a stub
implementation when WITH_BLKIN is not defined

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agocmake: add module and WITH_BLKIN option for blkin
Casey Bodley [Mon, 17 Aug 2015 18:17:23 +0000 (14:17 -0400)]
cmake: add module and WITH_BLKIN option for blkin

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoBuild support for BlkKin (LTTng + Zipkin) tracing
Andrew Shewmaker [Wed, 11 Mar 2015 02:43:26 +0000 (19:43 -0700)]
Build support for BlkKin (LTTng + Zipkin) tracing

 * Adds --with-blkin to autoconf (default without)
 * Adds BLKIN_LIBS to necessary automake files
 * Adds documentation for testing BlkKin tracing

Signed-off-by: Andrew Shewmaker <agshew@gmail.com>
Signed-off-by: Marios-Evaggelos Kogias <marioskogias@gmail.com>
Signed-off-by: Chendi.Xue <chendi.xue@intel.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14834 from runsisi/wip-fix-double-free
Jason Dillaman [Fri, 5 May 2017 17:16:48 +0000 (13:16 -0400)]
Merge pull request #14834 from runsisi/wip-fix-double-free

librbd: minor fixes for image trash move

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14830 from runsisi/wip-open-cleanup
Jason Dillaman [Fri, 5 May 2017 17:16:35 +0000 (13:16 -0400)]
Merge pull request #14830 from runsisi/wip-open-cleanup

librbd: remove redundant check for image id emptiness

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14927 from tchaikov/wip-19427
Kefu Chai [Fri, 5 May 2017 16:31:33 +0000 (00:31 +0800)]
Merge pull request #14927 from tchaikov/wip-19427

logclient: use the seq id of the 1st log entry when resetting session

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14920 from tchaikov/wip-14579
Kefu Chai [Fri, 5 May 2017 16:29:12 +0000 (00:29 +0800)]
Merge pull request #14920 from tchaikov/wip-14579

mgr: add machinery for python modules to send MCommands to daemons

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13681 from liewegas/wip-epochs
Kefu Chai [Fri, 5 May 2017 16:27:58 +0000 (00:27 +0800)]
Merge pull request #13681 from liewegas/wip-epochs

osd: tag fast dispatch messages with min_epoch

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoosd/OSDMapMapping: add assert 14979/head
Sage Weil [Fri, 5 May 2017 15:47:03 +0000 (11:47 -0400)]
osd/OSDMapMapping: add assert

This is easier to debug than walking off into memory we don't own!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: fix prime_pg_temp condition
Sage Weil [Fri, 5 May 2017 15:43:59 +0000 (11:43 -0400)]
mon/OSDMonitor: fix prime_pg_temp condition

We have to make sure the *pg* exists, not just the pool, in the previous
map, or else we'll get a funky overrun in OSDMapMapping::get().

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14273 from cbodley/wip-rgw-beast-new-parser
Casey Bodley [Fri, 5 May 2017 15:38:54 +0000 (11:38 -0400)]
Merge pull request #14273 from cbodley/wip-rgw-beast-new-parser

rgw: update Beast for streaming reads in asio frontend

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agorgw: rename frontend from asio to beast 14273/head
Casey Bodley [Fri, 28 Apr 2017 13:56:06 +0000 (09:56 -0400)]
rgw: rename frontend from asio to beast

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw: update Beast for streaming reads in asio frontend
Casey Bodley [Sat, 18 Feb 2017 23:00:05 +0000 (18:00 -0500)]
rgw: update Beast for streaming reads in asio frontend

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw: update Beast submodule
Casey Bodley [Fri, 28 Apr 2017 14:23:40 +0000 (10:23 -0400)]
rgw: update Beast submodule

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14931 from tchaikov/wip-19771
Sage Weil [Fri, 5 May 2017 13:53:38 +0000 (08:53 -0500)]
Merge pull request #14931 from tchaikov/wip-19771

qa/tasks/ceph_manager: always fix pgp_num when done with thrashosd task

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agocrush: update documentation for negative choose step 14970/head
Loic Dachary [Fri, 5 May 2017 09:38:32 +0000 (11:38 +0200)]
crush: update documentation for negative choose step

And remove an obsolete comment.

Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #14973 from ifed01/wip-bluestore-kvsync-cond
Sage Weil [Fri, 5 May 2017 13:20:35 +0000 (08:20 -0500)]
Merge pull request #14973 from ifed01/wip-bluestore-kvsync-cond

os/bluestore: remove unused condition variable

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: remove unused condition variable 14973/head
Igor Fedotov [Fri, 5 May 2017 12:33:01 +0000 (15:33 +0300)]
os/bluestore: remove unused condition variable

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #14963 from dillaman/wip-19858
Mykola Golub [Fri, 5 May 2017 12:27:07 +0000 (15:27 +0300)]
Merge pull request #14963 from dillaman/wip-19858

rbd-mirror: failover and failback of unmodified image results in split-brain

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14965 from dmick/wip-19865
Jason Dillaman [Fri, 5 May 2017 11:30:52 +0000 (07:30 -0400)]
Merge pull request #14965 from dmick/wip-19865

test/librbd/test_librbd.cc: set *features even if RBD_FEATURES is unset

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14465 from dillaman/wip-librbd-devstack-tempest
Mykola Golub [Fri, 5 May 2017 11:12:53 +0000 (14:12 +0300)]
Merge pull request #14465 from dillaman/wip-librbd-devstack-tempest

qa/workunits: switch to OpenStack Ocata release for RBD testing

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoosd/OSD.cc: lock the pg only when all conditional checks are passed when 14968/head
Jin Cai [Fri, 5 May 2017 08:29:25 +0000 (16:29 +0800)]
osd/OSD.cc: lock the pg only when all conditional checks are passed when
scheduling a  scrub

Signed-off-by: Jin Cai <caijin.caij@alibaba-inc.com>
8 years agomon: check is_shutdown() in timer callbacks 14919/head
Kefu Chai [Fri, 5 May 2017 04:02:05 +0000 (12:02 +0800)]
mon: check is_shutdown() in timer callbacks

introduce a helper class: C_MonContext, and initialize all timer events
using it, to ensure that they do check is_shutdown() before doing their
work.

Fixes: http://tracker.ceph.com/issues/19825
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agotest/librbd/test_librbd.cc: set *features even if RBD_FEATURES is unset 14965/head
Dan Mick [Fri, 5 May 2017 03:15:58 +0000 (20:15 -0700)]
test/librbd/test_librbd.cc: set *features even if RBD_FEATURES is unset

If RBD_FEATURES is not in the environment, set *features to 0 in
get_features(); callers rely on a valid return value.  (This was
breaking on arm64.)

Fixes: http://tracker.ceph.com/issues/19865
Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agomon/Elector: call cancel_timer() in shutdown()
Kefu Chai [Thu, 4 May 2017 14:49:04 +0000 (22:49 +0800)]
mon/Elector: call cancel_timer() in shutdown()

instead of doing it manually.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agolibrbd: add no-op event when promoting an image 14963/head
Jason Dillaman [Thu, 4 May 2017 21:56:22 +0000 (17:56 -0400)]
librbd: add no-op event when promoting an image

The rbd-mirror process needs an event in the journal
to properly detect the transition between primary and
non-primary state between peers.

Fixes: http://tracker.ceph.com/issues/19858
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: do not delay propagation of demote events
Jason Dillaman [Thu, 4 May 2017 23:47:01 +0000 (19:47 -0400)]
librbd: do not delay propagation of demote events

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: prevent infinite loop when computing replay status
Jason Dillaman [Thu, 4 May 2017 21:57:34 +0000 (17:57 -0400)]
rbd-mirror: prevent infinite loop when computing replay status

If the image had a non-primary predecessor epoch whose tag tid
duplicates an epoch within its own journal, an infinite loop
would result.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14373 from rzarzynski/wip-rgw-19520
Yehuda Sadeh [Thu, 4 May 2017 18:25:50 +0000 (11:25 -0700)]
Merge pull request #14373 from rzarzynski/wip-rgw-19520

rgw: fix broken /crossdomain.xml, /info and /healthcheck of Swift API.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #9950 from weiqiaomiao/wqm-wip-fetchobj-req
Casey Bodley [Thu, 4 May 2017 18:13:01 +0000 (14:13 -0400)]
Merge pull request #9950 from weiqiaomiao/wqm-wip-fetchobj-req

rgw: should delete in_stream_req  if conn->get_obj(...) return not zero value

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14601 from Jing-Scott/fix-bulkupload-multisite
Casey Bodley [Thu, 4 May 2017 18:01:35 +0000 (14:01 -0400)]
Merge pull request #14601 from Jing-Scott/fix-bulkupload-multisite

rgw: fix forward request for bulkupload to be applied in multisite

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #14945 from dillaman/wip-19811
Mykola Golub [Thu, 4 May 2017 17:47:49 +0000 (20:47 +0300)]
Merge pull request #14945 from dillaman/wip-19811

rbd-mirror: ensure missing images are re-synced when detected

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14935 from dillaman/wip-rbd-cli-mirror-pool
Mykola Golub [Thu, 4 May 2017 17:47:20 +0000 (20:47 +0300)]
Merge pull request #14935 from dillaman/wip-rbd-cli-mirror-pool

rbd: removed spurious error message from mirror pool commands

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14400 from ceph/wip-cd-1node
Tamilarasi Muthamizhan [Thu, 4 May 2017 17:42:50 +0000 (10:42 -0700)]
Merge pull request #14400 from ceph/wip-cd-1node

qa/tasks: few fixes to get ceph-deploy 1node to working state

8 years agoMerge pull request #14936 from cbodley/wip-19834
Casey Bodley [Thu, 4 May 2017 17:14:18 +0000 (13:14 -0400)]
Merge pull request #14936 from cbodley/wip-19834

rgw: RGWPeriodPusher spawns http thread before cr thread

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoFinisher: fix uninitialized variable warning 14958/head
Piotr Dałek [Thu, 4 May 2017 15:58:12 +0000 (17:58 +0200)]
Finisher: fix uninitialized variable warning

This silences the following warning:

Finisher.cc: In member function ‘void*
Finisher::finisher_thread_entry()’:
Finisher.cc:89:42: warning: ‘count’ may be used uninitialized in this
function [-Wmaybe-uninitialized]
  logger->dec(l_finisher_queue_len, count);
                                         ^

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
8 years agoMerge pull request #14908 from guihecheng/rgw_file-cleanup
Matt Benjamin [Thu, 4 May 2017 15:20:36 +0000 (11:20 -0400)]
Merge pull request #14908 from guihecheng/rgw_file-cleanup

rgw_file: cleanup virtual keyword on derived functions

8 years agoMerge pull request #14891 from tchaikov/wip-librbd-test-odr
Kefu Chai [Thu, 4 May 2017 15:09:23 +0000 (23:09 +0800)]
Merge pull request #14891 from tchaikov/wip-librbd-test-odr

librbd: do not instantiate templates while building tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: do not instantiate templates while building tests 14891/head
Kefu Chai [Wed, 3 May 2017 04:00:52 +0000 (12:00 +0800)]
librbd: do not instantiate templates while building tests

to avoid violation of ODR

Fixes: http://tracker.ceph.com/issues/18938
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14844 from liewegas/wip-bluestore-bitalloc
Sage Weil [Thu, 4 May 2017 13:11:40 +0000 (08:11 -0500)]
Merge pull request #14844 from liewegas/wip-bluestore-bitalloc

unittest_alloc: add test_alloc_big

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agounittest_alloc: add test_alloc_big 14844/head
Sage Weil [Thu, 4 May 2017 13:11:13 +0000 (08:11 -0500)]
unittest_alloc: add test_alloc_big

Ensure that big allocations work.

Verifies http://tracker.ceph.com/issues/16662

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlueFS: add bluefs_sync_write option 14510/head
Sage Weil [Thu, 4 May 2017 13:09:25 +0000 (08:09 -0500)]
os/bluestore/BlueFS: add bluefs_sync_write option

If we have a fast device we can do our writes using synchronous
IO instead of aio.  Most of the time rocksdb is doing sync writes
anyway (write and then fsync from the same thread).

Note that this might not be the case when using the
bluestore_sync_submit_transaction mode... that probably should
not be combined with bluefs_sync_write.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14953 from tchaikov/wip-librbd-silence-Wunused-var
Kefu Chai [Thu, 4 May 2017 12:53:26 +0000 (20:53 +0800)]
Merge pull request #14953 from tchaikov/wip-librbd-silence-Wunused-var

librbd: silence -Wunused-variable warning

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14407 from cbodley/wip-rgw-admin-remote
Orit Wasserman [Thu, 4 May 2017 12:31:40 +0000 (15:31 +0300)]
Merge pull request #14407 from cbodley/wip-rgw-admin-remote

rgw: fix handling of --remote in radosgw-admin period commands
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agolibrbd: silence -Wunused-variable warning 14953/head
Kefu Chai [Thu, 4 May 2017 01:47:33 +0000 (09:47 +0800)]
librbd: silence -Wunused-variable warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11179 from rzarzynski/wip-rgw-swift-formpost
Orit Wasserman [Thu, 4 May 2017 11:22:58 +0000 (14:22 +0300)]
Merge pull request #11179 from rzarzynski/wip-rgw-swift-formpost

rgw: add support for FormPost of Swift API
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #14949 from zhsj/fix-cryptopp-build
Kefu Chai [Thu, 4 May 2017 11:18:43 +0000 (19:18 +0800)]
Merge pull request #14949 from zhsj/fix-cryptopp-build

common: fix building against libcryptopp

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agocommon: fix building against libcryptopp 14949/head
Shengjing Zhu [Thu, 4 May 2017 07:52:04 +0000 (15:52 +0800)]
common: fix building against libcryptopp

libnspr is only needed for libnss, move it to if defined(USE_NSS)
section.

ceph::crypto::shutdown's params should be same with declaration.

Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>
8 years agoMerge pull request #14923 from joscollin/wip-dmclocktest-function-error
Kefu Chai [Thu, 4 May 2017 11:11:24 +0000 (19:11 +0800)]
Merge pull request #14923 from joscollin/wip-dmclocktest-function-error

dmclock: include missing <functional> header.

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14948 from Liuchang0812/wip-kill-duplicated-cmake-commands
Kefu Chai [Thu, 4 May 2017 10:44:37 +0000 (18:44 +0800)]
Merge pull request #14948 from Liuchang0812/wip-kill-duplicated-cmake-commands

cmake: kill duplicated cmake commands

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14951 from smithfarm/wip-19853
Kefu Chai [Thu, 4 May 2017 10:20:00 +0000 (18:20 +0800)]
Merge pull request #14951 from smithfarm/wip-19853

cmake: align cmake names of library packages

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoUpdate rgw_rest.cc 11179/head
Orit Wasserman [Thu, 4 May 2017 09:29:22 +0000 (12:29 +0300)]
Update rgw_rest.cc

fix indentation.
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
8 years agocmake: align cmake names of library packages 14951/head
Nathan Cutler [Thu, 4 May 2017 08:29:57 +0000 (10:29 +0200)]
cmake: align cmake names of library packages

The cmake package names of libraries are case-sensitive. The name used in
FIND_PACKAGE_HANDLE_STANDARD_ARGS - e.g. "cryptopp" - must match the name used
in the module name - "Findcryptopp.cmake" - as well as the name used in
find_package() call - "find_package(cryptopp REQUIRED)"

Note that the term "package" here refers to a cmake abstraction, *not* an
actual RPM or Debian package.

Fixes: http://tracker.ceph.com/issues/19853
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agocmake: kill duplicated cmake commands 14948/head
liuchang0812 [Thu, 4 May 2017 07:49:08 +0000 (15:49 +0800)]
cmake: kill duplicated cmake commands

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agoMerge pull request #14947 from dmick/wip-arm-compressor
Kefu Chai [Thu, 4 May 2017 05:45:46 +0000 (13:45 +0800)]
Merge pull request #14947 from dmick/wip-arm-compressor

compressor/zlib: fix plugin for non-Intel arches

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agocompressor/zlib: fix plugin for non-Intel arches 14947/head
Dan Mick [Thu, 4 May 2017 03:17:32 +0000 (20:17 -0700)]
compressor/zlib: fix plugin for non-Intel arches

unittest_compressor was failing on arm64 because the zlib
compressor was never initialized, even though it works fine in
non-isal mode

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoMerge pull request #14363 from majianpeng/finisher-optimize
Sage Weil [Thu, 4 May 2017 02:38:04 +0000 (21:38 -0500)]
Merge pull request #14363 from majianpeng/finisher-optimize

common/Finisher: batch handle perfcounter && only send signal when waiter existed.

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14627 from badone/wip-peering-state-timing
Sage Weil [Thu, 4 May 2017 02:37:39 +0000 (21:37 -0500)]
Merge pull request #14627 from badone/wip-peering-state-timing

osd: Implement peering state timing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14709 from majianpeng/luestore-txc-finalize-kv
Sage Weil [Thu, 4 May 2017 02:37:07 +0000 (21:37 -0500)]
Merge pull request #14709 from majianpeng/luestore-txc-finalize-kv

os/blueStore: In osd_tp_thread, call _txc_finalize_kv.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>