Commit Graph

73210 Commits

Author SHA1 Message Date
Sage Weil
538dbb09de Merge pull request #15385 from myoungwon/wip-20114
test/osd/TestRados.cc: run set-redirect test after finishing setup

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-31 18:06:40 -05:00
David Zafman
de97f8b607 Revert "osd: When scrub finds an attr error mark shard inconsistent"
This reverts commit 44736aac74.

Signed-off-by: David Zafman <dzafman@redhat.com>
2017-05-31 16:05:10 -07:00
Sage Weil
2984e5a120 Merge pull request #14457 from ceph/wip-rest-flask
ceph-mgr: Implement new pecan-based rest api
2017-05-31 17:48:43 -05:00
Yehuda Sadeh
4aea15fed2 rgw: fix import
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-05-31 15:01:56 -07:00
John Spray
30da9b7681 mon: revise "ceph status" output
Signed-off-by: John Spray <john.spray@redhat.com>
2017-05-31 17:52:40 -04:00
Matt Benjamin
dc12370f8f Merge pull request #15222 from guihecheng/rgw_file-fix-unlink
rgw_file: fix flags set on unsuccessful unlink
2017-05-31 16:57:20 -04:00
Matt Benjamin
a94de3ae16 Merge pull request #15329 from guihecheng/rgw_file-readdir
rgw_file: add lock protection for readdir against gc
2017-05-31 16:35:37 -04:00
Boris Ranto
f086499251 Merge pull request #14871 from ceph/wip-selinux-optimize
selinux: Do parallel relabel on package install

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-31 20:53:14 +02:00
Sage Weil
5f37da539a mempool: dump total, too
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:48:00 -04:00
Sage Weil
1965860810 osd: (loosely) mark cached map bl buffers as osd_mapbl
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:48:00 -04:00
Sage Weil
23a186c7a8 os/bluestore: mark buffer caches buffers as bluestore_data
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:48:00 -04:00
Sage Weil
390b4d15e5 buffer: remove buffer_data mempool
We are explicitly accounting for buffers via arbitrary pools, defaulting
to buffer_anon, so we don't need buffer_data anymore.  It leads to
double-counting.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:48:00 -04:00
Sage Weil
e2b4a00455 buffer: allow buffers to map into arbitrary mempools
- default is buffer_anon
- buffer_data includes *all* buffers across all mempools, and is the
*actual* allocation (includes raw_combined).
- buffer_meta is other buffer-related overhead.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:48:00 -04:00
Sage Weil
1dc6393daf mempool: allow pool counts to be adjusted explicitly
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:47:28 -04:00
Sage Weil
6cd6a513ca buffer: fix mempool accounting for claimed chars
These are allocated by the caller, outside of the mempool; do not
deallocate via the mempool.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:47:28 -04:00
Sage Weil
429b65c639 mempool: kill unittest_? mempools
These were just annoying.  Use some real ones that will be empty
for the unit tests.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:47:28 -04:00
Sage Weil
b19352eec3 Merge pull request #15291 from liewegas/wip-osdmap-pgtemp
osd/OSDMap: make pg_temp more efficient

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-31 13:47:00 -05:00
Sage Weil
f78051cf27 Merge pull request #15321 from liewegas/wip-failed-msg
mon/OSDMonitor: change info in 'osd failed' messages

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-31 13:46:09 -05:00
Sage Weil
9628b0edc0 pybind/rados: add monitor_log2
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:39:55 -04:00
Sage Weil
241683e01c librados: add rados_monitor_log2 that includes EntityName
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:39:55 -04:00
Sage Weil
2a28267758 librados: use EntityName in monitor_log line
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:39:54 -04:00
Sage Weil
6c520ffb0f common/LogEntry: include EntityName in log entries
We want the auth name (mon.hostname), not the entity_name_t (mon.0) to
appear in the log messages.  In particular this is helpful for the mgr,
which will now appear as mgr.hostname instead of client.1234.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:39:54 -04:00
Sage Weil
e19448c9f5 common/entity_name: do not populate type_id string for type==0
The EntityName ctor leaves type == 0.  If we encode and
then decode that value, we end up calling set(), which
tries (and fails) to populate the type_id string, leaving
you with an instance that renders as 'unknown.' instead
of ''.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 14:39:54 -04:00
Jason Dillaman
aa94770219 Merge pull request #15388 from idryomov/wip-krbd-fallocate-tests
qa: krbd discard/zeroout tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-05-31 12:38:15 -04:00
Sage Weil
0a8beea82e Merge pull request #15135 from cbodley/wip-denc-sstring
denc: add encode/decode for basic_sstring

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-31 10:38:53 -05:00
Sage Weil
2c231f9b4b Merge pull request #13802 from LiumxNL/wip-170306
mon/OSDMonitor: use up set instead of acting set in reweight_by_utilization

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-31 10:38:24 -05:00
Ganesh Mahalingam
371d45db44 erasure-code: Remove duplicate of isa-l files
There are two copies of isa-l. While one is a git submodule the other
was a static copy from an older version. This change helps with removing
the duplicate and maintain a single copy.
This is also upgrading isa-l used by (src/erasure-code/isa/isa-l) from
v2.14 to v2.16.0

Signed-off-by: Ganesh Mahalingam <ganesh.mahalingam@intel.com>
2017-05-31 07:44:49 -07:00
Sage Weil
e4f156f3b8 Merge pull request #15295 from liewegas/wip-bluestore-fsck
os/bluestore: fix fsck deferred_replay

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-05-31 09:39:18 -05:00
myoungwon oh
a058ebbda4 test/osd/TestRados.cc: run test after finishing redirect setup
set-redirect test creates more objects than default due to redirect mapping
(let's assume that we create 500 objects, oid 1 -> oid 501, oid 2 -> oid 502)
But the test should use objects within pre-defined range. For example,
If the number of object is 500, only 1~500 oid are allowed for test operations.

In the failure cases, test operation tried to use wrong oids (which means
higher than 500). This is because the bug in the setup phase.
If max_inflights > 1, set-redirect can be finished after setup is completed.
(so wrong oid is included in oid_in_use).
We need to completely remove redirect objects in oid_in_use before start the test.

Fixes: http://tracker.ceph.com/issues/20114
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-05-31 23:25:00 +09:00
Ilya Dryomov
156cf45214 qa: krbd discard/zeroout tests
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-05-31 14:39:08 +02:00
Boris Ranto
6991764f3b rpm: Move ceph-disk to ceph-base
The SELinux package now requires the ceph-disk binary but that one was
part of the ceph-osd package. The ceph-disk python library is already
packaged in ceph-base so moving ceph-disk to ceph-base seems like a
reasonable next step.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-31 14:03:53 +02:00
Gui Hecheng
3b1d78bd57 rgw_file: add lock protection for readdir against gc
The state.mtx protects state.events accessed both from readdir and gc.
Fixes: http://tracker.ceph.com/issues/20121

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
2017-05-31 17:29:52 +08:00
Jos Collin
37b7a1e85f Merge pull request #15374 from yonghengdexin735/wip-zzz-mds
mon: Removed unnecessary function declaration in MDSMonitor.h

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-05-31 13:20:45 +05:30
Loic Dachary
2e5fba072d crush: update choose_args on adjust_item_weight
The osd_crush_update_weight_set (true by default) can be used to disable
the update of the weights.

Signed-off-by: Loic Dachary <loic@dachary.org>
2017-05-31 10:30:46 +03:00
Loic Dachary
b02ad2326d crush: update choose_args when items are added/removed
When items are added:

- the value in the weight set is set to the target weight. It is assumed
  that weight set are updated on a regular basis and will eventually be
  set to a value that prevents excessive over/under filling.

- the value in the id list is set to the item id.

When items are removed, their weight / ids in all choose_args are
removed.

Signed-off-by: Loic Dachary <loic@dachary.org>
2017-05-31 10:30:46 +03:00
Jos Collin
69522c619e src: put-to operator function - const input cleanup
Fixed the instances of the issue specified in Tracker#3977 inside src/ folder utmost, by adding
const input. This fix avoids the following directories inside src: rocksdb/ zstd/ boost/ rapidjson/ googletest/ Beast/.

Fixes: http://tracker.ceph.com/issues/3977

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-05-31 12:08:01 +05:30
Kefu Chai
b41a8bb13c Merge pull request #15373 from kestrels/wip-asm-capital-S
build: Use .S suffix for ppc64le assembly files

Reviewed-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-05-31 13:46:56 +08:00
yonghengdexin735
0c3c348adc mon:remove useless function for MDSMonitor::generate_mds_map()
Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
2017-05-31 11:34:23 +08:00
Sage Weil
49f64e7e4d Merge pull request #15351 from liewegas/wip-osdmap-require-min-client
osd/OSDMap: replace string-based min_compat_client with a CEPH_RELEASE_* uint8_t

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-30 21:48:01 -05:00
Sage Weil
633c20e135 osdmaptool: fix cli tests
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-30 22:47:27 -04:00
Sage Weil
32f10b3652 common/version: include release name and type in version string
ceph version 12.0.2-1687-ge042051 (e0420518d712d87a4882b3a327eaf1d3fcea12df) luminous (dev)

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-30 22:47:26 -04:00
Sage Weil
f22997e24b osd/OSDMap: switch [require_]min_compat_client to CEPH_RELEASE_* values
Instead of using a string, use the defined CEPH_RELEASE_* values.  This
is simpler.

We allow decoding of post-kraken pre-luminous maps that use the string
values.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-30 22:47:26 -04:00
Sage Weil
036a688033 common: expand CEPH_RELEASE_ names; rename helper
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-30 22:47:26 -04:00
Jos Collin
13e73303e9 Merge pull request #15331 from yonghengdexin735/wip-zzz-override
mon: Add override for FsNewHandler::handle()

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-05-31 07:27:48 +05:30
Andrew Solomon
d7742d2c2d build: Use .S suffix for ppc64le assembly files
The assembly file name suffix was changed from .S to .s,
which caused a build break on ppc64le architecture.

To fix this issue, the suffix will be changed back to .S
for ppc64le assembly files only.  The x86 assembly files
can retain the .s suffix.

Fixes: http://tracker.ceph.com/issues/20106
Signed-off-by: Andrew Solomon <asolomon@us.ibm.com>
2017-05-31 01:14:26 +00:00
yonghengdexin735
3011b11d41 mon: Add override for FsNewHandler::handle()
Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
2017-05-31 08:34:42 +08:00
Boris Ranto
077038b439 ceph-disk: Fix the file ownership, skip missing
This commit fixes the file ownership for the /usr/bin/ and /etc/ceph
files and skips missing files as some of the files that we do specify
now can be missing from the system (not installed, e.f. radosgw).

Fixes: http://tracker.ceph.com/issues/20077

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-31 01:35:12 +02:00
Boris Ranto
1cecddf031 selinux: Do parallel relabel on package install
We can take advantage of ceph-disk fix subcommand when doing a package
install. We will keep using the differential fixfiles command otherwise.

We also need to add relabel for /usr/bin/ daemons so that we could use
this.

Fixes: http://tracker.ceph.com/issues/20077

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-31 01:35:11 +02:00
Brad Hubbard
f110a82437 osd: Move scrub sleep timer to osdservice
PR 14886 erroneously creates a scrub sleep timer for every pg resulting
in a proliferation of threads. Move the timer to the osd service so
there can be only one.

Fixes: http://tracker.ceph.com/issues/19986

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-05-31 09:29:49 +10:00
Yehuda Sadeh
8519dc46bf test/rgw: drop use of urllib
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-05-30 13:27:01 -07:00