Commit Graph

36360 Commits

Author SHA1 Message Date
Samuel Just
1d22575cb0 Merge remote-tracking branch 'guangyy/wip-9008' into giant 2014-10-07 11:42:14 -07:00
Sage Weil
887652f66c Merge pull request #2631 from ceph/wip-rwtimer
DNM: osdc/Objecter: use SafeTimer; make callbacks race-tolerant

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2014-10-07 11:41:11 -07:00
Loic Dachary
7c4e278a1e common: ceph_ioprio_string_to_class always returns -EINVAL
The l string is always empty because std::transform needs a
pre-allocated string. Replace with the in-place version. Add unit tests.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 3535b7aba3)
2014-10-07 20:30:26 +02:00
Loic Dachary
822b088e42 osd: log error if set_ioprio fails to parse class
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 5088e0d493)
2014-10-07 20:30:17 +02:00
Loic Dachary
efb23b86c6 common: set_ioprio debug message including pid
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 33339c7754)
2014-10-07 20:30:07 +02:00
Loic Dachary
62f0ef406a common: do not set ioprio if pid is not set
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit c7e4c0bfe7)
2014-10-07 20:29:55 +02:00
Loic Dachary
19c92d86fd doc: missing osd prefix to ioprio config options
http://tracker.ceph.com/issues/9676 Fixes: #9676

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 62235688c4)
2014-10-07 20:29:41 +02:00
Samuel Just
45a201f36f Merge pull request #2489 from guangyy/wip-9008
For pgls OP, get/put budget on per list session basis, instead of per OP basis.

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-10-07 10:51:21 -07:00
João Eduardo Luís
6b692b9fd8 Merge pull request #2655 from ceph/wip-9635
mon: fix async write completion waits

Fixes: #9635

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2014-10-07 15:54:50 +00:00
Sage Weil
51fd5ac46a Merge pull request #2654 from dachary/wip-9677-ioprio-class
common: ceph_ioprio_string_to_class always returns -EINVAL

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-07 08:47:44 -07:00
Sage Weil
cba5e1cf1f Merge pull request #2626 from dachary/wip-rados-empty-file
tools: rados put /dev/null should write() and not create()

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-07 08:13:22 -07:00
Gregory Farnum
c00fe10fb8 Merge pull request #2652 from ceph/wip-msgr
msgr: fix remaining direct references to "new SimpleMessenger" by replacing with the factory method

Reorganize the src/msg hierarchy to push SimpleMessenger down into a subfolder to make way for organizing new in-tree implementations.

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-10-07 07:23:54 -07:00
Sage Weil
2ac2a96898 Merge pull request #2560 from ceph/wip-9418
mon: add new profiles & audit cap checks

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-07 06:32:53 -07:00
Sage Weil
ffe0a0e796 Merge pull request #2647 from ceph/wip-rm-legacy-cli
tools: remove old ceph.cc

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-10-07 06:30:46 -07:00
Sage Weil
47f9600634 Merge pull request #2646 from ceph/wip-osd-op-macro
rados.h: use macros to generate osd ops definitons and strings

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-07 06:27:09 -07:00
Jenkins
97dcc0539d 0.86 2014-10-07 06:20:21 -07:00
Sandon Van Ness
32e8bcda49 Run configure without liblttng on squeeze as well.
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-10-07 06:04:39 -07:00
Sandon Van Ness
be6de4a997 Run configure without liblttng on squeeze as well.
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-10-07 06:03:36 -07:00
Loic Dachary
3535b7aba3 common: ceph_ioprio_string_to_class always returns -EINVAL
The l string is always empty because std::transform needs a
pre-allocated string. Replace with the in-place version. Add unit tests.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-10-07 14:11:17 +02:00
Loic Dachary
5088e0d493 osd: log error if set_ioprio fails to parse class
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-10-07 14:09:17 +02:00
Loic Dachary
33339c7754 common: set_ioprio debug message including pid
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-10-07 14:09:17 +02:00
Loic Dachary
c7e4c0bfe7 common: do not set ioprio if pid is not set
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-10-07 14:09:17 +02:00
Loic Dachary
aa9041c5eb Merge pull request #2653 from dachary/wip-9676-ioprio-doc
doc: missing osd prefix to ioprio config options

Reviewed-by: Mehdi Abaakouk <sileht@sileht.net>
2014-10-07 10:15:20 +02:00
Loic Dachary
62235688c4 doc: missing osd prefix to ioprio config options
http://tracker.ceph.com/issues/9676 Fixes: #9676

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-10-07 10:10:24 +02:00
Sage Weil
b2e4bd512b msg: move SimpleMessenger to msg/simple/
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 21:23:07 -07:00
Sage Weil
5a860bec48 librados: use Messenger factory method
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 21:23:06 -07:00
Sage Weil
5eff0ee9fc msg: use localized cct for derr
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 21:22:54 -07:00
Sage Weil
06aef6ff61 doc/release-notes: v0.86
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 21:15:43 -07:00
Sage Weil
3484dd839e Merge pull request #2651 from ceph/wip-ostool
ceph_objectstore_tool: Accept CEPH_ARGS environment arguments

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-06 21:11:51 -07:00
David Zafman
10fe7cfe56 ceph_objectstore_tool: Accept CEPH_ARGS environment arguments
Signed-off-by: David Zafman <dzafman@redhat.com>
2014-10-06 18:26:44 -07:00
luowei
6aba0ab9a8 Add reset_tp_timeout in long loop in add_source_info for suicide timeout
Fixes: #9128

Signed-off-by: luowei@yahoo-inc.com
2014-10-06 17:49:12 -07:00
Sage Weil
260933b110 Merge branch 'wip-9658' into giant 2014-10-06 15:52:24 -07:00
David Zafman
6067f295e7 Merge pull request #2639 from ceph/wip-9661
Fix 9661: ceph_objectstore_tool doesn't work with memstore

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-10-06 15:47:30 -07:00
John Spray
52ac52034e tools: remove old ceph.cc
Signed-off-by: John Spray <john.spray@redhat.com>
2014-10-06 23:23:17 +01:00
Samuel Just
63c7e16a17 test/osd/Object: don't generate length of 0
Fixes: #9203
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-10-06 15:22:55 -07:00
Sage Weil
9ffd3788a4 Merge pull request #2649 from ceph/wip-os-recommend-doc-fix
doc: update kernel recommendations, add tunables link
2014-10-06 11:20:10 -07:00
Ilya Dryomov
abe4c35399 doc: update kernel recommendations, add tunables link
No 3.16.[0-2] - same rbd deadlock regression as in 3.15.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
2014-10-06 21:25:29 +04:00
Sage Weil
031ef0551e Merge pull request #2645 from ceph/wip-9663
client: clean-up objecter on failed client init

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-06 09:37:32 -07:00
Sage Weil
6b9e20ac8d ceph.spec: make ceph -> python-ceph dependency specify version
It does this indirectly via ceph -> ceph-common -> python-ceph, but do so
here too for clarity/consistency.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 09:15:29 -07:00
Sage Weil
69acc8ae02 msg: make messenger type configurable
Eventaully we may want to override this by passing the type in as an
arg, but let's do that later.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 08:51:20 -07:00
Sage Weil
62b0bfdc07 msg/Message: drop unneeded #include
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 08:51:20 -07:00
Sage Weil
e55cb1f68a mon/MonClient: use generic Messenger factory
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 08:51:20 -07:00
Loic Dachary
07b86c43a9 Merge pull request #2642 from johnugeorge/wip-9492-crush-giant
Crush: Backporting fixes for #9492 to giant

Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-10-06 09:51:05 +02:00
Loic Dachary
bf4509617b Merge pull request #2644 from objoo/master
Add one more case ( "=" ) and test get_str_vec as well.

Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-10-05 23:18:02 +02:00
Noah Watkins
fe57fab2e6 client: clean-up objecter on failed client init
During mount() the objecter isn't shutdown if the mon client fails to
initialize. Objecter asserts in destructor expect it to have been
shutdown but this skipped.

hadoop@plana85:~$ ./hadoop/bin/hadoop fs -ls /
14/10/05 12:35:50 WARN util.NativeCodeLoader: Unable to load native-hadoop library for your platform... using builtin-java classes where applicable
osdc/Objecter.cc: In function 'virtual Objecter::~Objecter()' thread 7ff422705700 time 2014-10-05 12:35:51.090776
osdc/Objecter.cc: 3927: FAILED assert(!m_request_state_hook)
 ceph version 0.85-981-g25bcc39 (25bcc39bb8)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x7f) [0x7ff3f5c28f7f]
 2: (Objecter::~Objecter()+0x397) [0x7ff3f5bca707]
 3: (Objecter::~Objecter()+0x9) [0x7ff3f5bca8b9]
 4: (Client::~Client()+0x7d) [0x7ff3f5b6770d]
 5: (Client::~Client()+0x9) [0x7ff3f5b680a9]
 6: (ceph_mount_info::mount(std::string const&)+0x149) [0x7ff3f5b1fa49]
 7: (ceph_mount()+0x4e) [0x7ff3f5b1dcbe]
 8: (Java_com_ceph_fs_CephMount_native_1ceph_1mount()+0xb7) [0x7ff4158b1c97]
 9: [0x7ff41839dd68]
 NOTE: a copy of the executable, or `objdump -rdS <executable>` is needed to interpret this.
terminate called after throwing an instance of 'ceph::FailedAssertion'
Aborted

fixes: #9663

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-10-05 13:15:13 -07:00
Yann Dupont
ca10ce4f5d Add one more case ( "=" ) and test get_str_vec as well.
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-10-05 21:27:42 +02:00
Sage Weil
6462cf5a46 Merge pull request #2641 from dachary/wip-9655-osd-tell
qa: ceph tell must retry on ENXIO

Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-05 09:00:01 -07:00
Ilya Dryomov
257dcc95f6 rados.h: use macros to generate osd ops definitons and strings
Eliminate multiple points of maintenance by using macros - no
functional changes apart from adding strings which were missing.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
2014-10-05 17:14:03 +04:00
Johnu George
1858f06c80 Crush: Ensuring at most num-rep osds are selected
Crush temporary buffers are allocated as per replica size configured
by the user.When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by indep rule. The fix for firstn rules is already
merged as part of bug #9492. Required test files are added.

Fixes: #9492

Signed-off-by: Johnu George johnugeo@cisco.com
(cherry picked from commit 234b066ba0)
2014-10-04 11:27:17 -07:00
Johnu George
01e389aeb6 Crush: Ensuring at most num-rep osds are selected
Crush temporary buffers are allocated as per replica size configured
by the user.When there are more final osds (to be selected as per
rule) than the replicas, buffer overlaps and it causes crash.Now, it
ensures that at most num-rep osds are selected even if more number of
osds are allowed by the rule.

Fixes: #9492

Signed-off-by: Johnu George <johnugeo@cisco.com>
(cherry picked from commit 6b4d1aa997)
2014-10-04 11:27:17 -07:00