Commit Graph

72902 Commits

Author SHA1 Message Date
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
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
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
Ilya Dryomov
156cf45214 qa: krbd discard/zeroout tests
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-05-31 14:39:08 +02: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
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
Yehuda Sadeh
760c5e4f86 Merge pull request #15184 from cbodley/wip-qa-rgw-cleanup
qa/rgw: remove apache/fastcgi and radosgw-agent tests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-05-30 13:09:31 -07:00
Casey Bodley
6049d97740 Merge pull request #13851 from zhangsw/optimize-datasync
rgw: optimize data sync. Add zones_trace in log to avoid needless sync.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-05-30 14:16:07 -04:00
David Zafman
1dbb15d340 Merge pull request #15368 from dzafman/wip-20089
osd: When scrub finds an attr error mark shard inconsistent

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-30 10:46:23 -07:00
Sage Weil
e88cccf969 Merge pull request #15350 from mrbojangles3/master
libradosstriper: Add example code
2017-05-30 12:32:06 -05:00
Sage Weil
3f99839b41 Merge pull request #15356 from joscollin/wip-test-msgr-warning
test/msgr: silence warnings from -Wsign-compare
2017-05-30 12:29:51 -05:00
Sage Weil
b38495c84e Merge pull request #15362 from andihit/doc-rados-xattr-commands
doc: add rados xattr commands to manpage

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 12:28:34 -05:00
Sage Weil
57bef92ba1 Merge pull request #15366 from joscollin/wip-cleanup-test-remove-commented-code
test/old: Removed commented code

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-30 12:25:39 -05:00
David Zafman
44736aac74 osd: When scrub finds an attr error mark shard inconsistent
Fixes: http://tracker.ceph.com/issues/20089

Signed-off-by: David Zafman <dzafman@redhat.com>
2017-05-30 09:32:53 -07:00
Sage Weil
3d7a3d7ab8 Merge pull request #14971 from SUSE/wip-mgr-py-sub-interpreter
mgr: load modules in separate python sub-interpreters

Reviewed-by: John Spray <john.spray@redhat.com>
2017-05-30 11:02:27 -05:00
Sage Weil
496d63a163 os/bluestore: bluestore_debug_fsck_abort
Abort fsck early to get a massif result.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-30 11:54:28 -04:00
Yuri Weinstein
805acce791 Merge pull request #15259 from zealoussnow/wip-0524
build: remove ceph-disk-udev entirely 

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
2017-05-30 08:44:47 -07:00
Yuri Weinstein
7a2ca3323b Merge pull request #15285 from smithfarm/wip-kill-fcgi
build/ops: drop libfcgi build dependency

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 08:42:55 -07:00
Jos Collin
1f32a9c5e1 test/old: Removed commented code
There were lot of commented code inside src/test/old/testcrush.cc. This was found while doing
the PR#15364. Removed them.

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-05-30 21:01:22 +05:30
Sage Weil
aefd56b450 Merge pull request #15359 from liewegas/wip-kraken-x
qa/suites/upgrade/kraken-x: enable experimental for bluestore

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 09:38:31 -05:00
Andreas Gerstmayr
5ededbef91 doc: add rados xattr commands to manpage
Signed-off-by: Andreas Gerstmayr <andreas.gerstmayr@catalysts.cc>
2017-05-30 16:02:09 +02:00
Casey Bodley
1a02bb4c7b Merge pull request #15306 from mikulely/fix-test_multi
rgw: fix test_multi.py default config file path

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-05-30 09:46:28 -04:00
Sage Weil
22ddc2e64a qa/suites/upgrade/kraken-x: enable experimental for bluestore
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-30 09:28:13 -04:00
Sage Weil
99d96c3c09 Merge pull request #15294 from liewegas/wip-osd-tree
osd: 'osd tree in|out|up|down' to filter tree results

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 08:22:35 -05:00
Kefu Chai
9fd19500bf Merge pull request #15225 from smithfarm/wip-s390-rgw
build/ops: conditionalize rgw Beast frontend so it isn't built on s390x architecture

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 20:39:12 +08:00
Sage Weil
0027a3b9be mon: add up|down|in|out filters to 'osd tree'
For example, 'ceph osd tree down' will show *just* down OSDs and their
ancestors.  \o/

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-30 08:21:16 -04:00
Nathan Cutler
3dfffa5996 cmake: link radosgw with boost libraries
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-30 13:01:16 +02:00
Jos Collin
80145b4c9d test/msgr: silence warnings from -Wsign-compare
The following warning appears during make:

ceph/src/test/msgr/test_msgr.cc: In member function ‘virtual void MessengerTest_MarkdownTest_Test::TestBody()’:
ceph/src/test/msgr/test_msgr.cc:1474:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     CHECK_AND_WAIT_TRUE(srv_dispatcher.count > last + 1);
                         ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
ceph/src/test/msgr/test_msgr.cc:54:9: note: in definition of macro ‘CHECK_AND_WAIT_TRUE’
     if (expr)                           \
         ^~~~
ceph/src/test/msgr/test_msgr.cc:1475:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (srv_dispatcher.count == last) {
         ~~~~~~~~~~~~~~~~~~~~~^~~~~~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-05-30 10:49:23 +05:30
Kefu Chai
592d95e58e Merge pull request #15355 from joscollin/wip-cleanup-testdenc-warning
test: test_denc.cc: silence warning from -Wsign-compare

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 12:28:12 +08:00
Jos Collin
e6a40e9e0e test: test_denc.cc: silence warning from -Wsign-compare
The following warning appears during make:
ceph/src/test/test_denc.cc:669:5:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1530:28: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
ceph/src/googletest/googletest/include/gtest/gtest.h:1510:7:
   if (val1 op val2) {\

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-05-30 08:36:01 +05:30
Sage Weil
f53f56350b os/bluestore: deep decode onode value
In particular, we want the attrs (map<string,bufferptr>) to be a deep
decode so that we do not pin this buffer, and so that any changed attr
will free the previous memory.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:19 -04:00