Commit Graph

45803 Commits

Author SHA1 Message Date
Loic Dachary
8629b61b63 tests: ignore test-suite.log
Now that the tests at the top level directory are run via TESTS and not
check-local:, the test-suite.log file is created and must bit
gitignored.

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-11-14 17:57:23 +01:00
Sage Weil
492720e85d Merge pull request #6574 from yuyuyu101/fix-broken-kinects
kv/KineticStore: fix broken split_key

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-13 21:14:56 -05:00
Sage Weil
6015bfb2eb Merge pull request #6571 from dachary/wip-test-run-cli
tests: restore run-cli-tests
2015-11-13 19:27:45 -05:00
Loic Dachary
7d926ce7e0 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>
2015-11-13 22:04:56 +01:00
Sage Weil
8d3082df78 Merge pull request #4737 from kylinstorage/wip-temp-based-object-eviction
osd: improve temperature calculation for cache tier agent

Reviewed-by: Sage Weil
2015-11-13 15:39:54 -05:00
Sage Weil
a8f2e23781 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>
2015-11-13 15:22:08 -05:00
Sage Weil
bc450675c8 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>
2015-11-13 15:20:48 -05:00
Sage Weil
954ddc83bc Merge pull request #6518 from kylinstorage/wip-trivial-optimization
osd: optimize scrub subset_last_update calculation

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-13 15:20:13 -05:00
Loic Dachary
a0204dc47a 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>
2015-11-13 19:11:48 +01:00
Loic Dachary
fe012a2200 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>
2015-11-13 18:47:31 +01:00
Jason Dillaman
5281bdde58 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>
2015-11-13 18:33:21 +01:00
Haomai Wang
c549a8cc0b kv/KineticStore: Fix broken split_key
Introduced by PR #6312

Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-11-14 01:04:11 +08:00
Loic Dachary
d0e9c40177 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>
2015-11-13 17:44:15 +01:00
Sage Weil
c73e96a39a radosgw-admin: fix cli tests
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-13 10:06:18 -05:00
Sage Weil
4ff0368d55 osdmaptool: fix cli tests
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-13 10:05:53 -05:00
Sage Weil
a5b04650ae crushtool: fix cli tests
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-13 09:53:37 -05:00
Sage Weil
b7bb21671a crushtool: fix cli test help
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-13 09:27:28 -05:00
Loic Dachary
1d03924a11 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>
2015-11-13 15:14:11 +01:00
Sage Weil
f622301fd1 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>
2015-11-13 09:04:47 -05:00
Sage Weil
0fa88ea981 Merge pull request #6478 from yuyuyu101/wip-13666
msg/async: let receiver ack message ASAP

Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-13 09:03:35 -05:00
Jianhui Yuan
0fd8de3f21 msg/async: support of non-block connect in async messenger
Fixes: #12802

Signed-off-by: Jianhui Yuan <zuiwanyuan@gmail.com>
2015-11-13 15:36:36 +08:00
Kefu Chai
14df4b04c6 Merge pull request #6534 from kylinstorage/wip-trivial-scrub-cleanup
osd: clarify the scrub result report

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-13 15:28:39 +08:00
Li Wang
785e58ebde 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>
2015-11-13 15:03:17 +08:00
Josh Durgin
5220d8fa52 Merge branch 'wip-py3'
pybind: a few more python 3 fixes for rbd and rados

Reviewed-by: David Coles <dcoles@gaikai.com>
2015-11-12 20:16:57 -08:00
Josh Durgin
3515e22e2d 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>
2015-11-12 19:35:34 -08:00
Josh Durgin
763ca2a996 pybind/test_rbd: convert a few more str to bytes for py3
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-11-12 19:35:34 -08:00
Josh Durgin
d5bec875ca pybind/rbd: encode snap_rename args for py3
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-11-12 19:35:34 -08:00
Josh Durgin
ddb1ee9ac0 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>
2015-11-12 19:35:34 -08:00
Josh Durgin
3c839b441b pybind/rbd: decode parent_info() to str types for py3
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-11-12 19:35:33 -08:00
Josh Durgin
1af26747cf pybind/test_rbd: fix map() usage for py3 compat
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-11-12 19:35:33 -08:00
Josh Durgin
ea2a65417f pybind/test_rbd: use // for division for py3
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-11-12 19:35:33 -08:00
Josh Durgin
b7de34bc7e 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)
2015-11-12 19:32:42 -08:00
David Coles
615f8f45ba 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>
2015-11-12 17:26:37 -08:00
David Coles
0b3435f114 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>
2015-11-12 17:26:34 -08:00
David Coles
801ea73a69 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>
2015-11-12 17:26:30 -08:00
David Coles
63f5462cbd 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>
2015-11-12 17:26:25 -08:00
David Coles
47d9ca7dad 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>
2015-11-12 17:26:01 -08:00
Josh Durgin
773713b078 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)
2015-11-12 14:08:31 -08:00
Mykola Golub
102539e176 librbd: API: options on image create: update tests
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-12 21:43:49 +02:00
Mykola Golub
c3be44ed8f 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>
2015-11-12 21:43:49 +02:00
Jason Dillaman
035ea29df2 Merge pull request #6557 from ceph/wip-rbd-cmake-fixes
cmake: librbd and libjournal build fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-12 13:32:31 -05:00
Casey Bodley
3ccc3aff4d Merge pull request #6556 from athanatos/wip-cmake-nss
cmake: add nss as a suffix for pk11pub.h
2015-11-12 12:34:08 -05:00
Samuel Just
40522828c1 cmake: add nss as a suffix for pk11pub.h
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-11-12 09:12:17 -08:00
Ilya Dryomov
0e5a794eac 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>
2015-11-12 17:59:19 +01:00
Ilya Dryomov
6c5d601b65 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>
2015-11-12 17:59:19 +01:00
Loic Dachary
1ce364b1d6 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>
2015-11-12 14:54:10 +01:00
Loic Dachary
0d684ad8b5 mailmap: sort files
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-11-12 14:53:51 +01:00
Sage Weil
0ee9fdced4 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>
2015-11-12 08:40:42 -05:00
Jason Dillaman
085d8bed57 Merge pull request #6552 from trociny/wip-journal
journal: incremental improvements and fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-12 08:21:21 -05:00
Loic Dachary
0ce234b8fe Merge pull request #6462 from javacruft/wip/ec-modules
Build internal plugins and classes as modules

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-12 12:35:20 +01:00