]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoosd: fix send_failures() locking
Sage Weil [Fri, 18 Sep 2015 01:42:53 +0000 (21:42 -0400)]
osd: fix send_failures() locking

It is unsafe to check failure_queue.empty() without the lock.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: backoff the max reporting interval, too
Sage Weil [Thu, 17 Sep 2015 21:47:54 +0000 (17:47 -0400)]
osd: backoff the max reporting interval, too

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: no need for regular send_pg_temps
Sage Weil [Thu, 17 Sep 2015 21:47:43 +0000 (17:47 -0400)]
osd: no need for regular send_pg_temps

This is done by process_peering_events.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: just send alive when it is queue
Sage Weil [Fri, 18 Sep 2015 18:24:27 +0000 (14:24 -0400)]
osd: just send alive when it is queue

No need to futz with last_mon_report or resend it again later.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: fix pg stat reporting
Sage Weil [Wed, 16 Sep 2015 15:00:57 +0000 (11:00 -0400)]
osd: fix pg stat reporting

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: inline do_mon_report
Sage Weil [Fri, 18 Sep 2015 18:24:05 +0000 (14:24 -0400)]
osd: inline do_mon_report

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: limit nubmer of pg stat updates in flight
Sage Weil [Tue, 15 Sep 2015 20:41:03 +0000 (16:41 -0400)]
osd: limit nubmer of pg stat updates in flight

There is no reason to heavily pipeline this.  If the mon is slow
committing them we should go slow too.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: fix pg_stats_queue lock protection
Sage Weil [Tue, 15 Sep 2015 20:34:34 +0000 (16:34 -0400)]
osd: fix pg_stats_queue lock protection

We are indirectly relying on osd_lock, but that may no longer
work for us in the future.  Use the stats lock instead.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: scale mon report interval with timeout backoff
Sage Weil [Tue, 15 Sep 2015 20:26:54 +0000 (16:26 -0400)]
osd: scale mon report interval with timeout backoff

If we have had to scale the backoff by 3x because the mon is
loaded, scale the min report interval accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: keep count of outstanding pg stat updates to mon
Sage Weil [Tue, 15 Sep 2015 20:26:06 +0000 (16:26 -0400)]
osd: keep count of outstanding pg stat updates to mon

Count how many stat updates we have in flight.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: no stats outstanding when we reset the session
Sage Weil [Tue, 15 Sep 2015 20:16:22 +0000 (16:16 -0400)]
osd: no stats outstanding when we reset the session

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: remove old stats backoff mechanism
Sage Weil [Tue, 15 Sep 2015 20:15:29 +0000 (16:15 -0400)]
osd: remove old stats backoff mechanism

This would only backoff 2x the configured rate, and is less
robust than the new backoff + decay approach.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: exponential backoff on pg stats ack timeout
Sage Weil [Tue, 15 Sep 2015 20:08:02 +0000 (16:08 -0400)]
osd: exponential backoff on pg stats ack timeout

If we don't get a timely response to our pg stats update we fail
the mon connection and reconnect to a new mon.  If the mons aren't
responding because they are overloaded (for example, because they
are overwhelmed with stats updates) this just makes the problem
worse.

Mitigate the situation by doing an exponential backoff on the
timeout.  When we do successfully send an update, slowly decay the
timeout back to the initial value.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomessage/MLog: include seq in print
Sage Weil [Tue, 15 Sep 2015 19:38:52 +0000 (15:38 -0400)]
message/MLog: include seq in print

...so we can disambiguate which log message(s) we have.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/OSDMap: cache values for in, up osds
Sage Weil [Mon, 14 Sep 2015 21:11:31 +0000 (17:11 -0400)]
osd/OSDMap: cache values for in, up osds

We already do this for num_osd; do the same for the up and in
counts.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: avoid iterating over all pgs to find stale
Sage Weil [Mon, 14 Sep 2015 21:04:23 +0000 (17:04 -0400)]
mon/PGMonitor: avoid iterating over all pgs to find stale

Instead of iterating over all pgs when an osd goes down, make a
set of all osds that might have gone down, and only check pgs that
it manages.  This is more efficient, especially for large clusters
with large numbers of OSDs.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6574 from yuyuyu101/fix-broken-kinects
Sage Weil [Sat, 14 Nov 2015 02:14:56 +0000 (21:14 -0500)]
Merge pull request #6574 from yuyuyu101/fix-broken-kinects

kv/KineticStore: fix broken split_key

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6571 from dachary/wip-test-run-cli
Sage Weil [Sat, 14 Nov 2015 00:27:45 +0000 (19:27 -0500)]
Merge pull request #6571 from dachary/wip-test-run-cli

tests: restore run-cli-tests

9 years agoMerge pull request #6578 from dachary/wip-13785-debian-rbd-replay
Loic Dachary [Fri, 13 Nov 2015 21:04:56 +0000 (22:04 +0100)]
Merge pull request #6578 from dachary/wip-13785-debian-rbd-replay

build/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #4737 from kylinstorage/wip-temp-based-object-eviction
Sage Weil [Fri, 13 Nov 2015 20:39:54 +0000 (15:39 -0500)]
Merge pull request #4737 from kylinstorage/wip-temp-based-object-eviction

osd: improve temperature calculation for cache tier agent

Reviewed-by: Sage Weil
9 years agoMerge pull request #6422 from xiexingguo/xxg-wip13639
Sage Weil [Fri, 13 Nov 2015 20:22:08 +0000 (15:22 -0500)]
Merge pull request #6422 from xiexingguo/xxg-wip13639

librados: fix potential null pointer access when do pool_snap_list

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6486 from XinzeChi/wip-multiple-finisher
Sage Weil [Fri, 13 Nov 2015 20:20:48 +0000 (15:20 -0500)]
Merge pull request #6486 from XinzeChi/wip-multiple-finisher

osd: FileStore: support multiple ondisk finish and apply finishers

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6518 from kylinstorage/wip-trivial-optimization
Sage Weil [Fri, 13 Nov 2015 20:20:13 +0000 (15:20 -0500)]
Merge pull request #6518 from kylinstorage/wip-trivial-optimization

osd: optimize scrub subset_last_update calculation

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agobuild/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg 6578/head
Loic Dachary [Fri, 13 Nov 2015 18:10:28 +0000 (19:10 +0100)]
build/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agotests: avoid bashism 6571/head
Loic Dachary [Fri, 13 Nov 2015 17:47:31 +0000 (18:47 +0100)]
tests: avoid bashism

The shell used by the cli tests is not always bash. Not using the
here-word is also more readable in this specific case.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agorbd: hardcode application name into help
Jason Dillaman [Fri, 13 Nov 2015 15:20:19 +0000 (10:20 -0500)]
rbd: hardcode application name into help

Avoid dynamically detecting the application name and instead hardcode
the rbd CLI name into the help output.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agokv/KineticStore: Fix broken split_key 6574/head
Haomai Wang [Fri, 13 Nov 2015 17:04:11 +0000 (01:04 +0800)]
kv/KineticStore: Fix broken split_key

Introduced by PR #6312

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agotests: restore run-cli-tests
Loic Dachary [Fri, 13 Nov 2015 15:23:27 +0000 (16:23 +0100)]
tests: restore run-cli-tests

e4ca468 moved src/test/run-cli-tests from check-local to check_SCRIPTS
but did not add it to the TESTS variable.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoradosgw-admin: fix cli tests 6569/head
Sage Weil [Fri, 13 Nov 2015 15:06:18 +0000 (10:06 -0500)]
radosgw-admin: fix cli tests

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdmaptool: fix cli tests
Sage Weil [Fri, 13 Nov 2015 15:05:53 +0000 (10:05 -0500)]
osdmaptool: fix cli tests

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocrushtool: fix cli tests
Sage Weil [Fri, 13 Nov 2015 14:53:37 +0000 (09:53 -0500)]
crushtool: fix cli tests

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocrushtool: fix cli test help
Sage Weil [Fri, 13 Nov 2015 14:27:28 +0000 (09:27 -0500)]
crushtool: fix cli test help

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6532 from dachary/wip-mailmap
Loic Dachary [Fri, 13 Nov 2015 14:14:11 +0000 (15:14 +0100)]
Merge pull request #6532 from dachary/wip-mailmap

mailmap: Ubuntu Kylin name changed to Kylin Cloud

Reviewed-by: Li Wang <li.wang@kylin-cloud.com>
9 years agoMerge pull request #5848 from storage-zuiwanyuan/wip-nonblock-connect
Sage Weil [Fri, 13 Nov 2015 14:04:47 +0000 (09:04 -0500)]
Merge pull request #5848 from storage-zuiwanyuan/wip-nonblock-connect

msg/async: support of non-block connect in async messenger

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #6478 from yuyuyu101/wip-13666
Sage Weil [Fri, 13 Nov 2015 14:03:35 +0000 (09:03 -0500)]
Merge pull request #6478 from yuyuyu101/wip-13666

msg/async: let receiver ack message ASAP

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomsg/async: support of non-block connect in async messenger 5848/head
Jianhui Yuan [Fri, 13 Nov 2015 07:36:36 +0000 (15:36 +0800)]
msg/async: support of non-block connect in async messenger

Fixes: #12802
Signed-off-by: Jianhui Yuan <zuiwanyuan@gmail.com>
9 years agoMerge pull request #6534 from kylinstorage/wip-trivial-scrub-cleanup
Kefu Chai [Fri, 13 Nov 2015 07:28:39 +0000 (15:28 +0800)]
Merge pull request #6534 from kylinstorage/wip-trivial-scrub-cleanup

osd: clarify the scrub result report

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoscrub: clarify the result report 6534/head
Li Wang [Fri, 13 Nov 2015 07:00:09 +0000 (15:00 +0800)]
scrub: clarify the result report

It may happen that the authoritative object
such that auth.size != be_get_ondisk_size(auth_oi.size),
in that case, clarify the error report.

Signed-off-by: Li Wang <li.wang@kylin-cloud.com>
9 years agoMerge branch 'wip-py3'
Josh Durgin [Fri, 13 Nov 2015 04:15:48 +0000 (20:15 -0800)]
Merge branch 'wip-py3'

pybind: a few more python 3 fixes for rbd and rados

Reviewed-by: David Coles <dcoles@gaikai.com>
9 years agopybind/rados: return pool_reverse_lookup() result as a string
Josh Durgin [Thu, 12 Nov 2015 08:57:36 +0000 (00:57 -0800)]
pybind/rados: return pool_reverse_lookup() result as a string

This makes it symmetric with create_pool() in python 3.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agopybind/test_rbd: convert a few more str to bytes for py3
Josh Durgin [Thu, 12 Nov 2015 07:59:21 +0000 (23:59 -0800)]
pybind/test_rbd: convert a few more str to bytes for py3

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agopybind/rbd: encode snap_rename args for py3
Josh Durgin [Thu, 12 Nov 2015 07:57:16 +0000 (23:57 -0800)]
pybind/rbd: encode snap_rename args for py3

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agopybind/rbd: decode stat() and list_children() results for py3
Josh Durgin [Thu, 12 Nov 2015 07:56:14 +0000 (23:56 -0800)]
pybind/rbd: decode stat() and list_children() results for py3

For stat(), only block_name_prefix is filled in - parent and
parent_pool are always blank.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agopybind/rbd: decode parent_info() to str types for py3
Josh Durgin [Thu, 12 Nov 2015 03:05:59 +0000 (19:05 -0800)]
pybind/rbd: decode parent_info() to str types for py3

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agopybind/test_rbd: fix map() usage for py3 compat
Josh Durgin [Thu, 12 Nov 2015 03:02:12 +0000 (19:02 -0800)]
pybind/test_rbd: fix map() usage for py3 compat

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agopybind/test_rbd: use // for division for py3
Josh Durgin [Thu, 12 Nov 2015 08:06:14 +0000 (00:06 -0800)]
pybind/test_rbd: use // for division for py3

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge branch 'pybind3' of https://github.com/dcoles/ceph into wip-pybind3
Josh Durgin [Fri, 13 Nov 2015 03:32:42 +0000 (19:32 -0800)]
Merge branch 'pybind3' of https://github.com/dcoles/ceph into wip-pybind3

pybind: Add Python 3 support for rados and rbd modules

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/pybind/rbd.py (new create args, minor fix to work with py3)

9 years agoceph: Make stdout/stderr always output Unicode (UTF-8) 6315/head
David Coles [Wed, 11 Nov 2015 22:06:45 +0000 (14:06 -0800)]
ceph: Make stdout/stderr always output Unicode (UTF-8)

If a stream is not interactive, then under Python 2, then the encoding for
stdout/stderr may be None. This means that it's not possible to print Unicode
characters since the encoding will fall back to ASCII.

This explicitly makes sys.stdout/sys.stderr always use UTF-8 encoding for
strings, regardless of the system's local or if the console is interactive or
not.
This matches the existing tests that assume that output of non-ASCII pool names
will be UTF-8 encoded.

When outputting raw binary data (such as the CRUSH-map), we must bypass the
codec and write directly to raw streams (since the new stream will only accept
ASCII byte-strings or Unicode strings).

Signed-off-by: David Coles <dcoles@gaikai.com>
9 years agopybind: Add decode_cstr helper function
David Coles [Tue, 27 Oct 2015 20:32:44 +0000 (13:32 -0700)]
pybind: Add decode_cstr helper function

This function attempts to decode a C-style string into a Python Unicode string.
It accepts an optional "size" parameter for the string length, otherwise it is
assumed that the string is NUL-terminated.

If the pointer is NULL, then this function returns None.

Signed-off-by: David Coles <dcoles@gaikai.com>
9 years agopybind: Add test for creating pool by raw UTF-8
David Coles [Tue, 20 Oct 2015 17:57:46 +0000 (10:57 -0700)]
pybind: Add test for creating pool by raw UTF-8

Some clients try providing non-ASCII pool names by sending raw encoded bytes.
This check ensures that we still support this behaviour for Python 2.

In Python 3, bytestrings will fail since strings are Unicode strings and thus
clients should use Unicode escapes instead.

Signed-off-by: David Coles <dcoles@gaikai.com>
9 years agopybind: Import cstr from the rados module
David Coles [Tue, 20 Oct 2015 17:55:44 +0000 (10:55 -0700)]
pybind: Import cstr from the rados module

Since rados is required for rbd, we can avoid duplication of code across these
two modules.

Signed-off-by: David Coles <dcoles@gaikai.com>
9 years agopybind: Don't encode str on Python 2
David Coles [Tue, 20 Oct 2015 02:42:18 +0000 (19:42 -0700)]
pybind: Don't encode str on Python 2

If you attempt to call encode on a non-ASCII string, then a UnicodeDecodeError
will be raised.

Since str on Python 2 is an 8-bit string, it's possible that it's already UTF-8
encoded. As such we should just pass it through to the C API unmodified.

On Python 3 or if the user explicitly uses unicode, then we'll encode it to
UTF-8 for them.

Signed-off-by: David Coles <dcoles@gaikai.com>
9 years agoMerge branch 'wip-13504' of https://github.com/trociny/ceph
Josh Durgin [Thu, 12 Nov 2015 22:08:31 +0000 (14:08 -0800)]
Merge branch 'wip-13504' of https://github.com/trociny/ceph

rbd: API: options on image create

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/test/librbd/test_librbd.cc (trivial, two tests added at end of file)

9 years agolibrbd: API: options on image create: update tests 6369/head
Mykola Golub [Fri, 23 Oct 2015 14:27:33 +0000 (17:27 +0300)]
librbd: API: options on image create: update tests

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agolibrbd: API: options on image create
Mykola Golub [Fri, 23 Oct 2015 09:38:08 +0000 (12:38 +0300)]
librbd: API: options on image create

Pass options as key/value configuration pairs on image create instead
of expanding rbd_create/rbd_clone/rbd_copy for every possible
configuration override.

Fixes: #13504
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #6557 from ceph/wip-rbd-cmake-fixes
Jason Dillaman [Thu, 12 Nov 2015 18:32:31 +0000 (13:32 -0500)]
Merge pull request #6557 from ceph/wip-rbd-cmake-fixes

cmake: librbd and libjournal build fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6556 from athanatos/wip-cmake-nss
Casey Bodley [Thu, 12 Nov 2015 17:34:08 +0000 (12:34 -0500)]
Merge pull request #6556 from athanatos/wip-cmake-nss

cmake: add nss as a suffix for pk11pub.h

9 years agocmake: add nss as a suffix for pk11pub.h 6556/head
Samuel Just [Wed, 11 Nov 2015 21:28:08 +0000 (13:28 -0800)]
cmake: add nss as a suffix for pk11pub.h

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agolibrbd: provide an out-of-class definition for MAX_DESCRIPTION_OFFSET 6557/head
Ilya Dryomov [Thu, 12 Nov 2015 13:38:05 +0000 (14:38 +0100)]
librbd: provide an out-of-class definition for MAX_DESCRIPTION_OFFSET

std::min() takes its parameters by reference, so provide a definition
for OptionPrinter::MAX_DESCRIPTION_OFFSET constant.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
9 years agocmake: fix librbd and add src/journal
Ilya Dryomov [Thu, 12 Nov 2015 13:52:47 +0000 (14:52 +0100)]
cmake: fix librbd and add src/journal

librbd was missing a recently added file, src/journal was missing
entirely - this brings the build back.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
9 years agomailmap: Ubuntu Kylin name changed to Kylin Cloud 6532/head
Loic Dachary [Wed, 11 Nov 2015 06:10:30 +0000 (07:10 +0100)]
mailmap: Ubuntu Kylin name changed to Kylin Cloud

Reviewed-by: Li Wang <li.wang@kylin-cloud.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: sort files
Loic Dachary [Wed, 11 Nov 2015 06:07:07 +0000 (07:07 +0100)]
mailmap: sort files

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6517 from kylinstorage/wip-trivial-bug
Sage Weil [Thu, 12 Nov 2015 13:40:42 +0000 (08:40 -0500)]
Merge pull request #6517 from kylinstorage/wip-trivial-bug

osd: fix bug in last_* PG state timestamps

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6552 from trociny/wip-journal
Jason Dillaman [Thu, 12 Nov 2015 13:21:21 +0000 (08:21 -0500)]
Merge pull request #6552 from trociny/wip-journal

journal: incremental improvements and fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6462 from javacruft/wip/ec-modules
Loic Dachary [Thu, 12 Nov 2015 11:35:20 +0000 (12:35 +0100)]
Merge pull request #6462 from javacruft/wip/ec-modules

Build internal plugins and classes as modules

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agojournal: update allocated tid when skipping committed entry in player 6552/head
Mykola Golub [Thu, 29 Oct 2015 14:07:23 +0000 (16:07 +0200)]
journal: update allocated tid when skipping committed entry in player

Otherwise, if on image open, there are no any uncommitted entries in
journal, allocated tid is not updated to the latest commited and
recording always starts from tid=0.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #6539 from yehudasa/wip-cmake-fix
Kefu Chai [Thu, 12 Nov 2015 03:53:34 +0000 (11:53 +0800)]
Merge pull request #6539 from yehudasa/wip-cmake-fix

cmake: fix files list

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6316 from dillaman/wip-13494
Josh Durgin [Wed, 11 Nov 2015 19:54:56 +0000 (11:54 -0800)]
Merge pull request #6316 from dillaman/wip-13494

rbd: dynamically generated bash completion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge remote-tracking branch 'origin/jewel'
Josh Durgin [Wed, 11 Nov 2015 19:51:49 +0000 (11:51 -0800)]
Merge remote-tracking branch 'origin/jewel'

9 years agocmake: fix files list 6539/head
Yehuda Sadeh [Wed, 11 Nov 2015 16:38:05 +0000 (08:38 -0800)]
cmake: fix files list

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agocls::journal: fixup: constify dump functions
Mykola Golub [Thu, 8 Oct 2015 06:01:54 +0000 (09:01 +0300)]
cls::journal: fixup: constify dump functions

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agojournal: call metadata shutdown on journal remove
Mykola Golub [Mon, 28 Sep 2015 18:37:05 +0000 (21:37 +0300)]
journal: call metadata shutdown on journal remove

This fixes error observed when disabling journal:

  JournalMetadata: journal watch error: (107) Transport endpoint is not connected

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agojournal: don't use object_number when comparing positions
Mykola Golub [Thu, 17 Sep 2015 07:05:20 +0000 (10:05 +0300)]
journal: don't use object_number when comparing positions

Only tid does matter.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agojournal: make commit and flush params configurable
Mykola Golub [Tue, 1 Sep 2015 20:09:52 +0000 (23:09 +0300)]
journal: make commit and flush params configurable

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agojournal: allow alternate pool for journal objects
Mykola Golub [Sun, 6 Sep 2015 14:06:44 +0000 (17:06 +0300)]
journal: allow alternate pool for journal objects

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agojournal: output operators for journal types
Mykola Golub [Thu, 3 Sep 2015 18:12:12 +0000 (21:12 +0300)]
journal: output operators for journal types

They are going to be used for diagnostic.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #6471 from mslovy/wip-check-reply-guard-again
Sage Weil [Wed, 11 Nov 2015 14:23:39 +0000 (09:23 -0500)]
Merge pull request #6471 from mslovy/wip-check-reply-guard-again

osd: avoid double-check for replaying and can_checkpoint() in FileStore::_check_replay_guard

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6426 from xiexingguo/xxg-wip-13642
Sage Weil [Wed, 11 Nov 2015 14:16:58 +0000 (09:16 -0500)]
Merge pull request #6426 from xiexingguo/xxg-wip-13642

librados: fix rare race where pool op callback may hang forever

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6407 from renhwztetecs/renhw-wip-13627
Sage Weil [Wed, 11 Nov 2015 14:15:51 +0000 (09:15 -0500)]
Merge pull request #6407 from renhwztetecs/renhw-wip-13627

mon: initialize recorded election epoch properly even when standalone

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6385 from Vicente-Cheng/mkfs-does-not-decode-an-existing-superblock
Sage Weil [Wed, 11 Nov 2015 14:14:01 +0000 (09:14 -0500)]
Merge pull request #6385 from Vicente-Cheng/mkfs-does-not-decode-an-existing-superblock

osd: fix reactivate (check OSDSuperblock in mkfs() when we already have the superblock)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6373 from liewegas/wip-promoteon2ndread-ec
Sage Weil [Wed, 11 Nov 2015 14:12:31 +0000 (09:12 -0500)]
Merge pull request #6373 from liewegas/wip-promoteon2ndread-ec

librados: fix PromoteOn2ndRead test for EC

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6520 from trociny/fix-rbd-apply_changes
Jason Dillaman [Wed, 11 Nov 2015 14:10:44 +0000 (09:10 -0500)]
Merge pull request #6520 from trociny/fix-rbd-apply_changes

rbd: make config changes actually apply

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6347 from xiexingguo/xxg-wip-13566
Sage Weil [Wed, 11 Nov 2015 14:07:15 +0000 (09:07 -0500)]
Merge pull request #6347 from xiexingguo/xxg-wip-13566

osd: fixes for several cases where op result code was not checked or set

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5168 from majianpeng/dynamic-control-optracker
Sage Weil [Wed, 11 Nov 2015 14:02:26 +0000 (09:02 -0500)]
Merge pull request #5168 from majianpeng/dynamic-control-optracker

common: allow enable/disable of optracker at runtime

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6089 from SUSE/wip-init-ceph-getopt
Kefu Chai [Wed, 11 Nov 2015 14:00:44 +0000 (22:00 +0800)]
Merge pull request #6089 from SUSE/wip-init-ceph-getopt

init-ceph: use getopt to make option processing more flexible

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agosrc/init-ceph.in: remove unused variables 6089/head
Nathan Cutler [Sun, 27 Sep 2015 21:16:48 +0000 (23:16 +0200)]
src/init-ceph.in: remove unused variables

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agosrc/init-ceph.in: improve usage message
Nathan Cutler [Sun, 27 Sep 2015 19:16:11 +0000 (21:16 +0200)]
src/init-ceph.in: improve usage message

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agosrc/init-ceph.in: process command-line options using getopt
Nathan Cutler [Sun, 27 Sep 2015 19:11:00 +0000 (21:11 +0200)]
src/init-ceph.in: process command-line options using getopt

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorbd: RBD::clone2: fix tracepoint
Mykola Golub [Thu, 22 Oct 2015 07:11:08 +0000 (10:11 +0300)]
rbd: RBD::clone2: fix tracepoint

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #6516 from trociny/wip-13719
Josh Durgin [Wed, 11 Nov 2015 07:55:37 +0000 (23:55 -0800)]
Merge pull request #6516 from trociny/wip-13719

librbd: perf section name: use hyphen to separate components

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorbd: make config changes actually apply 6520/head
Mykola Golub [Tue, 10 Nov 2015 09:27:05 +0000 (11:27 +0200)]
rbd: make config changes actually apply

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoDoc: add temperature related stuff in documents and test scripts 4737/head
MingXin Liu [Thu, 21 May 2015 13:08:13 +0000 (21:08 +0800)]
Doc: add temperature related stuff in documents and test scripts

Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
9 years agoMon: add temperature support for existing cache related commands
MingXin Liu [Thu, 21 May 2015 13:03:53 +0000 (21:03 +0800)]
Mon: add temperature support for existing cache related commands

Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
9 years agoOsd: add a temperature based object eviction policy for cache tiering
MingXin Liu [Thu, 21 May 2015 12:59:26 +0000 (20:59 +0800)]
Osd: add a temperature based object eviction policy for cache tiering

Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
9 years agotests: rbd/admin_socket: use xmlstarlet when parsing perf dump 6516/head
Mykola Golub [Tue, 10 Nov 2015 07:22:09 +0000 (09:22 +0200)]
tests: rbd/admin_socket: use xmlstarlet when parsing perf dump

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agolibrbd: perf section name: use hyphen to separate components
Mykola Golub [Tue, 10 Nov 2015 06:32:17 +0000 (08:32 +0200)]
librbd: perf section name: use hyphen to separate components

"/" and "@" characters make invalid xml format output.

Fixes: #13719
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMon: expose commands for temperature related setting
MingXin Liu [Thu, 21 May 2015 12:55:59 +0000 (20:55 +0800)]
Mon: expose commands for temperature related setting

Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
9 years agoOsd: add two fields to pg_pool_t
MingXin Liu [Thu, 21 May 2015 12:21:50 +0000 (20:21 +0800)]
Osd: add two fields to pg_pool_t

Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
9 years agodoc: Adding --cluster option to rbd man page.
Vikhyat Umrao [Mon, 19 Oct 2015 12:27:15 +0000 (17:57 +0530)]
doc: Adding --cluster option to rbd man page.

Fixes #13457
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6519 from kylinstorage/wip-revise-organization
Loic Dachary [Wed, 11 Nov 2015 06:05:12 +0000 (07:05 +0100)]
Merge pull request #6519 from kylinstorage/wip-revise-organization

revise organization

Reviewed-by: Loic Dachary <ldachary@redhat.com>