Commit Graph

71277 Commits

Author SHA1 Message Date
Jason Dillaman
ca70fe440a Merge pull request #14631 from idryomov/wip-krbd-data-pool-fix
qa: krbd_data_pool.sh: account for rbd_info metadata object

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-19 07:30:27 -04:00
Abhishek L
0eae8d37d0 Merge pull request #14385 from smithfarm/wip-release-script-strip-periods
tools: ceph-release-notes: strip trailing punctuation

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-04-19 13:08:47 +02:00
Piotr Dałek
2dd7718409 test/osd/osd-dup.sh: warn on low open file limit
This test fails badly when open file limit is low. Increasing to around
1536 seems to be doing the trick, so warn the user with appropriate
message and try to proceed anyway.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
2017-04-19 12:57:38 +02:00
John Spray
b4c32b1b58 osdc: remove journaler_allow_split_entries option
This had been broken for some time, as since the new
JournalStream stuff, zero padding was no longer a valid
encoding.

Fixes: http://tracker.ceph.com/issues/19691
Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-19 11:41:28 +01:00
Loic Dachary
0011127604 Merge pull request #14599 from smithfarm/wip-crushtool-mappings
doc: mention --show-mappings in crushtool manpage

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-04-19 11:42:37 +02:00
Tim Serong
4fe7a87076 yasm-wrapper: strip -E (stops ccache trashing source files)
When building with ccache (`./do_cmake.sh -DWITH_CCACHE=ON`), it seems
ccache invokes `yast-wrapper` more than once per source file, the first
time with '-E' immediately before the source file in the argument list.
'-E' is an option for gcc which tells it to stop after the preprocessing
stage.  With yasm however, -E means "redirect error messages to file",
which makes yasm thinks there's no input files, and writes "yasm: No input
files specified" *over* the source file.  Then, the second run of
`yast-wrapper` (attempting to actually compile) fails with:

~/src/common/crc32c_intel_fast_asm.S:1: error: instruction expected after label

Curiously, this doesn't seem to affect all asm files; for me it
trashes crc32c_intel_fast_asm.S, but various other asm files build fine
without being clobbered.  I'm uncertain whether this is an issue
peculiar to openSUSE Tumbleweed, to ccache 3.3.3, or something else,
but in any case, having `yast-wrapper` strip '-E' fixes it.

Signed-off-by: Tim Serong <tserong@suse.com>
2017-04-19 19:05:32 +10:00
Kefu Chai
f6768064f6 osd: piggyback lec in OSDBeacon message
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-19 15:05:12 +08:00
Kefu Chai
5f95c972a4 messages/MOSDBeacon: add last_epoch_clean support
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-19 15:05:12 +08:00
Kefu Chai
6b75ec3c92 osd/OSDMonitor: trim last_osd_report if the osd is marked up/down
and clear it at restart()

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-19 15:05:03 +08:00
Jos Collin
b985d1e6a2 osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf
Renamed the new vector name in OSDMap::build_simple_crush_map_from_conf, to avoid confusing it
with the sections vector outside the for loop and which is iterating.

Resolved merge conflicts.

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-04-19 08:23:10 +05:30
Kefu Chai
9d5fa6129d Merge pull request #14483 from wjwithagen/wip-wjw-freebsd-ceph-disk-list
src/ceph-disk/ceph_disk/main.py: Make 'ceph-disk list' work on FreeBSD

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-19 09:23:32 +08:00
Jos Collin
81c794a0ed osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf
Renamed the new vector name in OSDMap::build_simple_crush_map_from_conf, to avoid confusing it with the sections vector outside the for loop and which is iterating.

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-04-19 06:45:39 +05:30
Casey Bodley
55f276ba53 test/rgw: rewrite test_multi.py in terms of rgw_multi
logging changes inspired by Abhishek Lekshmanan <abhishek@suse.com>

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-18 19:13:40 -04:00
Casey Bodley
87f8c262d6 test/rgw: add tests in rgw_multi/tests.py based on multisite.py
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-18 19:13:40 -04:00
Casey Bodley
76c96736a7 test/rgw: add rgw_multi/multisite.py
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-18 19:13:40 -04:00
Sage Weil
1e6531e28a Merge pull request #14614 from wjwithagen/wip-wjw-cephtool-test-mon.sh
qa/workunits/cephtool/test.sh: Be more liberal in testing health-output.

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-18 16:56:37 -05:00
Abhishek L
27c3784f73 Merge pull request #14106 from theanalyst/release/12.0.1
doc: add 12.0.1 release notes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-04-18 23:14:18 +02:00
Sage Weil
bac484f225 qa/objecstore/bluestore-comp: test bluestore with compression on
Enable aggressive compression.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-18 16:53:58 -04:00
Sage Weil
fb6cc95ad9 qa/objectstore/bluestore: drop old option
This test code has been removed.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-18 16:53:41 -04:00
Ilya Dryomov
5b2d7f76bb qa: krbd_data_pool.sh: account for rbd_info metadata object
... added in commit a16beba784 ("librbd: image create validates that
pool supports overwrites").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-04-18 21:47:36 +02:00
Casey Bodley
173ee90b27 test/rgw: add skeleton rgw_multi module
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-18 14:49:18 -04:00
Casey Bodley
f5e2b9fd09 test/rgw: update and fixes for test-rgw-multisite.sh
the script was incomplete and unused, but it seems useful in itself
to bring up a simple multisite cluster without having to go through
test_multi.py. it's also a good test for functions in the other
test-rgw-*.sh scripts

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-18 14:49:18 -04:00
Casey Bodley
6be00007b8 test/rgw: test_multi.py uses cluster_id for calls
this makes the underlying scripts more flexible, because they don't
depend on having a cluster name in the zgX-cY format

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-18 14:49:18 -04:00
Sage Weil
0e0fc8c205 Merge pull request #14619 from cbodley/wip-rgw-encryption-build-fix
rgw: remove extra RGWMPObj in rgw_multi.h

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-18 13:17:52 -05:00
Casey Bodley
c17875567f rgw: remove extra RGWMPObj in rgw_multi.h
two separate PRs had done refactoring around RGWMPObj, and it ended up
in two different places. remove the one in rgw_multi.h, because
rgw_rados.h now depends on its definition

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-18 14:08:55 -04:00
Sage Weil
489e810c37 mon/PGMonitor: clean up min/max span warning
Clean up option naming.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-18 13:54:56 -04:00
Sage Weil
c6676a7425 Merge pull request #14418 from songbaisen/m20
mon: fix synchronise pgmap with others 

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-18 12:43:28 -05:00
Sage Weil
8ded80fb96 Merge pull request #14436 from dachary/wip-19513-ceph-disk-device-class
ceph-disk,osd: add support for crush device classes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-18 12:43:04 -05:00
Zack Cerza
28d746bff3 Merge pull request #14464 from ceph/wip-systemd
qa/tasks: use sudo to check ceph health for systemd test
2017-04-18 11:34:27 -06:00
Mykola Golub
6b937e384e Merge pull request #14615 from dillaman/wip-19636
librbd: corrected resize RPC message backwards compatibility

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-18 20:28:01 +03:00
Yuri Weinstein
b0ea1f17fc Merge pull request #14381 from joscollin/wip-cleanup-osdmap-rangefor
osd: Cleanup-Updated OSDMap.cc with C++11 style range-for loops

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-18 10:08:41 -07:00
Yuri Weinstein
82c0ea7c99 Merge pull request #14431 from liewegas/wip-mgrclient-leak
mgr/MgrClient: fix reconnect event leak

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-18 10:04:50 -07:00
Yuri Weinstein
721929d60c Merge pull request #14507 from tchaikov/wip-19590
mgr: always free allocated MgrPyModule

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2017-04-18 10:01:47 -07:00
Sage Weil
ce188e8fdf osd: pg-remap -> pg-upmap
'remap' is to non-specific a name.  In particular, it
sounds like it is related to the 'remapped' PG state
but in reality it is not related.

'upmap' or 'pg-upmap' is more specific: it maps a pgid
to the 'up' set value (or item)

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-18 12:59:40 -04:00
Casey Bodley
da7acc4211 Merge pull request #13597 from cbodley/wip-s3tests-crypto
qa/rgw: add configuration for server-side encryption tests

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-04-18 12:28:37 -04:00
Casey Bodley
6a1e10fdff Merge pull request #13483 from ceph/wip-rgw-encryption-doc
doc: rgw server-side encryption and barbican

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-04-18 12:27:27 -04:00
Casey Bodley
95b3a8a6c3 Merge pull request #11049 from aclamk/wip-rgw-s3-crypto-sse-kms-plugin
rgw: s3 server-side encryption (SSE-C, SSE-KMS)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-18 12:25:09 -04:00
Kefu Chai
1b54b5f3f1 Merge pull request #14415 from smithfarm/wip-19556
tests: Thrasher: handle "OSD has the store locked" gracefully

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-18 23:18:35 +08:00
Kefu Chai
c1ba579a7c Merge pull request #14456 from tchaikov/wip-rocksdb-freebsd-build
rocksdb: sync with upstream

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2017-04-18 23:17:03 +08:00
Matt Benjamin
e9aec52028 Merge pull request #14609 from linuxbox2/wip-rgw-file-wattrs
rgw_file:  pre-compute unix attrs in write_finish()
2017-04-18 11:04:45 -04:00
David Zafman
964ee3aebf Merge pull request #14488 from dzafman/wip-15789
Give requested scrub work a higher priority

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-18 07:54:46 -07:00
Jason Dillaman
9db305a99f librbd: corrected resize RPC message backwards compatibility
Commit d1f2c557 incorrectly changed the order of variables within
the payload. This resulted in breaking the resize RPC message
with older versions of Ceph.

Fixes: http://tracker.ceph.com/issues/19636
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-18 10:05:53 -04:00
Sage Weil
93db36f462 Merge pull request #14600 from tchaikov/wip-19390
debian: package ceph.logroate properly

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-04-18 08:37:07 -05:00
Matt Benjamin
ed91d23cca rgw_file: pre-compute unix attrs in write_finish()
New serialized Unix attrs need to reflect the change being made,
and should be reverted if the change fails.

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

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-04-18 09:19:13 -04:00
John Spray
033ee6bd1f Merge pull request #14396 from jcsp/wip-19550
qa: re-enable ENOSPC tests for kclient
2017-04-18 12:59:14 +01:00
John Spray
d98e19fdbd Merge pull request #14589 from jcsp/wip-19640
client: refine fsync/close writeback error handling

Reviewed-by: Jeff Layton <jlayton@redhat.com>
2017-04-18 12:58:37 +01:00
John Spray
a2a100dc13 Merge pull request #14272 from jcsp/wip-vstart-fixup
qa: fix test_standby_for_invalid_fscid with vstart_runner

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-04-18 12:50:20 +01:00
John Spray
a765f249f1 Merge pull request #14196 from jcsp/wip-cephfs-relnotes
PendingReleaseNotes: recent cephfs changes
2017-04-18 12:50:04 +01:00
John Spray
612fe8422b Merge pull request #14105 from jcsp/wip-pretty-tell
mds: pretty json from `tell` commands

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-04-18 12:49:39 +01:00
John Spray
a762ad4d7f Merge pull request #14104 from jcsp/wip-18509
mds: include advisory `path` field in damage

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-04-18 12:48:52 +01:00