]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoceph.spec.in: remove SUSE-specific apache2-mod_fcgid dependency 5411/head
Nathan Cutler [Thu, 16 Jul 2015 13:16:22 +0000 (15:16 +0200)]
ceph.spec.in: remove SUSE-specific apache2-mod_fcgid dependency

This package is no longer required for RGW to work in SUSE.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit f3f8d3660d0ece3139e5f3dc7881ccceadcf648d)

Conflicts:
ceph.spec.in
            In master, the "%if %else %endif" has been changed
            into two "%if %endif"s

9 years agoMerge pull request #5248 from ceph/wip-11833-hammer
Loic Dachary [Wed, 29 Jul 2015 14:22:36 +0000 (16:22 +0200)]
Merge pull request #5248 from ceph/wip-11833-hammer

mon: add an "osd crush tree" command

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5222 from ceph/hammer-12088
Loic Dachary [Wed, 29 Jul 2015 08:49:08 +0000 (10:49 +0200)]
Merge pull request #5222 from ceph/hammer-12088

client: reference counting 'struct Fh'

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5231 from theanalyst/wip-12243-hammer
Orit Wasserman [Tue, 28 Jul 2015 21:33:18 +0000 (23:33 +0200)]
Merge pull request #5231 from theanalyst/wip-12243-hammer

Civetweb RGW appears to report full size of object as downloaded when only partially downloaded

9 years agoMerge pull request #5243 from theanalyst/wip-12239-hammer
Loic Dachary [Tue, 28 Jul 2015 20:40:23 +0000 (22:40 +0200)]
Merge pull request #5243 from theanalyst/wip-12239-hammer

librbd/internal.cc: 1967: FAILED assert(watchers.size() == 1)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5241 from theanalyst/wip-12238-hammer
Loic Dachary [Tue, 28 Jul 2015 20:40:03 +0000 (22:40 +0200)]
Merge pull request #5241 from theanalyst/wip-12238-hammer

[  FAILED  ] TestLibRBD.ExclusiveLockTransition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5265 from SUSE/wip-12368-hammer
Loic Dachary [Tue, 28 Jul 2015 20:30:23 +0000 (22:30 +0200)]
Merge pull request #5265 from SUSE/wip-12368-hammer

linking ceph to tcmalloc causes segfault on SUSE SLE11-SP3

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5280 from ceph/wip-12384-hammer
Loic Dachary [Tue, 28 Jul 2015 20:27:40 +0000 (22:27 +0200)]
Merge pull request #5280 from ceph/wip-12384-hammer

librbd: add valgrind memory checks for unit tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5279 from ceph/wip-12237-hammer
Loic Dachary [Tue, 28 Jul 2015 20:26:25 +0000 (22:26 +0200)]
Merge pull request #5279 from ceph/wip-12237-hammer

A client opening an image mid-resize can result in the object map being invalidated

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5283 from SUSE/wip-12397-hammer
Loic Dachary [Tue, 28 Jul 2015 20:10:03 +0000 (22:10 +0200)]
Merge pull request #5283 from SUSE/wip-12397-hammer

ceph.spec.in: 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph not installed properly on SUSE

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5206 from SUSE/wip-11998-hammer
Loic Dachary [Tue, 28 Jul 2015 19:54:33 +0000 (21:54 +0200)]
Merge pull request #5206 from SUSE/wip-11998-hammer

/usr/bin/ceph from ceph-common is broken without installing ceph

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5055 from SUSE/wip-12044-hammer
Loic Dachary [Tue, 28 Jul 2015 19:47:29 +0000 (21:47 +0200)]
Merge pull request #5055 from SUSE/wip-12044-hammer

rgw/logrotate.conf calls service with wrong init script name

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5040 from SUSE/wip-11964-hammer
Loic Dachary [Tue, 28 Jul 2015 19:46:11 +0000 (21:46 +0200)]
Merge pull request #5040 from SUSE/wip-11964-hammer

systemd: Increase max files open limit for OSD daemon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5038 from SUSE/wip-11876-hammer
Loic Dachary [Tue, 28 Jul 2015 19:45:44 +0000 (21:45 +0200)]
Merge pull request #5038 from SUSE/wip-11876-hammer

ceph-post-file fails on rhel7

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5030 from SUSE/wip-12092-hammer
Loic Dachary [Tue, 28 Jul 2015 19:45:25 +0000 (21:45 +0200)]
Merge pull request #5030 from SUSE/wip-12092-hammer

packaging: add SuSEfirewall2 service files

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5028 from SUSE/wip-12090-hammer
Loic Dachary [Tue, 28 Jul 2015 19:38:14 +0000 (21:38 +0200)]
Merge pull request #5028 from SUSE/wip-12090-hammer

rcceph script is buggy

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5026 from SUSE/wip-12087-hammer
Loic Dachary [Tue, 28 Jul 2015 19:37:44 +0000 (21:37 +0200)]
Merge pull request #5026 from SUSE/wip-12087-hammer

max files open limit for OSD daemon is too low

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agolibrados_test_stub: read op should return number of bytes read 5279/head
Jason Dillaman [Sun, 5 Jul 2015 14:47:38 +0000 (10:47 -0400)]
librados_test_stub: read op should return number of bytes read

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f8a7b507983e31399831e802e99429b95386ed41)

10 years agotests: fixed TestObjectMap.InvalidateFlagInMemoryOnly
Jason Dillaman [Sun, 5 Jul 2015 14:35:28 +0000 (10:35 -0400)]
tests: fixed TestObjectMap.InvalidateFlagInMemoryOnly

librados and librados_test_stub return different result codes
for a read full object operation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2ace2b77f8ed83e753fe4a48bcc997f5d1dd465f)

10 years agolibrbd: don't attempt to invalidate an object map in R/O mode
Jason Dillaman [Sun, 5 Jul 2015 15:09:09 +0000 (11:09 -0400)]
librbd: don't attempt to invalidate an object map in R/O mode

The ImageWatcher is not initialized when in R/O mode, which
resulted in a NULL pointer dereference.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 64d740f8fa10ba872e324ec2580a4d8c3f99a9ce)

10 years agotests: add new unit tests for object map invalidation
Jason Dillaman [Tue, 23 Jun 2015 15:17:12 +0000 (11:17 -0400)]
tests: add new unit tests for object map invalidation

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0215e9753c09460f6fc84ded9397e36a209f2e32)

10 years agolibrbd: move object map codes to common location
Jason Dillaman [Wed, 25 Mar 2015 13:41:13 +0000 (09:41 -0400)]
librbd: move object map codes to common location

These codes will need to be accessible from cls_rbd and librbd.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4ac584c34d576b489ed4c4862703b8fb427b3bc2)

10 years agolibrbd: only update image flags when holding exclusive lock
Jason Dillaman [Tue, 23 Jun 2015 15:14:51 +0000 (11:14 -0400)]
librbd: only update image flags when holding exclusive lock

It was possible for a client to open an image while another client
was shrinking an image.  This would result in the former invalidating
the object map on-disk if it openned the image between updating the
image header and resizing the object map.

Fixes: #11791
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit eb81a6a7e391327ac993fd406443b206a7f7bffc)

10 years agolibrbd: new ImageWatcher::is_lock_supported method
Jason Dillaman [Fri, 17 Jul 2015 16:43:46 +0000 (12:43 -0400)]
librbd: new ImageWatcher::is_lock_supported method

The new version does not attempt to acquire the snap_lock, to avoid
cases where a recursive lock would result.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly... 5283/head
Nathan Cutler [Thu, 9 Jul 2015 19:38:46 +0000 (21:38 +0200)]
ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly on SUSE

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 5ce38b9536efabf99a236c7a9d15c149fa4c16a6)

10 years agodebian: move ceph_argparse into ceph-common 5206/head
Ken Dreyer [Tue, 14 Apr 2015 13:58:17 +0000 (07:58 -0600)]
debian: move ceph_argparse into ceph-common

Prior to this commit, if a user installed the "ceph-common" Debian
package without installing "ceph", then /usr/bin/ceph would crash
because it was missing the ceph_argparse library.

Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This
was the intention of the original commit that moved argparse to "ceph",
2a23eac54957e596d99985bb9e187a668251a9ec)

http://tracker.ceph.com/issues/11388 Refs: #11388

Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 110608e5bdd9e2f03020ad41f0c2d756684d4417)

Conflicts:
debian/ceph.install
            There is no ceph_daemon.py in hammer
        debian/control
            Depends/Replaces/Breaks version adapted (from 9.0.0 to 0.94.2)
            also adapted ceph-dbg Replaces/Breaks

10 years agotest: potential memory leak in FlushAioPP 5280/head
Zhiqiang Wang [Fri, 20 Mar 2015 08:15:42 +0000 (16:15 +0800)]
test: potential memory leak in FlushAioPP

Should call the release function instead of deleting it to free
librbd::RBD::AioCompletion and librbd::AioCompletion. Otherwise there is
a potential memory leak.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
(cherry picked from commit ada7ec860cb7901c560c12a5af36dc7c23051b76)

10 years agopybind: fix valgrind warning on rbd_get_parent_info call
Jason Dillaman [Tue, 28 Apr 2015 19:25:49 +0000 (15:25 -0400)]
pybind: fix valgrind warning on rbd_get_parent_info call

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2586e3ba1e20603a87c833513e09dae9281beb4d)

10 years agoosdc: invalid read of freed memory
Jason Dillaman [Tue, 28 Apr 2015 15:12:00 +0000 (11:12 -0400)]
osdc: invalid read of freed memory

The bytes not in cache stat was potentially reading the bh length
from a deleted bufferhead.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5ccc4422d6172376bd6f1be8d3a99c0a54eab807)

10 years agokrbd: fix incorrect types in the krbd API
Jason Dillaman [Tue, 28 Apr 2015 14:56:15 +0000 (10:56 -0400)]
krbd: fix incorrect types in the krbd API

The C API functions were referencing the C++ CephContext
instead of the C rados_config_t.  Additionally, the ceph
namespace was missing on the Formatter class.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 740fd275a60630e60b3bcf41637a2ca486885d9c)

10 years agofsx: cleanup crypto library at exit
Jason Dillaman [Tue, 28 Apr 2015 14:54:47 +0000 (10:54 -0400)]
fsx: cleanup crypto library at exit

Also made small tweaks so that it can be compiled under
a C++ compiler.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c44f8e7fbc19924a9453d8c032c624ebb6c0296f)

10 years agotests: add run-rbd-valgrind-unit-tests.sh
Jason Dillaman [Fri, 24 Apr 2015 18:29:59 +0000 (14:29 -0400)]
tests: add run-rbd-valgrind-unit-tests.sh

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5534faaa469b8a6a4c9687aad1a6723f3e859353)

10 years agovalgrind: update valgrind suppressions for lttng-ust
Jason Dillaman [Fri, 24 Apr 2015 04:23:03 +0000 (00:23 -0400)]
valgrind: update valgrind suppressions for lttng-ust

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 8d87bdf597aad3d6be47aedd216a673bd9093a24)

10 years agolibrbd: TaskFinisher should finish all queued tasks
Jason Dillaman [Fri, 24 Apr 2015 04:21:15 +0000 (00:21 -0400)]
librbd: TaskFinisher should finish all queued tasks

The destructor wasn't waiting for all Finisher tasks
to complete before stopping the thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 8e20240e4155e2f0398e79f4c0095d2d6ba1d4cb)

10 years agotests: fix valgrind errors with librbd unit test
Jason Dillaman [Fri, 24 Apr 2015 03:10:23 +0000 (23:10 -0400)]
tests: fix valgrind errors with librbd unit test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ed5472a10eb515e2a177a640c3f6ed929db9ee4f)

10 years agotests: librbd should release global data before exit
Jason Dillaman [Fri, 24 Apr 2015 03:09:45 +0000 (23:09 -0400)]
tests: librbd should release global data before exit

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 6ab1bb5614a5d257a82cf8ea280eef5c90cf765b)

10 years agolibrados_test_stub: cleanup singleton memory allocation
Jason Dillaman [Fri, 24 Apr 2015 03:08:51 +0000 (23:08 -0400)]
librados_test_stub: cleanup singleton memory allocation

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 54c88255b74741d882b88f791497862635357634)

10 years agoMerge pull request #5046 from ceph/wip-12109-hammer
Loic Dachary [Fri, 17 Jul 2015 17:48:05 +0000 (19:48 +0200)]
Merge pull request #5046 from ceph/wip-12109-hammer

librbd: new QA client upgrade tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5159 from theanalyst/wip-11701-hammer
Samuel Just [Thu, 16 Jul 2015 21:58:49 +0000 (14:58 -0700)]
Merge pull request #5159 from theanalyst/wip-11701-hammer

make the all osd/filestore thread pool suicide timeouts separately configurable

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoConditional-compile against minimal tcmalloc. 5265/head
Thorsten Behrens [Sun, 15 Mar 2015 23:13:38 +0000 (00:13 +0100)]
Conditional-compile against minimal tcmalloc.

Certain older systems (SLE11 in this case) do not provide the full
tcmalloc functionality, due to e.g. incomplete libunwind
pieces. Use --with-tcmalloc-minimal to enable the cut-down
version.

Here's how the various mem allocator switches interact now:

--with-jemalloc: overrides --with-tcmalloc & --with-tcmalloc-minimal
--with-tcmalloc-minimal: overrides --with-tcmalloc
--with-tcmalloc: the default. use --without-tcmalloc to disable

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit c6f1c07113ca19547fdac10cd9b817a60142aee2)

10 years agoMerge pull request #5252 from ceph/wip-12021-hammer
Sage Weil [Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)]
Merge pull request #5252 from ceph/wip-12021-hammer

OSDMonitor: allow addition of cache pool with non-empty snaps with co…

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4891 from theanalyst/wip-11740-hammer
Loic Dachary [Wed, 15 Jul 2015 23:15:51 +0000 (01:15 +0200)]
Merge pull request #4891 from theanalyst/wip-11740-hammer

crush: take crashes due to invalid arg

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoOSD: add command_wq suicide timeout 5159/head
Samuel Just [Wed, 6 May 2015 17:49:00 +0000 (10:49 -0700)]
OSD: add command_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit df4e5de819c30003cfbe50a071c49039cf534419)

Conflicts:
src/common/config_opts.h
Trivial merge conflict

10 years agoOSD: add remove_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:54:31 +0000 (10:54 -0700)]
OSD: add remove_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit f2fbfa32a16666be46359f0eab7b04ca80a753f5)

10 years agoOSD: add scrub_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:52:40 +0000 (10:52 -0700)]
OSD: add scrub_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 547a7041edc833f3cc8e04d388574809e30a8af6)

10 years agoOSD: add snap_trim_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:51:28 +0000 (10:51 -0700)]
OSD: add snap_trim_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit e1073a4a577211672148a4112bd633831552d66f)

10 years agoOSD: add recovery_wq suicide timeout
Samuel Just [Wed, 6 May 2015 17:50:19 +0000 (10:50 -0700)]
OSD: add recovery_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 85311b656852af75bfbbc6699f92fc6aa233c316)

Conflicts: src/common/config_opts.h

There was a merge conflict due to introduction of `osd_recovery_sleep`
which was introduced in #3829

10 years agoOSD: add op_wq suicide timeout
Samuel Just [Wed, 6 May 2015 18:02:19 +0000 (11:02 -0700)]
OSD: add op_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agomon: add an "osd crush tree" command 5248/head
Kefu Chai [Tue, 2 Jun 2015 15:52:22 +0000 (23:52 +0800)]
mon: add an "osd crush tree" command

* to print crush buckets/items in a tree

Fixes: #11833
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5436c290f3622feb8d4b279ed6552b2510e0cee9)

Conflicts:
src/test/mon/osd-crush.sh:
do not start mon as run() takes care of it already

10 years agoMerge pull request #4899 from theanalyst/wip-11911-hammer
Loic Dachary [Tue, 14 Jul 2015 18:43:02 +0000 (20:43 +0200)]
Merge pull request #4899 from theanalyst/wip-11911-hammer

start_flush: filter out removed snaps before determining snapc's

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4868 from SUSE/wip-11879-hammer
Loic Dachary [Tue, 14 Jul 2015 18:42:45 +0000 (20:42 +0200)]
Merge pull request #4868 from SUSE/wip-11879-hammer

Clock skew causes missing summary and confuses Calamari

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4883 from SUSE/wip-11638-hammer
Loic Dachary [Tue, 14 Jul 2015 14:42:12 +0000 (16:42 +0200)]
Merge pull request #4883 from SUSE/wip-11638-hammer

ceph.spec.in: ceph-common subpackage def needs tweaking for SUSE/openSUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agolibrbd: assertion failure race condition if watch disconnected 5243/head
Jason Dillaman [Fri, 26 Jun 2015 13:59:36 +0000 (09:59 -0400)]
librbd: assertion failure race condition if watch disconnected

It's possible for librbd's watch of the header object to be reset by
connection issues just prior to the image being removed.  This will
causes an assertion failure which assumes at least one watcher on the
image.

Fixes: #12176
Backport: hammer, firefly
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit af276de4f299960e43761904c043924cec5fef11)

10 years agolibrbd: prevent object map updates from being interrupted 5241/head
Jason Dillaman [Thu, 25 Jun 2015 20:51:31 +0000 (16:51 -0400)]
librbd: prevent object map updates from being interrupted

Object map updates were being canceled in-flight when the exclusive lock
is released.  This resulted in an ERESTART error code bubbling up to
AioRequest.

Fixes: 12165
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 590cdc90edaf4f4ff06c97eb2f43b92ab9b60084)

Conflicts:
src/librbd/ObjectMap.h
conflict due to a variable `m_snap_id' which was introduced in PR #4140
which is dropped as we are not backporting that feature

10 years agorgw: error out if frontend did not send all data 5231/head
Yehuda Sadeh [Thu, 25 Jun 2015 21:31:03 +0000 (14:31 -0700)]
rgw: error out if frontend did not send all data

Fixes: #11851
The civetweb mg_write() doesn't return error when it can't flush all data
to the user, it just sends the total number of bytes written. Modified the
client io to return total number of bytes and return an error if didn't
send anything.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit daa679c3dd3770a6d5421e2cc9a36924f4550439)

10 years agoclient: reference counting 'struct Fh' 5221/head 5222/head
Yan, Zheng [Wed, 8 Jul 2015 02:11:43 +0000 (10:11 +0800)]
client: reference counting 'struct Fh'

The async readahead finisher needs to reference 'struct Fh'. But
it's possible user closes FD and free the corresponding 'struct Fh'
before async readahead finishes.

Fixes: #12088
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 34b939a81d38173b882c429b28dedce778504ba8)

10 years agoMerge pull request #5208 from tchaikov/wip-11975-hammer
Kefu Chai [Sat, 11 Jul 2015 18:19:57 +0000 (02:19 +0800)]
Merge pull request #5208 from tchaikov/wip-11975-hammer

tests: TEST_crush_reject_empty must not run a mon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agocrush/CrushTester: return EINVAL if crushtool returns non-zero 5208/head
Kefu Chai [Sat, 11 Jul 2015 15:04:33 +0000 (23:04 +0800)]
crush/CrushTester: return EINVAL if crushtool returns non-zero

this backports a tiny part of ec02441, otherwise
CrushTester will return 1, and "ceph" cli will take it
as EPERM, which is miss leading, and fails
osd-crush.sh:TEST_crush_reject_empty.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotests: TEST_crush_reject_empty must not run a mon
Loic Dachary [Fri, 10 Jul 2015 14:23:47 +0000 (16:23 +0200)]
tests: TEST_crush_reject_empty must not run a mon

* Back in Hammer, the osd-crush.sh individual tests did not run the
  monitor, it was taken care of by the run() function. An attempt to run
  another mon fails with:

  error: IO lock testdir/osd-crush/a/store.db/LOCK: Resource temporarily
  unavailable

  This problem was introduced by cc1cc033930e8690a57674e842a003f6bbc7a242
  from https://github.com/ceph/ceph/pull/4936
* replace test/mon/mon-test-helpers.sh with test/ceph-helpers.sh as
  we need run_osd() in this newly added test
* update the run-dir of commands: ceph-helpers.sh use the different
  convention for the run-dir of daemons.

http://tracker.ceph.com/issues/11975 Refs: #11975

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-helpers: implement test_expect_failure
Loic Dachary [Tue, 21 Apr 2015 14:11:33 +0000 (16:11 +0200)]
ceph-helpers: implement test_expect_failure

To display the output in case the command did not fail with the expected
output.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 5871781b10ff0b26c731b70d1898c474006cbee3)

10 years agotests: display the output of failed make check runs
Loic Dachary [Wed, 10 Jun 2015 21:16:01 +0000 (23:16 +0200)]
tests: display the output of failed make check runs

After a make check fails, it shows a summary but not the output of the
failed tests although they contain information to diagnose the problem.

Set the VERBOSE=true automake variable which is documented to collect
and display the failed script output at the end of a run (the content of
the test-suite.log file (valid from automake-1.11 up).

http://www.gnu.org/software/automake/manual/automake.html#index-VERBOSE

Also remove the run-make-check.sh that did the same in a way that is not
compatible with automake-1.11.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 3a55cb029bb7db9542d2b14f2deda90feb0ae0f6)

10 years agoMerge pull request #4889 from theanalyst/wip-11484-hammer
Loic Dachary [Fri, 10 Jul 2015 08:17:24 +0000 (10:17 +0200)]
Merge pull request #4889 from theanalyst/wip-11484-hammer

OPT_INT option interprets 3221225472 as -1073741824, and crashes in Throttle::Throttle()

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4776 from tchaikov/wip-11279-hammer
Loic Dachary [Fri, 10 Jul 2015 08:16:25 +0000 (10:16 +0200)]
Merge pull request #4776 from tchaikov/wip-11279-hammer

ceph: cli interactive mode does not understand quotes

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4657 from ceph/wip-hammer-11535-admin-socket
Loic Dachary [Fri, 10 Jul 2015 08:14:42 +0000 (10:14 +0200)]
Merge pull request #4657 from ceph/wip-hammer-11535-admin-socket

common/admin_socket: close socket descriptor in destructor

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4687 from SUSE/wip-7387-hammer
Kefu Chai [Fri, 10 Jul 2015 08:07:48 +0000 (16:07 +0800)]
Merge pull request #4687 from SUSE/wip-7387-hammer

utf8 and old gcc breakage on RHEL6.5

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5122 from theanalyst/wip-11982-hammer
Kefu Chai [Fri, 10 Jul 2015 08:00:00 +0000 (16:00 +0800)]
Merge pull request #5122 from theanalyst/wip-11982-hammer

ceph fails to compile with boost 1.58

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4936 from ceph/wip-11975-hammer
Kefu Chai [Fri, 10 Jul 2015 07:59:35 +0000 (15:59 +0800)]
Merge pull request #4936 from ceph/wip-11975-hammer

mon crashes when "ceph osd tree 85 --format json"

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4892 from theanalyst/wip-11760-hammer
Loic Dachary [Fri, 10 Jul 2015 07:48:44 +0000 (09:48 +0200)]
Merge pull request #4892 from theanalyst/wip-11760-hammer

ceph-disk: get_partition_type fails on /dev/cciss...

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4877 from SUSE/wip-11902-hammer
Loic Dachary [Fri, 10 Jul 2015 07:43:57 +0000 (09:43 +0200)]
Merge pull request #4877 from SUSE/wip-11902-hammer

admin/build-doc: script fails silently under certain circumstances

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomon: add "--check" to CrushTester::test_with_crushtool() 4936/head
Kefu Chai [Tue, 26 May 2015 10:11:59 +0000 (18:11 +0800)]
mon: add "--check" to CrushTester::test_with_crushtool()

so we don't need to call CrushTester::check_name_maps() in OSDMonitor.cc
anymore.

Fixes: #11680
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c6e634875316cf17368d497e6dc4f6f4b5dd65d2)

10 years agocrushtool: rename "--check-names" to "--check"
Kefu Chai [Tue, 26 May 2015 09:51:50 +0000 (17:51 +0800)]
crushtool: rename "--check-names" to "--check"

* because "--check" also checks for the max_id

Note: edited since we do not have the fix introduced in 46103b2 in
      hammer.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 9381d53acdce85fcbff828926b911e050ba36e51)

10 years agomon: check the new crush map against osdmap.max_osd
Kefu Chai [Tue, 26 May 2015 08:58:23 +0000 (16:58 +0800)]
mon: check the new crush map against osdmap.max_osd

Fixes: #11680
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 22e6bd6e01d5df3f3e897562597e22ca1737f8c8)

10 years agocrushtool: enable check against max_id
Kefu Chai [Tue, 26 May 2015 07:35:10 +0000 (15:35 +0800)]
crushtool: enable check against max_id

add an argument "max_id" for "--check-names" to check if any item
has an id greater or equal to given "max_id" in crush map.

Note: edited since we do not have the fix introduced in 46103b2 in
      hammer.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d0658dd3cdf072b2a7c2a1986f8785a697c591ee)

10 years agocrush/CrushTester: check if any item id is too large
Kefu Chai [Tue, 26 May 2015 07:34:33 +0000 (15:34 +0800)]
crush/CrushTester: check if any item id is too large

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e640d89240017956b8c7411babb86be0f1e2b172)

10 years agomon: validate new crush for unknown names
Kefu Chai [Mon, 25 May 2015 12:14:32 +0000 (20:14 +0800)]
mon: validate new crush for unknown names

* the "osd tree dump" command enumerates all buckets/osds found in either the
  crush map or the osd map. but the newly set crushmap is not validated for
  the dangling references, so we need to check to see if any item in new crush
  map is referencing unknown type/name when a new crush map is sent to
  monitor, reject it if any.

Fixes: #11680
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a955f36a509e5412b1f72632a1a956d99e768e35)

10 years agocrushtool: add the "--check-names" option
Kefu Chai [Tue, 26 May 2015 04:08:36 +0000 (12:08 +0800)]
crushtool: add the "--check-names" option

* so one is able to verify that the "ceph osd tree" won't chock on the
  new crush map because of dangling name/type references

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d6b46d4c7b722945ce24ac2930381a109b1e3dda)

10 years agocrush/CrushTester: add check_name_maps() method
Kefu Chai [Tue, 26 May 2015 04:08:09 +0000 (12:08 +0800)]
crush/CrushTester: add check_name_maps() method

* check for dangling bucket name or type names referenced by the
  buckets/items in the crush map.
* also check for the references from Item(0, 0, 0) which does not
  necessarily exist in the crush map under testing. the rationale
  behind this is: the "ceph osd tree" will also print stray OSDs
  whose id is greater or equal to 0. so it would be useful to
  check if the crush map offers the type name indexed by "0"
  (the name of OSDs is always "OSD.{id}", so we don't need to
  look up the name of an OSD item in the crushmap).

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b75384d73958faf81d45847a7dfa56f4fa347e6f)

10 years agoMerge pull request #4667 from SUSE/wip-11611-hammer
Loic Dachary [Fri, 10 Jul 2015 07:39:15 +0000 (09:39 +0200)]
Merge pull request #4667 from SUSE/wip-11611-hammer

ceph.spec: update OpenSUSE BuildRequires

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoOSDMonitor: allow addition of cache pool with non-empty snaps with config 5252/head
Samuel Just [Tue, 7 Jul 2015 18:43:01 +0000 (11:43 -0700)]
OSDMonitor: allow addition of cache pool with non-empty snaps with config

We need to be able to allow the version of ceph_test_* from earlier
versions of ceph to continue to work.  This patch also adjusts the
work unit to use a single rados snap to test the condition without
--force-nonempty to ensure that we don't need to be careful about
the config value when running that script.

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5123 from theanalyst/wip-11979-hammer
Gregory Farnum [Wed, 8 Jul 2015 15:52:12 +0000 (16:52 +0100)]
Merge pull request #5123 from theanalyst/wip-11979-hammer

MDSMonitor: handle MDSBeacon messages properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoAlways provide summary for non-healthy cluster 4868/head
Thorsten Behrens [Fri, 6 Feb 2015 00:26:40 +0000 (01:26 +0100)]
Always provide summary for non-healthy cluster

This fixes a problem, wherein calamari does not provide
popup drill-downs for warnings or errors, should the summary
be missing.

Calamari gets health info from /api/v1/cluster/$FSID/health.
If the data here has a summary field, this summary is provided
in a popup window:

  /api/v1/cluster/$FSID/health is populated (ultimately) with
  status obtained via librados python bindings from the ceph
  cluster. In the case where there's clock skew, the summary
  field supplied by the ceph cluster is empty.

No summary field, no popup window with more health details.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit eaf6e0cf48488fe604d0ef0db164d44948d4e8d4)

10 years agoMerge pull request #4862 from SUSE/wip-11874-hammer
Loic Dachary [Wed, 8 Jul 2015 13:36:38 +0000 (15:36 +0200)]
Merge pull request #4862 from SUSE/wip-11874-hammer

Bucket header is enclosed by quotes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4885 from theanalyst/wip-11755-hammer
Loic Dachary [Wed, 8 Jul 2015 13:35:53 +0000 (15:35 +0200)]
Merge pull request #4885 from theanalyst/wip-11755-hammer

Object copy bug

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4884 from theanalyst/wip-11722-hammer
Loic Dachary [Wed, 8 Jul 2015 13:34:45 +0000 (15:34 +0200)]
Merge pull request #4884 from theanalyst/wip-11722-hammer

Keystone PKI token expiration is not enforced

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4875 from ceph/wip-11770-hammer
Loic Dachary [Wed, 8 Jul 2015 13:30:48 +0000 (15:30 +0200)]
Merge pull request #4875 from ceph/wip-11770-hammer

librbd: aio calls may block

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomon: always reply mdsbeacon 5123/head
Kefu Chai [Fri, 15 May 2015 14:50:36 +0000 (22:50 +0800)]
mon: always reply mdsbeacon

the MDS (Beacon) is always expecting the reply for the mdsbeacon messages from
the lead mon, and it uses the delay as a metric for the laggy-ness of the
Beacon. when it comes to the MDSMonitor on a peon, it will remove the route
session at seeing a reply (route message) from leader, so a reply to
mdsbeacon will stop the peon from resending the mdsbeacon request to the
leader.

if the MDSMonitor re-forwards the unreplied requests after they are
outdated, there are chances that the requests reflecting old and even wrong
state of the MDSs mislead the lead monitor. for example, the MDSs which sent
the outdated messages could be dead.

Fixes: #11590
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b3555e9c328633c9e1fbc27d652c004b30535e5b)

10 years agomon/MDSMonitor: rename labels to a better name
Kefu Chai [Wed, 3 Jun 2015 06:20:21 +0000 (23:20 -0700)]
mon/MDSMonitor: rename labels to a better name

* s/ignore/reply/
* s/out/ignore/

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f00ecb8b3df73ce6337985bc6d43bce5143ee537)

10 years agomon: send no_reply() to peon to drop ignored mdsbeacon
Kefu Chai [Tue, 2 Jun 2015 04:55:06 +0000 (12:55 +0800)]
mon: send no_reply() to peon to drop ignored mdsbeacon

so the peon can remove the ignored mdsbeacon request from the
routed_requets at seeing this reply, and hence no longer resend the
request.

Fixes: #11590
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 72a37b3a8e145d8522ea67fc14ce2c5510b6852b)

10 years agomon: remove unnecessary error handling
Kefu Chai [Tue, 2 Jun 2015 04:22:26 +0000 (12:22 +0800)]
mon: remove unnecessary error handling

msg.get_session() should always return a non-zero pointer in
Monitor.dispatch()

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 16e8e2cc82a90c49cd8aa3d0e3acc4694ba659a0)

10 years agomon: remove unused variable 5122/head
Kefu Chai [Fri, 8 May 2015 07:21:20 +0000 (15:21 +0800)]
mon: remove unused variable

* as a side effect, this change silences
  http://tracker.ceph.com/issues/11576

Fixes: #11576
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e7b196a4a091c0ea258866559ba06e7ed0cc4247)

10 years agoMerge pull request #4886 from theanalyst/wip-11737-hammer
Abhishek L [Wed, 1 Jul 2015 12:39:46 +0000 (18:09 +0530)]
Merge pull request #4886 from theanalyst/wip-11737-hammer

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #5095 from ceph/wip-fix-doc-hammer
Kefu Chai [Sat, 27 Jun 2015 09:11:11 +0000 (17:11 +0800)]
Merge pull request #5095 from ceph/wip-fix-doc-hammer

doc: fix doc build

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: add the corresponding @endcond command for @cond 5095/head
Kefu Chai [Sat, 27 Jun 2015 06:44:55 +0000 (14:44 +0800)]
doc: add the corresponding @endcond command for @cond

* they are used to applease asphyxiate, as it
  is not able to handle "enum" sections

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: remove orphan: directive in ceph-create-keys.rst
Kefu Chai [Sat, 27 Jun 2015 06:43:01 +0000 (14:43 +0800)]
doc: remove orphan: directive in ceph-create-keys.rst

* it is used to silence the sphinx warning, but conf.py
  does not like it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: let doxygen ignore src/tracing
Kefu Chai [Sat, 27 Jun 2015 06:41:59 +0000 (14:41 +0800)]
doc: let doxygen ignore src/tracing

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4902 from theanalyst/wip-11908-hammer
Samuel Just [Fri, 26 Jun 2015 21:19:40 +0000 (14:19 -0700)]
Merge pull request #4902 from theanalyst/wip-11908-hammer

Fixes for rados ops with snaps

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5069 from dachary/wip-11806-hammer
Loic Dachary [Fri, 26 Jun 2015 00:03:42 +0000 (20:03 -0400)]
Merge pull request #5069 from dachary/wip-11806-hammer

ceph / ceph-dbg steal ceph-objecstore-tool from ceph-test / ceph-test-dbg

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodebian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg (take 2) 5069/head
Loic Dachary [Wed, 24 Jun 2015 18:58:47 +0000 (14:58 -0400)]
debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg (take 2)

968573b8930a7c8485bf53e3a989ce2f7d0a2fff incorrectly backported
6f11fbf41fab10924b1e0e41fcf27864779d4073. It should instead reflect that
ceph-dbg in 0.94.2 and above will break ceph-test-dbg in all versions
prior to 0.94.2.

In other words, 0.94-XXXX being lower than 0.94.1, upgrading from
0.94.1 to 0.94.2 will not notice that ceph-dbg breaks ceph-test-dbg.

$ dpkg --compare-versions 0.94-XXXX lt 0.94.1 && echo yes || echo no
yes
$ dpkg --compare-versions 0.94.2 lt 0.94.1-xxx && echo yes || echo no
no

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

Signed-off-by: Loic Dachary <loic@dachary.org>
10 years agorgw/logrotate.conf: Rename service name 5055/head
wuxingyi [Wed, 11 Mar 2015 09:34:40 +0000 (17:34 +0800)]
rgw/logrotate.conf: Rename service name

The service name for ceph rados gateway was changed to "ceph-radosgw",
the previous version of service name "radosgw" would cause a failed reload,
and finally make it impossible to write any log data to the log file.

Signed-off-by: wuxingyi <wuxingyi2015@outlook.com>
(cherry picked from commit 9df3f798179481fe8ae6ae873dcb793de7d8f367)

10 years agotests: add librbd watch/notify version compatibility test 5045/head 5046/head
Jason Dillaman [Tue, 5 May 2015 17:08:21 +0000 (13:08 -0400)]
tests: add librbd watch/notify version compatibility test

Fixes: #11405
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 41e4cbe032e32762e3a9e8bc3eff8ece19f91a54)