Commit Graph

37367 Commits

Author SHA1 Message Date
Loic Dachary
df9d5c5cfd objectstore_tool: parse new object description format
The object format changed from

    {json object}

to

    [pgid,{json object}]

The parser is updated accordingly. If the --pgid is present, check that
it equals the pgid from the object description.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-12-05 13:01:36 +01:00
Loic Dachary
c69aaceac7 objectstore_tool: filter --op list and explore all PGs
The positional object name is used to filter the output of --op list and
only show the objects with a matching name. If both the object name and
the pgid are omitted, all objects from all PGs are displayed.

The output format is changed from

    {"oid":"GROUP","key":"","snapid":-2,
     "hash":2659194943,"max":0,"pool":0,"namespace":""}

to

    [["0.7_head",{"oid":"GROUP","key":"","snapid":-2,
                  "hash":2659194943,"max":0,"pool":0,
                  "namespace":""}]]

where the first member is the pgid where the object is found.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-12-05 13:01:36 +01:00
Loic Dachary
7c1165f963 objectstore_tool: lookup objects by name
If the object is not a parsable JSON string, assume an object name and
look it up in all the PGs. If multiple objects have the same name, only
apply the command to one of them. It is primarily useful in a test
environment where the names of the tests objects are known and only a
small number of objects exists. It replaces the following:

    path='--data-path dev/osd0 --journal-path dev/osd0.journal'
    for pgid in $(./ceph_objectstore_tool $path --op list-pgs) ; do
      object=$(./ceph_objectstore_tool $path --pgid $pgid --op list |
               grep '"oid":"NAME"')
      test -n "$object" && break
    done
    ./ceph_objectstore_tool $path --pgid $pgid "$object" remove

with:

    ./ceph_objectstore_tool $path NAME remove

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-12-05 13:01:36 +01:00
Loic Dachary
d9e747b1bd objectstore_tool: refactor list-lost and fix-lost
Abstract out the PG exploration loops and encapsulate the list-lost and
fix-lost semantic in a callable object.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-12-05 13:01:36 +01:00
Loic Dachary
a90233c8b7 objectstore_tool: update usage strings
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-12-05 13:01:36 +01:00
John Wilkins
cfb03b2d8f Merge pull request #3081 from dachary/wip-10246-centos7
doc: add centos 7 to ceph-deploy installation

Reviewed by: John Wilkins <jowilkin@redhat.com>
2014-12-04 16:54:47 -08:00
Loic Dachary
744c309e1d Merge pull request #3031 from dachary/wip-10199-config-get-xml
common: admin sock output XML elements whitespace

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com>
2014-12-05 00:07:59 +01:00
Josh Durgin
1576311444 Merge pull request #2959 from ceph/wip-10104
rados.py: fix misnamed 'wait_*' routines, add true wait/wait-with-cb

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2014-12-04 13:36:38 -08:00
Yehuda Sadeh
43a2c3aaf0 Merge pull request #2985 from CzBiX/quick-fix
rgw: check endpoints is not empty before use it.

This fixes a regression due to commit 3c4b782bcb

Reported-by: Mykola Golub <to.my.trociny@gmail.com>
2014-12-04 13:21:33 -08:00
Dan Mick
360d627fc8 pybind/test_rados: add test for wait_for_complete_and_cb()
Also, factor out some common code between the two tests

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2014-12-04 13:08:46 -08:00
Dan Mick
19212cded8 rados.py: fix misnamed 'wait_*' routines, add true wait/wait-with-cb
Also modify aio_read test for wait: write an object, take its active set
down, try to aio_read; verify read doesn't complete until active set is
allowed back up

Fixes: #10104
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2014-12-04 13:08:41 -08:00
Gregory Farnum
96d06a5f5c Merge pull request #3076 from ceph/wip-mon-mdsdne
MDSMonitor.cc: fix assertion caused by MDSMap::STATE_DNE state

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2014-12-04 10:31:34 -08:00
Sage Weil
19e6c58622 Merge pull request #3072 from ceph/wip-10231-gperftools-location
heap_profiler: support new gperftools header locations

gitbuilders are happy

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-04 10:13:55 -08:00
Sage Weil
12098b4115 Merge pull request #3084 from ceph/wip-rados-include
librados: Fix rados include problem reported by "sponce"

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-04 10:11:18 -08:00
David Zafman
22c1d9b0cf librados: Fix rados include problem reported by "sponce"
Caused by a03f85a8e7

Signed-off-by: David Zafman <dzafman@redhat.com>
2014-12-04 10:06:30 -08:00
Sage Weil
f9c602a2ce Merge pull request #3059 from dachary/wip-10125-radosgw-init
rgw: run radosgw as apache with systemd

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-04 10:04:30 -08:00
Loic Dachary
7b621f4abf rgw: run radosgw as apache with systemd
Same as sysv.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-12-04 18:57:29 +01:00
Samuel Just
cad4edceda Merge pull request #2997 from ceph/wip-snapmapper
osd: require SNAPMAPPER feature; drop tolerate_collection_add_enoent

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-12-04 09:30:44 -08:00
Samuel Just
a6a8aeaefb Merge pull request #2979 from ceph/wip-kill-category
osd: kill 'category' from pg_stats_t

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-12-04 09:29:31 -08:00
Samuel Just
d212ced82b Merge pull request #2694 from dachary/wip-9728-jerasure-neon
erasure-code: jerasure support for NEON

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-12-04 09:26:48 -08:00
Sage Weil
08aa6d3ee9 Merge pull request #3082 from scuttlemonkey/wip-doc-10247
Changed os-recommendation table sorting to remove implied bias.

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-04 09:25:40 -08:00
Samuel Just
473e36ca0b Merge pull request #3048 from ceph/wip-10209
osd: tolerate sessionless con in fast dispatch path

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2014-12-04 09:25:14 -08:00
Samuel Just
6b27089808 Merge pull request #3049 from dachary/wip-10211-erasure-code-buffer-alignement
erasure-code: enforce chunk size alignment

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-12-04 09:24:14 -08:00
Sage Weil
3f2f42dda4 doc/release-notes: v0.89
Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-04 09:15:37 -08:00
Sage Weil
c0685ec709 Merge remote-tracking branch 'gh/next' 2014-12-04 08:39:56 -08:00
scuttlemonkey
237b29c248 Changed os-recommendation table sorting to remove implied bias.
Fixes: #10247

signed-of by: Patrick McGarry <pmcgarry@redhat.com>
2014-12-04 11:27:35 -05:00
Loic Dachary
a6102f0b19 documentation: add centos 7 to ceph-deploy installation
http://tracker.ceph.com/issues/10246 Fixes: #10246

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-12-04 17:11:02 +01:00
Loic Dachary
ec2677eaa6 Merge pull request #3024 from ceph/wip-librados-symbols
librados: Only public API symbols from the shared library

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-12-04 15:10:10 +01:00
Yan, Zheng
e42df6afbb MDSMonitor.cc: fix assertion caused by MDSMap::STATE_DNE state
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2014-12-04 20:28:10 +08:00
Loic Dachary
f9bd970ea3 Merge pull request #3028 from majianpeng/fix4
Add perf reset command.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-12-04 07:39:40 +01:00
Yan, Zheng
f11fd66f80 Merge pull request #3074 from ceph/wip-10229
osdc/Filer: use finisher to execute C_Probe and C_PurgeRange
2014-12-04 13:32:32 +08:00
Yan, Zheng
d3ee89ace6 osdc/Filer: use finisher to execute C_Probe and C_PurgeRange
Currently contexts C_Probe/C_PurgeRange are executed while holding
OSDSession::completion_lock. C_Probe and C_PurgeRange may call
Objecter::stat() and Objecter::remove() respectively, which acquire
Objecter::rwlock. This can cause deadlock because there is intermediate
dependency between Objecter::rwlock and OSDSession::completion_lock:

 Objecter::rwlock -> OSDSession::lock -> OSDSession::completion_lock

The fix is exexcute C_Probe/C_PurgeRange in finisher thread.

Fixes: #10229
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2014-12-04 13:26:33 +08:00
Ken Dreyer
6edaf4e796 heap_profiler: support new gperftools header locations
The google/ headers location has been deprecated as of gperftools 2.0.
As of gperftools 2.2rc, the google/ headers will now give deprecation
warnings, and they will probably disappear in a future gperftools
update.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2014-12-03 13:44:00 -07:00
Greg Farnum
d5e2c2cf10 mon: fix signed/unsigned comparison warning
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2014-12-03 10:45:52 -08:00
Jenkins
68fdc0f68e 0.89 2014-12-03 08:18:33 -08:00
Loic Dachary
6e69955ab5 Merge pull request #3065 from ceph/wip-cephtool-exec
qa: fix cephtool tests not getting run

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-12-03 16:28:51 +01:00
John Spray
d98cec7f9c qa: fix teardown in cephtool's test_mon_mds
This was missing from 17b5fc9a but we didn't notice
because the test wasn't being run by the gitbuilders.

Signed-off-by: John Spray <john.spray@redhat.com>
2014-12-03 16:26:57 +01:00
Sage Weil
c4f934997a Merge pull request #3044 from osynge/wip=suse-systemd
better systemd support

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-02 20:56:55 -08:00
Sage Weil
cbac460950 Merge pull request #3067 from dachary/wip-cephtool
fix cephtools running only part of the tests + avoid killing wrong daemons

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-02 20:53:12 -08:00
Jianpeng Ma
8e5dbe7dff common/perf_counters: Remove the duplicated code.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-12-03 10:28:00 +08:00
Jianpeng Ma
963b76494b test/perf_counters: Replace perfcounters_dump to perf dump.
The func of command  perfcounters_dump and 'perf dump' are the same .
But from the print 'ceph --admin-daemon help', it only print 'perf
dump'. So replace.
In order to keep consistent, still keep perfcounters_dump in code for
old user.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-12-03 10:26:26 +08:00
Jianpeng Ma
eafb22453f test/perf_counters: Add test case for cmd 'perf reset'
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-12-03 10:23:03 +08:00
Jianpeng Ma
5f8186b106 common/perf_counters: Add 'perf reset all|perfcountername' for 'ceph
--admin-daemon'

Using this command, we can reset all perfcounters or reset on specified
perfcounter.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-12-03 10:10:03 +08:00
Loic Dachary
f152bc69d0 Merge pull request #3068 from ktdreyer/doc-os-recommendations-cleanup
doc: os recommendations cleanup

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-12-03 01:23:52 +01:00
Ken Dreyer
5d3bff0494 doc: rm Fedora minor versions in os recommendations
Fedora doesn't have point releases, so it doesn't make sense to talk
about "Fedora 18.0" or "Fedora 19.0" - it's just "Fedora 18" or "Fedora
19".

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2014-12-02 16:33:00 -07:00
Sage Weil
0d4dd10bb6 os/ObjectStore: drop tolerate_collection_add_enoent
This is no longer needed and clutters the interface.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-02 15:19:40 -08:00
Sage Weil
bc5a22b5dc osd: require SNAPMAPPER feature from peers
This was introduced before cuttlefish.  We require users to upgrade first
to a newer release, so there is no need to support a mixed cluster with
such old code.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-02 15:19:40 -08:00
Loic Dachary
e83321ee09 Merge pull request #3061 from ktdreyer/rpm-ceph-disk-man-page
packaging: package ceph-disk(8)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-12-03 00:18:50 +01:00
Ken Dreyer
b743a95111 packaging: package ceph-disk(8)
The ceph-disk man page was added in
a450cab2b8, but this was not added to the
RPM or DEB packaging. Add it here.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2014-12-02 16:13:19 -07:00
Ken Dreyer
2497f16a04 doc: rm old releases in os recommendations page
Similar to the change in commit
4cdc9c7936, remove the references to old
Ceph releases.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2014-12-02 15:55:47 -07:00