]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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>
8 years agoMerge pull request #14932 from markhpc/wip-rocksdb-compaction-readahead
Sage Weil [Thu, 4 May 2017 02:36:20 +0000 (21:36 -0500)]
Merge pull request #14932 from markhpc/wip-rocksdb-compaction-readahead

common/config_opts.h: compaction readahead for bluestore/rocksdb

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14879 from wjwithagen/wip-wjw-reduce-noise-3
Casey Bodley [Wed, 3 May 2017 17:19:29 +0000 (13:19 -0400)]
Merge pull request #14879 from wjwithagen/wip-wjw-reduce-noise-3

cls/log/cls_log.cc: reduce logging noise

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14928 from drunkard/master
Kefu Chai [Wed, 3 May 2017 16:31:21 +0000 (00:31 +0800)]
Merge pull request #14928 from drunkard/master

doc: remove deprecated subcommand in man/8/ceph.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14723 from neha-ojha/objclass-sdk
Yuri Weinstein [Wed, 3 May 2017 16:28:59 +0000 (09:28 -0700)]
Merge pull request #14723 from neha-ojha/objclass-sdk

osd: objclass sdk

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14917 from yuriw/wip-add-overrite-cls
Yuri Weinstein [Wed, 3 May 2017 16:27:30 +0000 (09:27 -0700)]
Merge pull request #14917 from yuriw/wip-add-overrite-cls

qa/added overrides

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agocls/log/cls_log.cc: reduce logging noise 14879/head
Willem Jan Withagen [Sat, 29 Apr 2017 11:36:07 +0000 (13:36 +0200)]
cls/log/cls_log.cc: reduce logging noise

 - The other reference in the source as already at 20.
      ./src/cls/timeindex/cls_timeindex.cc:85:
CLS_LOG(20, "storing entry at %s", index.c_str());

   And we need not always know where in the log items are stored.
   So it looks like a leftover debug feature.

Fixes: http://tracker.ceph.com/issues/19835
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #14913 from liewegas/wip-19826
Kefu Chai [Wed, 3 May 2017 15:56:07 +0000 (23:56 +0800)]
Merge pull request #14913 from liewegas/wip-19826

mon: do not prime_pg_temp creating pgs; clean up pg create conditions

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/Finisher: No waite_for_empty no signal. 14363/head
Jianpeng Ma [Wed, 3 May 2017 15:37:52 +0000 (23:37 +0800)]
common/Finisher: No waite_for_empty no signal.

Avoid every time to send a signal because wait_for_empty is rare event.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoradosgw-admin: 'period pull' reads endpoints from current period 14407/head
Casey Bodley [Sat, 8 Apr 2017 18:02:01 +0000 (14:02 -0400)]
radosgw-admin: 'period pull' reads endpoints from current period

by finding remote endpoints from the current period, 'period pull' no
longer needs to initialize RGWRados for zone[group]_conn_map

Fixes: http://tracker.ceph.com/issues/19554
Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoradosgw-admin: commit_period gets remote connection from new period
Casey Bodley [Sat, 8 Apr 2017 17:14:25 +0000 (13:14 -0400)]
radosgw-admin: commit_period gets remote connection from new period

Fixes: http://tracker.ceph.com/issues/19554
Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoradosgw-admin: send_to_remote_gateway takes RGWRESTConn*
Casey Bodley [Sat, 8 Apr 2017 17:10:38 +0000 (13:10 -0400)]
radosgw-admin: send_to_remote_gateway takes RGWRESTConn*

callers are responsible for providing their own remote connection

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoradosgw-admin: get remote connections from given period/zonegroup
Casey Bodley [Sat, 8 Apr 2017 16:55:36 +0000 (12:55 -0400)]
radosgw-admin: get remote connections from given period/zonegroup

helper functions to create connections to arbitrary remotes, rather
than depending on RGWRados to construct them in zone[group]_conn_map

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw: enable move on RGWRESTConn
Casey Bodley [Sat, 8 Apr 2017 16:40:12 +0000 (12:40 -0400)]
rgw: enable move on RGWRESTConn

added custom move construct/assign because std::atomic is not movable

Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agocommon/Finisher: batch handle perfcounter.
Jianpeng Ma [Thu, 6 Apr 2017 15:35:58 +0000 (23:35 +0800)]
common/Finisher: batch handle perfcounter.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agocommon/perf_counter: make tinc() handle batch-processing
Jianpeng Ma [Thu, 6 Apr 2017 15:26:35 +0000 (23:26 +0800)]
common/perf_counter: make tinc() handle batch-processing

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agocommon/config_opts.h: compaction readahead for bluestore/rocksdb 14932/head
Mark Nelson [Wed, 3 May 2017 12:34:55 +0000 (07:34 -0500)]
common/config_opts.h: compaction readahead for bluestore/rocksdb

Signed-off-by: Mark Nelson <mnelson@redhat.com>
8 years agoMerge pull request #14903 from dillaman/wip-19413
Mykola Golub [Wed, 3 May 2017 12:25:12 +0000 (15:25 +0300)]
Merge pull request #14903 from dillaman/wip-19413

cls_rbd: default initialize snapshot namespace for legacy clients

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14875 from dillaman/wip-rbd-trash-parent
Mykola Golub [Wed, 3 May 2017 12:24:30 +0000 (15:24 +0300)]
Merge pull request #14875 from dillaman/wip-rbd-trash-parent

rbd: info command should indicate if parent is in trash

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14929 from tchaikov/wip-disable-isal-on-arm
Sage Weil [Wed, 3 May 2017 12:23:10 +0000 (07:23 -0500)]
Merge pull request #14929 from tchaikov/wip-disable-isal-on-arm

test/compressor: disable isal tests if not available

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agotest/compressor: disable isal tests if not available 14929/head
Kefu Chai [Wed, 3 May 2017 08:21:52 +0000 (16:21 +0800)]
test/compressor: disable isal tests if not available

the isal-zlib compressor plugin is not supported on non-intel archs, and
if the user does not have a capable yasm compiler, neither will he/she
get this plugin.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: cleanup in doc/man/8/ceph.rst 14928/head
Drunkard Zhang [Wed, 3 May 2017 07:45:35 +0000 (15:45 +0800)]
doc: cleanup in doc/man/8/ceph.rst

Subcommand doc has been removed in 904913b37f241a73aa6722a18151d3166c8c93dd,
this is cleanup.

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
8 years agodmclock: ‘std::function’ has not been declared 14923/head
Jos Collin [Wed, 3 May 2017 04:46:42 +0000 (10:16 +0530)]
dmclock: ‘std::function’ has not been declared

The following error appears during make:

ceph/src/dmclock/test/test_test_client.cc:14:0:
ceph/src/dmclock/test/../sim/src/sim_recs.h:40:12: error: ‘std::function’ has not been declared
       std::function<void()> code) {

Signed-off-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #14822 from jan--f/fuse-normalize-wire-o_flags
Yan, Zheng [Wed, 3 May 2017 03:11:57 +0000 (11:11 +0800)]
Merge pull request #14822 from jan--f/fuse-normalize-wire-o_flags

fs/ceph-fuse: normalize file open flags on the wire

8 years agoMerge pull request #14909 from joscollin/wip-dmclock-error
Kefu Chai [Wed, 3 May 2017 03:07:29 +0000 (11:07 +0800)]
Merge pull request #14909 from joscollin/wip-dmclock-error

dmclock: error: ‘function’ in namespace ‘std’ does not name a template type

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14748 from smithfarm/wip-teuthology-worker
Kefu Chai [Wed, 3 May 2017 03:01:20 +0000 (11:01 +0800)]
Merge pull request #14748 from smithfarm/wip-teuthology-worker

doc: mention teuthology-worker security group

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agomon/OSDMonitor: skip new pgs for prime_pg_temp 14913/head
Sage Weil [Wed, 3 May 2017 01:42:34 +0000 (20:42 -0500)]
mon/OSDMonitor: skip new pgs for prime_pg_temp

If the pg didn't previously exist we don't need to (and can't) prime
pg_temp for it.  This avoids crashing on mapping.get().

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/added overrides 14917/head
Yuri Weinstein [Tue, 2 May 2017 22:06:49 +0000 (15:06 -0700)]
qa/added overrides

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agoMerge pull request #14412 from mikulely/cleanup-civetweb-port
Casey Bodley [Tue, 2 May 2017 17:05:00 +0000 (13:05 -0400)]
Merge pull request #14412 from mikulely/cleanup-civetweb-port

rgw: drop unused port var

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13451 from xiexingguo/wip-add-up-primary-sum
Yuri Weinstein [Tue, 2 May 2017 16:09:10 +0000 (09:09 -0700)]
Merge pull request #13451 from xiexingguo/wip-add-up-primary-sum

mon/PGMap: add up_primary pg number field for pg-dump cmd

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14497 from tchaikov/wip-pybind-better-error-msg
Yuri Weinstein [Tue, 2 May 2017 16:07:29 +0000 (09:07 -0700)]
Merge pull request #14497 from tchaikov/wip-pybind-better-error-msg

pybind: better error msg

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14687 from jcsp/wip-mgr-suite
Yuri Weinstein [Tue, 2 May 2017 16:06:51 +0000 (09:06 -0700)]
Merge pull request #14687 from jcsp/wip-mgr-suite

qa/suites: move mgr tests into rados suite

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14810 from liewegas/wip-status
Yuri Weinstein [Tue, 2 May 2017 16:06:13 +0000 (09:06 -0700)]
Merge pull request #14810 from liewegas/wip-status

mon: show inactive % in ceph status

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14821 from badone/wip-no-death-coredumps
Yuri Weinstein [Tue, 2 May 2017 16:05:32 +0000 (09:05 -0700)]
Merge pull request #14821 from badone/wip-no-death-coredumps

tests: Don't dump core when using EXPECT_DEATH

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14857 from joscollin/wip-arch-cpuid
Yuri Weinstein [Tue, 2 May 2017 16:04:09 +0000 (09:04 -0700)]
Merge pull request #14857 from joscollin/wip-arch-cpuid

arch: use __get_cpuid instead of do_cpuid

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12669 from hjwsm1989/unfound-objects
Sage Weil [Tue, 2 May 2017 15:54:19 +0000 (10:54 -0500)]
Merge pull request #12669 from hjwsm1989/unfound-objects

osd/PG: fix possible overflow on unfound objects

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12882 from wonzhq/pglog-fixes
Sage Weil [Tue, 2 May 2017 15:53:26 +0000 (10:53 -0500)]
Merge pull request #12882 from wonzhq/pglog-fixes

osd: pglog trimming fixes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14444 from liewegas/wip-past-intervals
Sage Weil [Tue, 2 May 2017 15:51:37 +0000 (10:51 -0500)]
Merge pull request #14444 from liewegas/wip-past-intervals

osd: simplify past_intervals representation

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14898 from tchaikov/wip-clean-pending_created_pgs
Sage Weil [Tue, 2 May 2017 15:51:12 +0000 (10:51 -0500)]
Merge pull request #14898 from tchaikov/wip-clean-pending_created_pgs

mon/OSDMonitor: cleanup pending_created_pgs after done with it

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14904 from tchaikov/wip-19638-followon
Sage Weil [Tue, 2 May 2017 15:50:52 +0000 (10:50 -0500)]
Merge pull request #14904 from tchaikov/wip-19638-followon

osd: stop mgrc earlier in shutdown()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoosd: fix legacy pg create conditions
Sage Weil [Tue, 2 May 2017 15:49:28 +0000 (10:49 -0500)]
osd: fix legacy pg create conditions

1- in reality we don't really care if pg_temp is set.
2- compare against acting_primary since that's what actually matters.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: fix prime_pg_temp vs creating condition
Sage Weil [Tue, 2 May 2017 15:48:02 +0000 (10:48 -0500)]
mon/OSDMonitor: fix prime_pg_temp vs creating condition

We want to *skip* creating PGs.

Fixes: http://tracker.ceph.com/issues/19826
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14858 from dmick/wip-config-dump
Yuri Weinstein [Tue, 2 May 2017 15:25:16 +0000 (08:25 -0700)]
Merge pull request #14858 from dmick/wip-config-dump

mon/ConfigKeyService: add 'config-key dump' to show keys and vals

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14870 from smithfarm/wip-gperftools
Yuri Weinstein [Tue, 2 May 2017 15:23:59 +0000 (08:23 -0700)]
Merge pull request #14870 from smithfarm/wip-gperftools

build/ops: rpm: gperftools-devel >= 2.4

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agodmclock: error: ‘function’ in namespace ‘std’ does not name a template type 14909/head
Jos Collin [Tue, 2 May 2017 10:05:09 +0000 (15:35 +0530)]
dmclock: error: ‘function’ in namespace ‘std’ does not name a template type

The following error appears during make:

In file included from ceph/src/dmclock/support/src/run_every.cc:10:0:
ceph/src/dmclock/support/src/run_every.h:30:10: error: ‘function’ in namespace ‘std’ does not name a template type
     std::function<void()>     body;
          ^~~~~~~~
ceph/src/dmclock/support/src/run_every.h:46:12: error: ‘std::function’ has not been declared
       std::function<void()> _body) :
            ^~~~~~~~
ceph/src/dmclock/support/src/run_every.h:46:20: error: expected ‘,’ or ‘...’ before ‘<’ token
       std::function<void()> _body) :
                    ^
ceph/src/dmclock/support/src/run_every.h: In constructor ‘crimson::RunEvery::RunEvery(D, int)’:
ceph/src/dmclock/support/src/run_every.h:48:7: error: class ‘crimson::RunEvery’ does not have any field named ‘body’
       body(_body)
       ^~~~
ceph/src/dmclock/support/src/run_every.h:48:12: error: ‘_body’ was not declared in this scope
       body(_body)
            ^~~~~
ceph/src/dmclock/support/src/run_every.cc: In member function ‘void crimson::RunEvery::run()’:
ceph/src/dmclock/support/src/run_every.cc:70:7: error: ‘body’ was not declared in this scope
       body();
       ^~~~
ceph/src/dmclock/support/src/run_every.cc:70:7: note: suggested alternative: ‘bool’
       body();
       ^~~~
       bool

Signed-off-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #14869 from wjwithagen/wip-wjw-cmake-uuid
Kefu Chai [Tue, 2 May 2017 06:41:19 +0000 (14:41 +0800)]
Merge pull request #14869 from wjwithagen/wip-wjw-cmake-uuid

cmake: fix the linked lib reference of unittest_rgw_crypto

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14900 from jupiturliu/organization_map
Kefu Chai [Tue, 2 May 2017 06:28:41 +0000 (14:28 +0800)]
Merge pull request #14900 from jupiturliu/organization_map

mailmap: add Alibaba into organization map

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14895 from liewegas/wip-19778
Kefu Chai [Tue, 2 May 2017 03:05:54 +0000 (11:05 +0800)]
Merge pull request #14895 from liewegas/wip-19778

kv: move 'bluestore-kv' hackery out of KeyValueDB into ceph-kvstore-tool

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14853 from liewegas/wip-aio
Kefu Chai [Tue, 2 May 2017 02:33:38 +0000 (10:33 +0800)]
Merge pull request #14853 from liewegas/wip-aio

os/fs/aio: use small_vector for aio_t; clean up header location

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoOSD: stop mgrc earlier in shutdown() 14904/head
Kefu Chai [Tue, 2 May 2017 01:34:53 +0000 (09:34 +0800)]
OSD: stop mgrc earlier in shutdown()

it's better this way, as MgrClient is more like an internal consumer
of the services offered by OSD, instead of service privider. it could
prevent future problem if we can stop it earlier in the shutdown
process.

see also: http://tracker.ceph.com/issues/19638
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14897 from tchaikov/wip-19814
Sage Weil [Tue, 2 May 2017 01:31:43 +0000 (20:31 -0500)]
Merge pull request #14897 from tchaikov/wip-19814

mon/OSDMonitor: update creating_pgs using pending_creatings

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14889 from joscollin/wip-test-write-operations-warning
Sage Weil [Tue, 2 May 2017 01:30:49 +0000 (20:30 -0500)]
Merge pull request #14889 from joscollin/wip-test-write-operations-warning

test: c_write_operations.cc: silence warning from -Wsign-compare

8 years agoMerge pull request #14888 from joscollin/wip-test-read-operations-warning
Sage Weil [Tue, 2 May 2017 01:30:35 +0000 (20:30 -0500)]
Merge pull request #14888 from joscollin/wip-test-read-operations-warning

test: c_read_operations.cc: silence warning from -Wsign-compare

8 years agoMerge pull request #14799 from xiaoxichen/optimiztic_pg_active
Sage Weil [Tue, 2 May 2017 01:30:23 +0000 (20:30 -0500)]
Merge pull request #14799 from xiaoxichen/optimiztic_pg_active

osd/PG.cc: Optimistic estimation on PG.last_active

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14790 from wjwithagen/wip-wjw-cleanup-unused-variable-v2
Sage Weil [Tue, 2 May 2017 01:30:03 +0000 (20:30 -0500)]
Merge pull request #14790 from wjwithagen/wip-wjw-cleanup-unused-variable-v2

common: Fix unused variable references warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14330 from ivancich/wip-bring-in-dmclock
Sage Weil [Tue, 2 May 2017 01:29:43 +0000 (20:29 -0500)]
Merge pull request #14330 from ivancich/wip-bring-in-dmclock

dmclock: initial commit of dmclock QoS library

8 years agoMerge pull request #14896 from liewegas/wip-19638
Sage Weil [Tue, 2 May 2017 01:25:29 +0000 (20:25 -0500)]
Merge pull request #14896 from liewegas/wip-19638

osd: stop MgrClient callbacks on shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14899 from liewegas/wip-19433
Sage Weil [Tue, 2 May 2017 01:24:48 +0000 (20:24 -0500)]
Merge pull request #14899 from liewegas/wip-19433

ceph_test_rados_api_watch_notify: make LibRadosWatchNotify.Watch3Timeout tolerate thrashing

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14901 from liewegas/wip-19552
Sage Weil [Tue, 2 May 2017 01:23:52 +0000 (20:23 -0500)]
Merge pull request #14901 from liewegas/wip-19552

osdc/Objecter: fix pool dne corner case

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14881 from tchaikov/wip-crosscompiling-armhf
Kefu Chai [Tue, 2 May 2017 01:19:51 +0000 (09:19 +0800)]
Merge pull request #14881 from tchaikov/wip-crosscompiling-armhf

cmake: enable cross-compilation of boost

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agocls_rbd: default initialize snapshot namespace for legacy clients 14903/head
Jason Dillaman [Tue, 2 May 2017 01:06:19 +0000 (21:06 -0400)]
cls_rbd: default initialize snapshot namespace for legacy clients

Creating a snapshot on >=Kraken OSDs using <=Jewel clients can result
in an improperly initialized snapshot namespace. As a result, attempting
to remove the snapshot using a >=Kraken client will result in an -EINVAL
error.

Fixes: http://tracker.ceph.com/issues/19413
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoobjclass-sdk: add override to whitelist the sdk class 14723/head
Neha Ojha [Mon, 1 May 2017 23:15:21 +0000 (16:15 -0700)]
objclass-sdk: add override to whitelist the sdk class

Signed-off-by: Neha Ojha <nojha@redhat.com>
8 years agoMerge pull request #14788 from liewegas/wip-jewel-x-rgw
Sage Weil [Mon, 1 May 2017 22:12:39 +0000 (17:12 -0500)]
Merge pull request #14788 from liewegas/wip-jewel-x-rgw

qa/suites/jewel-x/point-to-point: don't scane for keys on second s3tests either

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosdc/Objecter: fix pool dne corner case 14901/head
Sage Weil [Mon, 1 May 2017 20:10:44 +0000 (15:10 -0500)]
osdc/Objecter: fix pool dne corner case

We have a request that is queued before a pool exists, there is one
epoch where it exists, and then the pool disappears again.  The two maps
are processed at the same time.  For the first we set needs_resend, map to
an osd, and remove from the homeless sessin.  For the second, the pool
dne, we set osd back to -1, and send a map check request.  Finally,
handle_osd_maps scans need_resend, sees the pool dne, and removes from
need_resend.  The difference from the "usual" case is that we are neither
on the need_resend list nor on the homeless session.

Fix this by concluding immediately that the pool existed (briefly) and
then no longer exists.

Fixes: http://tracker.ceph.com/issues/19552
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc:Adding Alibaba into organization map 14900/head
James Liu [Mon, 1 May 2017 20:00:11 +0000 (13:00 -0700)]
doc:Adding Alibaba into organization map

Signed-off-by: James Liu <james.liu@alibaba-inc.com>
8 years agoceph_test_rados_api_watch_notify: make LibRadosWatchNotify.Watch3Timeout tolerate... 14899/head
Sage Weil [Mon, 1 May 2017 17:21:30 +0000 (13:21 -0400)]
ceph_test_rados_api_watch_notify: make LibRadosWatchNotify.Watch3Timeout tolerate thrashing

If the PG moves we will reconnect and fail to time out.
Wait for longer so that we mask the effects of osd thrashing.

Fixes: http://tracker.ceph.com/issues/19433
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: cleanup pending_created_pgs after done with it 14898/head
Kefu Chai [Mon, 1 May 2017 17:10:54 +0000 (01:10 +0800)]
mon/OSDMonitor: cleanup pending_created_pgs after done with it

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agomon/OSDMonitor: update creating_pgs using pending_creatings 14897/head
Kefu Chai [Mon, 1 May 2017 15:48:51 +0000 (23:48 +0800)]
mon/OSDMonitor: update creating_pgs using pending_creatings

* without this change, in OSDMonitor::update_pending_pgs(), creating_pgs
  is updated directly without lock, and the change will be overwritten
  with pending changes eventually. so we should update it using
  pending_creatings
* also, should acquire the lock in OSDMonitor::send_pg_creates() when
  reading creating_pgs_by_osd_epoch and createing_pgs.

Fixes: http://tracker.ceph.com/issues/19814
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14775 from Jing-Scott/wip-con-obj-bulkupload
Radoslaw Zarzynski [Mon, 1 May 2017 15:44:36 +0000 (17:44 +0200)]
Merge pull request #14775 from Jing-Scott/wip-con-obj-bulkupload

rgw: add support container and object levels of swift bulkupload

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #14892 from tchaikov/wip-kill-warnings
Kefu Chai [Mon, 1 May 2017 15:43:51 +0000 (23:43 +0800)]
Merge pull request #14892 from tchaikov/wip-kill-warnings

test: kill warnings

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14750 from theanalyst/rgw/fix/frontend_array
Radoslaw Zarzynski [Mon, 1 May 2017 15:17:45 +0000 (17:17 +0200)]
Merge pull request #14750 from theanalyst/rgw/fix/frontend_array

rgw: civetweb don't go past the array index while calling mg_start

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #14359 from Jing-Scott/remove-zg-dup-post
Casey Bodley [Mon, 1 May 2017 14:54:41 +0000 (10:54 -0400)]
Merge pull request #14359 from Jing-Scott/remove-zg-dup-post

rgw multisite: remove the redundant post in OPT_ZONEGROUP_MODIFY

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14390 from shashalu/drop-unused-param
Casey Bodley [Mon, 1 May 2017 14:54:01 +0000 (10:54 -0400)]
Merge pull request #14390 from shashalu/drop-unused-param

rgw: drop unused param "bucket" from select_bucket_placement

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14839 from chardan/jfw-wip-halflife_atomic_t-ebirah
Casey Bodley [Mon, 1 May 2017 14:53:00 +0000 (10:53 -0400)]
Merge pull request #14839 from chardan/jfw-wip-halflife_atomic_t-ebirah

rgw: migrate atomic_t to std::atomic<> (ebirah)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14845 from cbodley/wip-rgw-qa-s3tests
Casey Bodley [Mon, 1 May 2017 14:49:12 +0000 (10:49 -0400)]
Merge pull request #14845 from cbodley/wip-rgw-qa-s3tests

qa/rgw: add cluster name to path when s3tests scans rgw log

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
8 years agoosd: stop MgrClient callbacks on shutdown 14896/head
Sage Weil [Mon, 1 May 2017 14:33:36 +0000 (10:33 -0400)]
osd: stop MgrClient callbacks on shutdown

Stop the MgrClient callbacks to report PG stats at the
start of shutdown() so that we don't get a callback
during/after we are done shutting down.

Protect the cb update with the MgrClient's lock so that
we don't race with MgrClient::send_report() itself.

Fixes: http://tracker.ceph.com/issues/19638
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agokv: move 'bluestore-kv' hackery out of KeyValueDB into ceph-kvstore-tool 14895/head
Sage Weil [Mon, 1 May 2017 14:24:03 +0000 (10:24 -0400)]
kv: move 'bluestore-kv' hackery out of KeyValueDB into ceph-kvstore-tool

This avoids contaminating libkv with ObjectStore/BlueStore.  It also makes
the blustore kv startup slightly less weird (no need to skip the open
step).

Fixes: http://tracker.ceph.com/issues/19778
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/librados: silence -Woverloaded-virtual warning 14892/head
Kefu Chai [Mon, 1 May 2017 04:44:19 +0000 (12:44 +0800)]
test/librados: silence -Woverloaded-virtual warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agotest/librbd: silence warning from -Wsign-compare
Kefu Chai [Mon, 1 May 2017 04:28:31 +0000 (12:28 +0800)]
test/librbd: silence warning from -Wsign-compare

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agorbd: info command should indicate if parent is in trash 14875/head
Jason Dillaman [Fri, 28 Apr 2017 19:12:57 +0000 (15:12 -0400)]
rbd: info command should indicate if parent is in trash

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: added trash_get API method to retrieve image status
Jason Dillaman [Fri, 28 Apr 2017 18:51:41 +0000 (14:51 -0400)]
librbd: added trash_get API method to retrieve image status

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: extended parent info API to retrieve parent id
Jason Dillaman [Fri, 28 Apr 2017 14:05:57 +0000 (10:05 -0400)]
librbd: extended parent info API to retrieve parent id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14770 from rzarzynski/wip-rgw-19754
Matt Benjamin [Mon, 1 May 2017 14:09:10 +0000 (10:09 -0400)]
Merge pull request #14770 from rzarzynski/wip-rgw-19754

rgw: fix RadosGW hang during multi-chunk upload of AWSv4.

8 years agolibrbd: get_parent_info should return cached parent name
Jason Dillaman [Fri, 28 Apr 2017 13:24:37 +0000 (09:24 -0400)]
librbd: get_parent_info should return cached parent name

Signed-off-by: Jason Dillaman <dillaman@redhat.com>