]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoMerge pull request #14133 from runsisi/wip-pg-state-cleanup
Yuri Weinstein [Tue, 28 Mar 2017 16:24:02 +0000 (09:24 -0700)]
Merge pull request #14133 from runsisi/wip-pg-state-cleanup

osd/PG: some minor cleanups

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #14089 from ceph/wip-rgw-doc-changing-master
Casey Bodley [Tue, 28 Mar 2017 16:13:10 +0000 (12:13 -0400)]
Merge pull request #14089 from ceph/wip-rgw-doc-changing-master

doc/rgw: instructions for changing multisite master zone

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #14090 from cbodley/wip-rgw-test-delete-notempty
Casey Bodley [Tue, 28 Mar 2017 16:11:14 +0000 (12:11 -0400)]
Merge pull request #14090 from cbodley/wip-rgw-test-delete-notempty

test/rgw: test_bucket_delete_notempty in test_multi.py

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #13561 from cbodley/wip-19027
Casey Bodley [Tue, 28 Mar 2017 16:10:07 +0000 (12:10 -0400)]
Merge pull request #13561 from cbodley/wip-19027

rgw: allow system users to read SLO parts

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #13984 from liewegas/wip-osdmap-remap
Sage Weil [Tue, 28 Mar 2017 15:47:22 +0000 (10:47 -0500)]
Merge pull request #13984 from liewegas/wip-osdmap-remap

mon,osd: explicitly remap some pgs

Reviewed-by: Josh Durgin <jduring@redhat.com>
8 years agoMerge pull request #13687 from Liuchang0812/wip-19106-eliminate-unsafe-option
Sage Weil [Tue, 28 Mar 2017 15:45:01 +0000 (10:45 -0500)]
Merge pull request #13687 from Liuchang0812/wip-19106-eliminate-unsafe-option

common/config: eliminate config_t::set_val unsafe option

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13855 from yuyuyu101/wip-bluestore-rm-range
Sage Weil [Tue, 28 Mar 2017 15:44:44 +0000 (10:44 -0500)]
Merge pull request #13855 from yuyuyu101/wip-bluestore-rm-range

kv/RocksDBStore: implement rm_range_keys operator interface and test

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13879 from liewegas/wip-19076
Sage Weil [Tue, 28 Mar 2017 15:44:16 +0000 (10:44 -0500)]
Merge pull request #13879 from liewegas/wip-19076

osd/ReplicatedBackend: clear pull source once we are done with it

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13961 from wangzhengyong/network
Sage Weil [Tue, 28 Mar 2017 15:43:37 +0000 (10:43 -0500)]
Merge pull request #13961 from wangzhengyong/network

msg/SimpleMessenger: error out misplace in set_socket_options

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #14093 from hjwsm1989/sparse-read
Sage Weil [Tue, 28 Mar 2017 15:43:07 +0000 (10:43 -0500)]
Merge pull request #14093 from hjwsm1989/sparse-read

osd/PrimaryLogPG: set return value if sparse read failed

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14099 from tchaikov/wip-denc-arm32
Sage Weil [Tue, 28 Mar 2017 15:42:40 +0000 (10:42 -0500)]
Merge pull request #14099 from tchaikov/wip-denc-arm32

include/denc: add {encode,decode}_nohead for denc_traits<basic_string>

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14129 from SUSE/wip-18764
Sage Weil [Tue, 28 Mar 2017 15:42:23 +0000 (10:42 -0500)]
Merge pull request #14129 from SUSE/wip-18764

mgr: fix crash on missing 'ceph_version' in daemon metadata (fixes #18764)

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14003 from dillaman/wip-19287
Mykola Golub [Tue, 28 Mar 2017 15:03:54 +0000 (18:03 +0300)]
Merge pull request #14003 from dillaman/wip-19287

librbd: is_exclusive_lock_owner API should ping OSD

Reviewed-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14179 from Adirl/rdma-cm-3
Haomai Wang [Tue, 28 Mar 2017 15:01:50 +0000 (23:01 +0800)]
Merge pull request #14179 from Adirl/rdma-cm-3

msg/async/rdma: RDMA-CM Initialize device on first connect

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #14166 from dillaman/wip-19388
Mykola Golub [Tue, 28 Mar 2017 14:56:46 +0000 (17:56 +0300)]
Merge pull request #14166 from dillaman/wip-19388

librbd: random unit test failures due to shut down race

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoqa/tasks/thrashosds,ceph_manager: thrash pg_remap[_items] 13984/head
Sage Weil [Thu, 23 Mar 2017 11:48:27 +0000 (06:48 -0500)]
qa/tasks/thrashosds,ceph_manager: thrash pg_remap[_items]

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/cli/osdmaptool/remap.t: add --remap test
Sage Weil [Wed, 15 Mar 2017 22:27:22 +0000 (18:27 -0400)]
test/cli/osdmaptool/remap.t: add --remap test

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/cli/osdmaptool: fix tests
Sage Weil [Wed, 15 Mar 2017 22:23:08 +0000 (18:23 -0400)]
test/cli/osdmaptool: fix tests

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosdmaptool: add --remap to run the remap_pgs() method
Sage Weil [Thu, 16 Mar 2017 19:09:26 +0000 (15:09 -0400)]
osdmaptool: add --remap to run the remap_pgs() method

Output ceph cli commands to realize the new remaps entries.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: clean_pg_remaps
Sage Weil [Wed, 15 Mar 2017 22:08:30 +0000 (18:08 -0400)]
osd/OSDMap: clean_pg_remaps

Helper to clean out no-op pg_remap cruft:

- pg_remap entries that match the raw result
- pg_remap_items entries where the 'from' part of the (from,to)
  set isn't present.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: implement remap_pgs
Sage Weil [Wed, 15 Mar 2017 16:47:21 +0000 (12:47 -0400)]
osd/OSDMap: implement remap_pgs

Run a specified number of iterations trying to install new
pg_remap_items entries that improve the PG distribution.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush: implement try_remap_rule
Sage Weil [Wed, 15 Mar 2017 16:46:25 +0000 (12:46 -0400)]
crush: implement try_remap_rule

Simulate a CRUSH mapping but try to identify alternative OSD
choices (based on an underfull list and overfull set) that still
respect the CRUSH rule constraints.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14021 from batrick/i19291
John Spray [Tue, 28 Mar 2017 13:29:29 +0000 (09:29 -0400)]
Merge pull request #14021 from batrick/i19291

mds: set ceph-mds name uncond for external tools

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #14017 from jcsp/wip-19282
John Spray [Tue, 28 Mar 2017 13:28:52 +0000 (09:28 -0400)]
Merge pull request #14017 from jcsp/wip-19282

mds: don't assert on read errors in RecoveryQueue

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #14015 from jcsp/wip-19288
John Spray [Tue, 28 Mar 2017 13:28:13 +0000 (09:28 -0400)]
Merge pull request #14015 from jcsp/wip-19288

mds: remove legacy "mds tell" command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #13904 from jcsp/wip-16709
John Spray [Tue, 28 Mar 2017 13:27:38 +0000 (09:27 -0400)]
Merge pull request #13904 from jcsp/wip-16709

mon: fix hiding mdsmonitor informative strings

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #12074 from batrick/i17604
John Spray [Tue, 28 Mar 2017 13:25:24 +0000 (09:25 -0400)]
Merge pull request #12074 from batrick/i17604

mds: warn if insufficient standbys exist

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agomsg/async/rdma: Extract sockets stuff from RDMAStack.h 14179/head
Amir Vadai [Wed, 22 Mar 2017 07:03:31 +0000 (09:03 +0200)]
msg/async/rdma: Extract sockets stuff from RDMAStack.h

This is a preparation commit, in order to make review easier. In this
commit I move code from RDMAStack.h into the new file
RDMAConnectedSocketImpl.h - without changing the code.

In the next commit, the actual logic changes will be done and socket
classes will be split into a base RDMAConnected classes and child
classes with TCP connection establishment specific code.

Issue: 995322
Change-Id: I639fda490a6fbd02addb95d3158c5ac1e7390ef0
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agomsg/async/rdma: Initialize device on first connect
Amir Vadai [Mon, 6 Feb 2017 17:31:20 +0000 (19:31 +0200)]
msg/async/rdma: Initialize device on first connect

Allocate Device's IB resources only when first connect for a device is
called.

Also, removed Infiniband::MemoryManager::Chunk::post_srq() which is not
used anywhere in the code.

Issue: 995322
Change-Id: I2ac1e36aff645ad7d8bbc06c87530bf33c4b3ecf
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agoMerge pull request #13423 from dzafman/wip-18533-tool
David Zafman [Mon, 27 Mar 2017 22:15:43 +0000 (15:15 -0700)]
Merge pull request #13423 from dzafman/wip-18533-tool

Fixes: http://tracker.ceph.com/issues/18533
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #14132 from dmick/wip-arm-crc
Dan Mick [Mon, 27 Mar 2017 19:50:57 +0000 (12:50 -0700)]
Merge pull request #14132 from dmick/wip-arm-crc

arch: fix cmake's ARM CRC intrinsics test to handle duplicitous gcc 4.8.5

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agocmake/modules/SIMDExt.cmake: armv8 crypto intrinsics 14132/head
Dan Mick [Sat, 25 Mar 2017 03:12:38 +0000 (20:12 -0700)]
cmake/modules/SIMDExt.cmake: armv8 crypto intrinsics

Test not only for -march support, but also the actual
presence of the intrinsic routines.  Not sure why, but gcc
4.8.5 passes the first but not the second.

Fixes: http://tracker.ceph.com/issues/19386
Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agolibrbd: random unit test failures due to shut down race 14166/head
Jason Dillaman [Mon, 27 Mar 2017 14:20:24 +0000 (10:20 -0400)]
librbd: random unit test failures due to shut down race

Fixes: http://tracker.ceph.com/issues/19389
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agofilestore, tools: Fix logging of DBObjectMap check() repairs 13423/head
David Zafman [Tue, 21 Mar 2017 00:28:45 +0000 (17:28 -0700)]
filestore, tools: Fix logging of DBObjectMap check() repairs

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoosd: Simplify DBObjectMap by no longer creating complete tables
David Zafman [Fri, 3 Mar 2017 23:04:02 +0000 (15:04 -0800)]
osd: Simplify DBObjectMap by no longer creating complete tables

Bump the version for new maps to 3
Make clone less efficient but simpler
Add rename operation (use instead of clone/unlink)
For now keep code that understands version 2 maps

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoceph-osdomap-tool: Fix seg fault with large amount of check error output
David Zafman [Thu, 16 Feb 2017 00:17:32 +0000 (16:17 -0800)]
ceph-osdomap-tool: Fix seg fault with large amount of check error output

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoosd: Add automatic repair for DBObjectMap bug
David Zafman [Wed, 15 Feb 2017 23:02:33 +0000 (15:02 -0800)]
osd: Add automatic repair for DBObjectMap bug

Add repair command to ceph-osdomap-tool too

Under some situations the previous rm_keys() code would
generated a corrupt complete table.  There is no way to
figure out what the table should look like now.  By removing
the entries we fix the corruption and aren't much worse off
because the corruption caused some deleted keys to re-appear.

This doesn't breaking the parent/child relationship during
repair because some of the keys may still be contained
in the parent.

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoceph-osdomap-tool: Fix tool exit status
David Zafman [Wed, 15 Feb 2017 22:59:40 +0000 (14:59 -0800)]
ceph-osdomap-tool: Fix tool exit status

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoDBObjectMap: rewrite rm_keys and merge_new_complete
Samuel Just [Fri, 10 Feb 2017 23:51:42 +0000 (15:51 -0800)]
DBObjectMap: rewrite rm_keys and merge_new_complete

Leverage the updated in_complete_region and needs_parent to simplify
these methods.

Signed-off-by: Samuel Just <sjust@redhat.com>
8 years agoDBObjectMap: strengthen in_complete_region post condition
Samuel Just [Fri, 10 Feb 2017 23:50:57 +0000 (15:50 -0800)]
DBObjectMap: strengthen in_complete_region post condition

Previously, in_complete_region didn't guarantee anything about
where it left complete_iter pointing.  It will be handy for
complete_iter to be pointing at the lowest interval which ends
after to_test.  Make it so.

Signed-off-by: Samuel Just <sjust@redhat.com>
8 years agoDBObjectMap: fix next_parent()
Samuel Just [Fri, 10 Feb 2017 23:48:57 +0000 (15:48 -0800)]
DBObjectMap: fix next_parent()

The previous implementation assumed that
lower_bound(parent_iter->key()) always leaves the iterator
on_parent().  There isn't any guarantee, however, that that
key isn't present on the child as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
8 years agotest_object_map: add tests to trigger some bugs related to 18533
Samuel Just [Thu, 9 Feb 2017 18:47:59 +0000 (10:47 -0800)]
test_object_map: add tests to trigger some bugs related to 18533

Signed-off-by: Samuel Just <sjust@redhat.com>
8 years agotest: Add ceph_test_object_map to make check tests
David Zafman [Tue, 14 Feb 2017 20:40:33 +0000 (12:40 -0800)]
test: Add ceph_test_object_map to make check tests

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoceph-osdomap-tool: Add --debug and only show internal logging if enabled
David Zafman [Thu, 9 Feb 2017 02:56:27 +0000 (18:56 -0800)]
ceph-osdomap-tool: Add --debug and only show internal logging if enabled

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoosd: DBOjectMap::check: Dump complete mapping when inconsistency found
David Zafman [Thu, 9 Feb 2017 02:55:48 +0000 (18:55 -0800)]
osd: DBOjectMap::check: Dump complete mapping when inconsistency found

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agotest_object_map: Use ASSERT_EQ() for check() so failure doesn't stop testing
David Zafman [Wed, 8 Feb 2017 23:38:51 +0000 (15:38 -0800)]
test_object_map: Use ASSERT_EQ() for check() so failure doesn't stop testing

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agotools: Check for overlaps in internal "complete" table for DBObjectMap
David Zafman [Wed, 8 Feb 2017 18:02:40 +0000 (10:02 -0800)]
tools: Check for overlaps in internal "complete" table for DBObjectMap

Changed check to return an error count and fix tool error message

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agotools: Add dump-headers command to ceph-osdomap-tool
David Zafman [Wed, 8 Feb 2017 17:40:49 +0000 (09:40 -0800)]
tools: Add dump-headers command to ceph-osdomap-tool

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agotools: Add --oid option to ceph-osdomap-tool
David Zafman [Tue, 7 Feb 2017 05:09:42 +0000 (21:09 -0800)]
tools: Add --oid option to ceph-osdomap-tool

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoosd: Remove unnecessary assert and assignment in DBObjectMap
David Zafman [Tue, 7 Feb 2017 05:31:18 +0000 (21:31 -0800)]
osd: Remove unnecessary assert and assignment in DBObjectMap

Fix and add comment(s)

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #13754 from liewegas/wip-objectstore-random
Kefu Chai [Mon, 27 Mar 2017 14:58:29 +0000 (22:58 +0800)]
Merge pull request #13754 from liewegas/wip-objectstore-random

os: allow 'osd objectstore = random' to pick either filestore or bluestore

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: remove unuse perfcounter:l_bluestore_read_wait_flush_lat.
Jianpeng Ma [Sat, 25 Mar 2017 20:56:11 +0000 (04:56 +0800)]
os/bluestore: remove unuse perfcounter:l_bluestore_read_wait_flush_lat.

Now read don't need flush(). See commit 83e33a32fde7f83.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14088 from Adirl/rdma-cm-2
Haomai Wang [Mon, 27 Mar 2017 14:25:09 +0000 (22:25 +0800)]
Merge pull request #14088 from Adirl/rdma-cm-2

msg/async/rdma: Move resource handling to Device

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #13915 from jcsp/wip-19253
John Spray [Mon, 27 Mar 2017 14:22:43 +0000 (10:22 -0400)]
Merge pull request #13915 from jcsp/wip-19253

qa: whitelist new fullness messages in fs tests

8 years agoMerge pull request #14159 from tchaikov/wip-rbd-size_t-is-not-uint64_t-on-arm32
Jason Dillaman [Mon, 27 Mar 2017 13:33:56 +0000 (09:33 -0400)]
Merge pull request #14159 from tchaikov/wip-rbd-size_t-is-not-uint64_t-on-arm32

librbd: pass an uint64_t to clip_io() as the third param

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: pass an uint64_t to clip_io() as the 3rd param 14159/head
Kefu Chai [Mon, 27 Mar 2017 03:58:41 +0000 (11:58 +0800)]
librbd: pass an uint64_t to clip_io() as the 3rd param

because, on arm32, size_t is "unsigned", while uint64_t is "long long
unsigned int", compiler is not able to promote the former to the latter
automatically. and ImageRequest::Extents::value_type::second_type is
indeed uint64_t, which is expected by clip_io(). so let's just use
"auto" here.

Fixes: http://tracker.ceph.com/issues/18938
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #10412 from stiopaa1/mon_monitorh_addConstToGetLeader
Kefu Chai [Mon, 27 Mar 2017 03:33:36 +0000 (11:33 +0800)]
Merge pull request #10412 from stiopaa1/mon_monitorh_addConstToGetLeader

mon/Monitor.h: add const to member function

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14146 from liupan1111/wip-fix-comment
Jason Dillaman [Mon, 27 Mar 2017 02:37:45 +0000 (22:37 -0400)]
Merge pull request #14146 from liupan1111/wip-fix-comment

rbd-nbd: clean up the doc and help information

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agokv/rocksdb: add option to control whether enable DeleteRange API 13855/head
Haomai Wang [Fri, 10 Mar 2017 06:10:47 +0000 (14:10 +0800)]
kv/rocksdb: add option to control whether enable DeleteRange API

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agokv/RocksDBStore: implement rm_range_keys operator interface and test
Haomai Wang [Wed, 21 Sep 2016 09:09:12 +0000 (17:09 +0800)]
kv/RocksDBStore: implement rm_range_keys operator interface and test

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12893 from rzarzynski/wip-rgw-auth-rework-cont-2
Matt Benjamin [Sun, 26 Mar 2017 17:37:14 +0000 (13:37 -0400)]
Merge pull request #12893 from rzarzynski/wip-rgw-auth-rework-cont-2

rgw: continuation of the auth rework

8 years agomon/Monitor.h: add const to member functions 10412/head
Michal Jarzabek [Sat, 23 Jul 2016 12:57:50 +0000 (13:57 +0100)]
mon/Monitor.h: add const to member functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #10121 from theanalyst/wip-16357
Orit Wasserman [Sun, 26 Mar 2017 07:33:28 +0000 (10:33 +0300)]
Merge pull request #10121 from theanalyst/wip-16357

rgw: cls_user don't clobber existing bucket stats when creating bucket
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agorbd-nbd: polish the doc and help information. 14146/head
Pan Liu [Sun, 26 Mar 2017 06:12:28 +0000 (14:12 +0800)]
rbd-nbd: polish the doc and help information.

Signed-off-by: Pan Liu <liupan1111@gmail.com>
8 years agoMerge pull request #14134 from wangzhengyong/doc
Mykola Golub [Sat, 25 Mar 2017 20:26:23 +0000 (22:26 +0200)]
Merge pull request #14134 from wangzhengyong/doc

doc: add some undocumented options to rbd-nbd

Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14091 from trociny/wip-prepare_async_request
Jason Dillaman [Sat, 25 Mar 2017 20:21:00 +0000 (16:21 -0400)]
Merge pull request #14091 from trociny/wip-prepare_async_request

librbd: potential use of uninitialised value in ImageWatcher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13740 from Adirl/forksafe
Haomai Wang [Sat, 25 Mar 2017 19:38:35 +0000 (03:38 +0800)]
Merge pull request #13740 from Adirl/forksafe

msg/async/rdma: Add fork safe on RDMA

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agocrush: make get_immediate_parent const
Sage Weil [Wed, 15 Mar 2017 16:45:41 +0000 (12:45 -0400)]
crush: make get_immediate_parent const

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: add 'osd [rm-]pg-remap[-items] ...' commands
Sage Weil [Mon, 13 Mar 2017 15:59:07 +0000 (11:59 -0400)]
mon/OSDMonitor: add 'osd [rm-]pg-remap[-items] ...' commands

Add commands to add and remove pg_remap mappings.

Require that a mon config option is set before this is allowed so that
users don't inadvertantly prevent older clients from interacting with the
cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: ignore pg_remap[_items] mappings when target osd isout
Sage Weil [Wed, 22 Mar 2017 14:19:10 +0000 (09:19 -0500)]
osd/OSDMap: ignore pg_remap[_items] mappings when target osd isout

If the remap target is fully out, ignore the mapping.

Do not do a probabilistic 'osd_weight' rejection; pg-remap is intended to
avoid probabilistic mappings.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: add pg_remap and pg_remap_items
Sage Weil [Mon, 13 Mar 2017 15:58:22 +0000 (11:58 -0400)]
osd/OSDMap: add pg_remap and pg_remap_items

The first simply forces a pg to map to a particular value.  The second
replaces specific OSDs with specific other OSDs in the CRUSH mapping.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: clean up primary selection
Sage Weil [Mon, 13 Mar 2017 15:57:44 +0000 (11:57 -0400)]
osd/OSDMap: clean up primary selection

_pg_to_raw_osds was selecting a primary, but it was generally
getting thrown out since _raw_to_up_osds was picking a *new*
primary after filtering out down and nonexistent osds.  Add a
_pick_primary helper to do it and call that explicitly in the
callers where it can be used by all.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13965 from liewegas/wip-bluestore-pc
Sage Weil [Sat, 25 Mar 2017 18:08:33 +0000 (13:08 -0500)]
Merge pull request #13965 from liewegas/wip-bluestore-pc

os/bluestore: fix perf counters

8 years agoMerge pull request #13962 from Liuchang0812/wip-add-override-in-osd-headers
Sage Weil [Sat, 25 Mar 2017 18:07:37 +0000 (13:07 -0500)]
Merge pull request #13962 from Liuchang0812/wip-add-override-in-osd-headers

osd: add override in headers files

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agodoc: add some undocumented options to rbd-nbd 14134/head
wangzhengyong [Sat, 25 Mar 2017 07:09:01 +0000 (15:09 +0800)]
doc: add some undocumented options to rbd-nbd

Signed-off-by: wangzhengyong@cmss.chinamobile.com
8 years agoosd: add override in headers files 13962/head
liuchang0812 [Wed, 22 Feb 2017 11:43:11 +0000 (19:43 +0800)]
osd: add override in headers files

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agoMerge pull request #14114 from dmick/wip-boost-j
Kefu Chai [Sat, 25 Mar 2017 04:13:17 +0000 (12:13 +0800)]
Merge pull request #14114 from dmick/wip-boost-j

debian/rules, ceph.spec.in: invoke cmake with -DBOOST_J

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoinclude/denc: add missing {encode,decode}_nohead for denc_traits 14099/head
Kefu Chai [Fri, 24 Mar 2017 05:38:04 +0000 (13:38 +0800)]
include/denc: add missing {encode,decode}_nohead for denc_traits

implement {encode,decode}_nohead() for dec_traits<basic_string> and
bufferlist.

so compiler can find an appropriate version of decode_nohead() when
performing overload resolution. in some architectures, compiler resolves
the __u32 to size_t, which leads to a compilation failure, because the
compiler fails to instantiate the ::decode_nohead() template exposing
traits::decode_nohead().

Fixes: http://tracker.ceph.com/issues/18938
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoosd/PrimaryLogPG: remove unused custom reaction method for WaitReservation 14133/head
runsisi [Sat, 25 Mar 2017 03:23:37 +0000 (11:23 +0800)]
osd/PrimaryLogPG: remove unused custom reaction method for WaitReservation

the KickTrim event can be handled by the outer state Trimming properly

Signed-off-by: runsisi <runsisi@zte.com.cn>
8 years agoosd: remove dispatch_op_fast method declaration
runsisi [Sat, 25 Mar 2017 03:19:03 +0000 (11:19 +0800)]
osd: remove dispatch_op_fast method declaration

Signed-off-by: runsisi <runsisi@zte.com.cn>
8 years agoosd/PG: remove unused Recovering event
runsisi [Sat, 25 Mar 2017 02:21:00 +0000 (10:21 +0800)]
osd/PG: remove unused Recovering event

Signed-off-by: runsisi <runsisi@zte.com.cn>
8 years agocmake/modules/SIMDExt.cmake: add whitespace
Dan Mick [Sat, 25 Mar 2017 03:10:15 +0000 (20:10 -0700)]
cmake/modules/SIMDExt.cmake: add whitespace

readability, man, readability

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agorgw: implement the dynamic reconfiguration of auth strategies. 12893/head
Radoslaw Zarzynski [Mon, 20 Mar 2017 03:35:42 +0000 (04:35 +0100)]
rgw: implement the dynamic reconfiguration of auth strategies.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agorgw: the S3's local v2 auth engine becomes a fallback conditionally.
Radoslaw Zarzynski [Sat, 18 Mar 2017 15:16:02 +0000 (16:16 +0100)]
rgw: the S3's local v2 auth engine becomes a fallback conditionally.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agorgw: implement SwiftAnonymousEngine.
Radoslaw Zarzynski [Fri, 17 Mar 2017 22:29:54 +0000 (23:29 +0100)]
rgw: implement SwiftAnonymousEngine.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agorgw: parametrize the implicit tenancy of rgw::auth::RemoteApplier.
Radoslaw Zarzynski [Tue, 7 Feb 2017 18:10:18 +0000 (19:10 +0100)]
rgw: parametrize the implicit tenancy of rgw::auth::RemoteApplier.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agorgw: RGWPostObj_ObjStore_S3 doesn't instantiate auth strategy for each request anymore.
Radoslaw Zarzynski [Tue, 7 Feb 2017 14:11:19 +0000 (15:11 +0100)]
rgw: RGWPostObj_ObjStore_S3 doesn't instantiate auth strategy for each request anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agorgw: fix appending '\0' in the rgw::auth::LocalApplier::to_str().
Radoslaw Zarzynski [Tue, 7 Feb 2017 13:28:40 +0000 (14:28 +0100)]
rgw: fix appending '\0' in the rgw::auth::LocalApplier::to_str().

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #13889 from liewegas/wip-denc-nullptr
Sage Weil [Fri, 24 Mar 2017 21:41:37 +0000 (16:41 -0500)]
Merge pull request #13889 from liewegas/wip-denc-nullptr

include/denc: remove nullptr runtime magic boundedness check

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14096 from baiyanchun/remove_useless_parameter
Sage Weil [Fri, 24 Mar 2017 21:41:18 +0000 (16:41 -0500)]
Merge pull request #14096 from baiyanchun/remove_useless_parameter

common: remove useless parameter

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
8 years agoMerge pull request #14131 from liewegas/wip-crush-encode
Sage Weil [Fri, 24 Mar 2017 20:28:27 +0000 (15:28 -0500)]
Merge pull request #14131 from liewegas/wip-crush-encode

crush: only encode class info if SERVER_LUMINOUS

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #13960 from wangzhengyong/kstore
Sage Weil [Fri, 24 Mar 2017 18:17:39 +0000 (13:17 -0500)]
Merge pull request #13960 from wangzhengyong/kstore

os/kstore: some error handling

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13973 from shinobu-x/wp-sk-primarylogpg-null-nullptr
Sage Weil [Fri, 24 Mar 2017 18:16:58 +0000 (13:16 -0500)]
Merge pull request #13973 from shinobu-x/wp-sk-primarylogpg-null-nullptr

osd/PrimaryLogPG: nullptr not NULL

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13995 from liuhongtong/wip-config
Sage Weil [Fri, 24 Mar 2017 18:13:39 +0000 (13:13 -0500)]
Merge pull request #13995 from liuhongtong/wip-config

common/config: set rocksdb_cache_size to OPT_U64

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14013 from ShiqiCooperation/newshiqi
Sage Weil [Fri, 24 Mar 2017 18:12:16 +0000 (13:12 -0500)]
Merge pull request #14013 from ShiqiCooperation/newshiqi

test/unittest_bluefs: check whether add_block_device success

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agocrush: only encode class info if SERVER_LUMINOUS 14131/head
Sage Weil [Fri, 24 Mar 2017 17:59:34 +0000 (13:59 -0400)]
crush: only encode class info if SERVER_LUMINOUS

This fixes OSDMap reencode crc mismatches on jewel to
luminous upgrades.

Fixes: http://tracker.ceph.com/issues/19361
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoceph.spec.in: derive _smp_ncpus and use it for -DBOOST_J 14114/head
Dan Mick [Fri, 24 Mar 2017 02:35:08 +0000 (19:35 -0700)]
ceph.spec.in: derive _smp_ncpus and use it for -DBOOST_J

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoceph.spec.in: move lowmem_build setting of _smp_mflags
Dan Mick [Fri, 24 Mar 2017 02:34:28 +0000 (19:34 -0700)]
ceph.spec.in: move lowmem_build setting of _smp_mflags

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agodebian/rules: invoke cmake with -DBOOST_J
Dan Mick [Thu, 23 Mar 2017 23:36:53 +0000 (16:36 -0700)]
debian/rules: invoke cmake with -DBOOST_J

Allow boost build during toplevel cmake from Debian package build
to benefit from multiple processors.  Should speed build a lot
on many-proc machines (say, arm64).  Use argument passed to
debhelper.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agorgw: improve logs in the RGWAccessControlPolicy class.
Radoslaw Zarzynski [Tue, 7 Feb 2017 13:27:10 +0000 (14:27 +0100)]
rgw: improve logs in the RGWAccessControlPolicy class.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>