Commit Graph

72958 Commits

Author SHA1 Message Date
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
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
Patrick Donnelly
acde67b36a
mds: check export pin during replay
Fixes: http://tracker.ceph.com/issues/20039

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-05-30 09:09:22 -07:00
Patrick Donnelly
76335b0e0f
qa: improve debug message for subtree wait
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-05-30 09:08:27 -07:00
Patrick Donnelly
2cc1fb04df
mds: use generic name for export dir wait class
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-05-30 09:08:24 -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
Dongsheng Yang
8f3ef393f3 bluestore: fix a typo about bleustore
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-05-30 18:32:49 +08: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
Sage Weil
d334d2d3cb os/bluestore: fsck: use btree_set to replace set<uint64_t>
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:18 -04:00
Sage Weil
7a51a34292 include/cpp-btree/btree_set: add btree_set
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:18 -04:00
Sage Weil
0fae9bf434 ceph-bluestore-tool: init deep = false
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:18 -04:00
Sage Weil
8761624574 os/bluestore: rebuild Buffer buffers with too much waste
Avoid pinning extra memory by rebuilding Buffer buffers when we waste too
much.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:18 -04:00
Sage Weil
cf98e9d5bf buffer: make wasted() const
Remove useless assert (we'll segv on the next line anyway).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:18 -04:00
Sage Weil
ecb3167f1b os/bluestore: wait for kv thread to start before stopping it
Otherwise we can assert out when we try to join a thread that
hasn't started.

- move everything into _kv_start() and _kv_stop()
- separate stop bools for each thread
- wait until thread starts before signalling stop (and potentially calling
join()).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:17 -04:00
Sage Weil
811c38ed6b os/bluestore: fix fsck deferred_replay
_deferred_replay needs the kv_sync_thread to complete IOs; start them
just for that, but then shut them down again.  (We might revisit that
later if/when fsck does any sort of repair.)

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:56:17 -04:00
Sage Weil
d79c7723eb Merge pull request #15058 from yuyuyu101/wip-rocksdb-opt
kv/rocksdb: supports SliceParts interface

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-29 20:47:52 -05:00
Sage Weil
5988651e8c Merge pull request #15068 from liewegas/wip-osdmap-require
osd/OSDMap: replace require_*_osds flags with a single require_osd_release field

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-29 20:47:06 -05:00
Sage Weil
43a58ec2a2 Merge pull request #15313 from Linbing/wip-pg-scrub-code-optimize
mon: it's no need to get pg action_primary osd twice in pg scrub

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-29 20:42:50 -05:00
Sage Weil
3d6b6d72f7 mon/OSDMonitor: fix osd metadata update ordering
Do not do both.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:34:29 -04:00
Sage Weil
e570005e2c osd: replace all require_*_osds flag checks with a require_osd_release comparison
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:34:29 -04:00
Sage Weil
3118d9a154 osd: replace require_*_osds flags with require_osd_release field
- OSDMap encode and decode translate between the flags and int
representations.
- OSDMap::Incremental only does decode; we do not expect to ever encode
an incremental osdmap for an old osd that sets any of these flags.
- the 'osd set' command still lets you set the jewel and kraken flags,
but not luminous.
- OSDMap::apply_incremental handles the conversion of legacy require flags
to the new field if the jewel or kraken flags have to be set before
starting the osd upgrade.
- clear out the legacy flags when we make the luminous transition only;
until then we keep using the old flag in the encoded and decoded version
(although the require_osd_release field will be accurate in memory in all
cases).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:33:17 -04:00
Sage Weil
0b517992e0 mon: new 'osd require-osd-release' command
Note that we only allow setting this to 'luminous'.  If the 'jewel' or 'kraken'
flags need to be set that can be done through the legacy interface.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:33:17 -04:00
Sage Weil
3d4c4d9d9d osd/OSDMap: add require_osd_release numeric field, CEPH_RELEASE_*
Instead of eating up a flag for each release, which is super-awkward and
annoying, just keep a numeric release version min.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:33:17 -04:00
Willem Jan Withagen
9b1afe4aca cmake: delete excidentail reintroduced line.
- This target got reintroduced by accident after the creation
  of ceph-common in commit:
    https://github.com/ceph/ceph/commit/046b2bde6d93992c36d4943c4f7859993f034ca

  Detection was trigger by refering to libresolv, and results in a
  linking error.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-29 22:47:47 +02:00
Nathan Cutler
25d794d98a build/ops: deb: no rgw Beast frontend on s390x
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-29 22:47:46 +02:00
Nathan Cutler
12625e1e92 build/ops: rpm: no rgw Beast frontend on s390x
Since the Beast frontend uses boost::context which is not supported on
s390x.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-05-29 22:47:46 +02:00