Commit Graph

46127 Commits

Author SHA1 Message Date
Loic Dachary
247ee6084b build/ops: enable CR in CentOS 7
To get libunwind from the CR repositories until CentOS 7.2.1511 is released.

http://tracker.ceph.com/issues/13997 Fixes: #13997

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-12-08 08:25:24 +01:00
Loic Dachary
91264778b3 Merge pull request #6842 from badone/wip-13997
tests: centos7 needs the Continuous Release (CR) Repository enabled for

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-08 07:47:06 +01:00
Brad Hubbard
b47eeae1da tests: centos7 needs the Continuous Release (CR) Repository enabled for
libunwind

Fixes: #13997
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-12-08 16:07:38 +10:00
Gregory Farnum
b1d5c48187 Merge pull request #6601 from jcsp/wip-13777-caps
mon: don't require OSD W for MRemoveSnaps

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-06 21:03:25 -08:00
Loic Dachary
59c7fa091d Merge pull request #6811 from smithfarm/wip-submitting-jewel
SubmittingPatches: there is no next; only jewel

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-05 18:11:53 +01:00
Nathan Cutler
1adf3063ac SubmittingPatches: there is no next; only jewel
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-12-05 17:20:50 +01:00
Josh Durgin
73aab5e93e test: use sequential journal_tid for object cacher test
This matches the real usage by librbd.

Fixes: #13877
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 9331e031bd)
2015-12-04 11:11:20 -08:00
Sage Weil
9f18962a6d Merge pull request #6778 from liewegas/wip-13962
osd: call on_new_interval on newly split child PG

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-12-03 19:38:22 -05:00
Yehuda Sadeh
0857da4c21 Merge pull request #6767 from oritwas/wip-13529-jewel
rgw: use smart pointer for C_Reinitwatch

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-03 09:31:59 -08:00
Sage Weil
fb120d7b2d osd: call on_new_interval on newly split child PG
We must call on_new_interval() on any interval change *and* on the
creation of the PG.  Currently we call it from PG::init() and
PG::start_peering_interval().  However, PG::split_into() did not
do so for the child PG, which meant that the new child feature
bits were not properly initialized and the bitwise/nibblewise
debug bit was not correctly set.  That, in turn, could lead to
various misbehaviors, the most obvious of which is scrub errors
due to the sort order mismatch.

Fixes: #13962
Signed-off-by: Sage Weil <sage@redhat.com>
2015-12-02 14:50:39 -05:00
Yehuda Sadeh
fac0809b6e Merge pull request #6761 from mikulely/jewel
rgw: fix partial read issue in rgw_admin and rgw_tools

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-12-02 09:28:45 -08:00
Orit Wasserman
e9daed221e rgw: use smart pointer for C_Reinitwatch
Fixes: 13529
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-12-02 11:16:05 +01:00
Jiaying Ren
c4fbec7118 rgw: fix partial read mime map issue
Signed-off-by: Jiaying Ren <mikulely@gmail.com>
2015-12-02 15:52:12 +08:00
Jiaying Ren
f914b8db11 rgw: fix rgw_admin partial read issue
Signed-off-by: Jiaying Ren <mikulely@gmail.com>
2015-12-02 10:35:46 +08:00
Ken Dreyer
a45e02539c Merge pull request #6691 from SUSE/wip-13858
ceph.spec.in: limit _smp_mflags when lowmem_builder is set in SUSE's OBS

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-12-01 09:27:52 -07:00
John Spray
ff53763425 Merge pull request #6747 from ukernel/wip-osd-getfilter
osd: fix ClassHandler::ClassData::get_filter()

Reviewed-by: John Spray <john.spray@redhat.com>
2015-12-01 16:04:35 +00:00
Yan, Zheng
88e6694aa9 osd: fix ClassHandler::ClassData::get_filter()
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-12-01 20:21:53 +08:00
Jason Dillaman
4872353425 Merge pull request #6738 from ceph/wip-rbd-cli-misc
rbd: fixes for refactored CLI and related tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-30 14:43:42 -05:00
Ilya Dryomov
9d0604149e rbd: bail if too many arguments provided
The code has a catch clause for that, but it was being rendered useless
by the preceding

    if (command_spec.size() > matching_spec->size())
      positional_options.add(at::POSITIONAL_ARGUMENTS.c_str(), -1);

which names all (both expected and extraneous) positional arguments.

Change it to name only expected arguments, deriving the number of
expected arguments from the length of positional_opts vector, supplied
by each action.  This works for all actions except "feature enable" and
"feature disable" which are specified as multitoken, so keep on passing
in -1 for those.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-11-30 17:50:10 +01:00
Ilya Dryomov
d133f423c8 rbd: don't append an extra newline after some errors
Don't append an extra newline after program_options-generated errors,
like "unrecognised option" or "the argument for option is invalid".

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-11-30 17:22:14 +01:00
Ilya Dryomov
1c8468168c tests: update unmap.t CLI test
Fixup the exit code - the old CLI tried to differentiate between CLI
errors and action errors by returning EXIT_FAILURE in the former case.
Also remove a test that relied on a special case check in the old CLI.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-11-30 16:45:17 +01:00
Ilya Dryomov
5ce663f1d3 cmake: librbd needs libjournal and libcls_journal_client
Commit 4719696cad ("cmake: updates for refactored librbd IO path")
fixed file lists but missed the link dependency - librbd now needs
libjournal and libcls_journal_client.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-11-30 16:29:56 +01:00
Chengyuan Li
06b3b47ebc mon/PGMonitor: MAX AVAIL is 0 if some OSDs' weight is 0
In get_rule_avail(), even p->second is 0, it's possible to be used
as divisor and quotient is infinity, then is converted to an integer
which is negative value.
So we should check p->second value before calculation.

It fixes BUG #13840.

Signed-off-by: Chengyuan Li <chengyli@ebay.com>
(cherry picked from commit 18713e60ed)
2015-11-29 09:28:48 -05:00
Ruifeng Yang
b2eefcac07 os: FileStore::_destroy_collection may hide the real mistake.
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit 9e9770ca87)
2015-11-29 09:27:05 -05:00
Ning Yao
04c03607ac Fix mon routed_request_tids leak
Signed-off-by: Ning Yao <zay11022@gmail.com>
(cherry picked from commit ba3c64ca70)
2015-11-29 09:25:23 -05:00
Josh Durgin
baf9da31b0 pybind: decode empty string in conf_parse_argv() correctly
cretargs is a array of c_char_p, which means ctypes has already
converted it to python byte strings. decode_cstr() would misinterpret
the empty string as a NULL c_char_p(), and convert it to None by
accident, resulting in errors when running commands like
'ceph config-key put foo ""'.

Since this is the only place we use arrays of c_char_p, just decode
it directly in conf_parse_argv(). Tested with python 2 and 3.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit f76d5d6fe6)
2015-11-29 09:24:59 -05:00
Haomai Wang
903350cf41 ceph_test_keyvaluedb_iterators: Fix broken test
Introduced by #6312
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit ce03694445)
2015-11-29 09:24:05 -05:00
John Spray
0b474c52ab mon: don't require OSD W for MRemoveSnaps
Use ability to execute "osd pool rmsnap" command
as a signal that the client should be permitted
to send MRemoveSnaps too.

Note that we don't also require the W ability,
unlike Monitor::_allowed_command -- this is slightly
more permissive handling, but anyone crafting caps
that explicitly permit "osd pool rmsnap" needs to
know what they are doing.

Fixes: #13777
Signed-off-by: John Spray <john.spray@redhat.com>
2015-11-27 16:28:58 +00:00
Sage Weil
d0690be526 Merge pull request #6704 from liewegas/wip-up-thru
mon: block 'ceph osd pg-temp ...' if pg_temp update is already pending

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-11-26 17:31:16 -05:00
Sage Weil
3680dc32ca mon/OSDMonitor: block 'ceph osd pg-temp ...' if update is pending
The OSD expects it's pg_temp update requests to succeed.  If it
races with an ill-timed admin request, it can get stuck in
WaitActingChange indefinitely.

This is only a real problem now that the OSD/mon interaction has
been updated with wip-bigbang; previously we would retry (although
it would take a while).  Backporting is optional.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-25 16:40:13 -05:00
Nathan Cutler
095c29c3c4 ceph.spec.in: make --with lowmem_builder limit _smp_mflags
The limit, -j8, may seem arbitrary but works nicely in the openSUSE Build
Service.

http://tracker.ceph.com/issues/13858 Fixes: #13858

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-24 15:45:40 +01:00
Sage Weil
1e9aeb5728 Merge tag 'v10.0.0'
v10.0.0
2015-11-24 08:41:04 -05:00
Yan, Zheng
b498fdf135 Merge pull request #6684 from jcsp/wip-fix-scrub
mds: fix scrub_path
2015-11-24 10:56:30 +08:00
Gregory Farnum
f0d17d88b7 Merge pull request #6605 from yuyuyu101/wip-13797
ceph_test_msgr: Use send_message instead of keepalive to wakeup connection

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-23 17:33:20 -05:00
Loic Dachary
16b6f7ac05 Merge pull request #6495 from objoo/master
Mailmap updates for infernalis.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-23 23:31:06 +01:00
Yann Dupont
1509ada52c mailmap: Jenkins affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 23:13:48 +01:00
Yann Dupont
d92f611138 mailmap: Burkhard Linke affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 23:13:48 +01:00
Yann Dupont
27f81d4f17 mailmap: Chen Dihao affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 22:33:45 +01:00
Yann Dupont
8dc6748769 mailmap: Wei Qian affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 22:33:45 +01:00
John Spray
f86eb3f750 mds: fix scrub_path
This was tripping up over calling
validate_disk_state with no ScrubHeader.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-11-23 17:39:14 +00:00
Loic Dachary
75bd1a51d1 Merge pull request #6679 from suckowbiz/patch-1
Fixed typos

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-23 17:33:52 +01:00
Sage Weil
4025f75466 doc/release-notes: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 11:02:58 -05:00
Sage Weil
efbcd120da doc/release-notes: final v10.0.0 notes
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 11:00:29 -05:00
suckowbiz
5972a44106 doc: fix message typos in systemd
Signed-off-by: Tobias Suckow <tobias@suckow.biz>
2015-11-23 16:50:07 +01:00
Sage Weil
d4694f6a8e Merge branch 'master' of github.com:ceph/ceph 2015-11-23 09:01:30 -05:00
Sage Weil
8631b72590 Merge pull request #6666 from dachary/wip-release-notes
release-notes: draft v10.0.0 release notes
2015-11-23 09:01:48 -05:00
Sage Weil
5135292d95 Merge branch 'wip-bigbang'
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-23 08:39:46 -05:00
Sage Weil
9aabc8a9b8 test/mon/osd-crush.sh: escape ceph tell mon.*
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 08:38:52 -05:00
Sage Weil
72edab2823 osd: make some of the pg_temp methods/fields private
Reported-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 08:38:51 -05:00
Sage Weil
987f68a8df osdc/Objecter: call notify completion only once
If we race with a reconnect we could get a second notify message
before the notify linger op is torn down.  Ensure we only ever
call the notify completion once to prevent a segfault.

Fixes: #13805
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 08:38:51 -05:00