Commit Graph

42205 Commits

Author SHA1 Message Date
Orit Wasserman
6ef40d7c9e cmake: add missing RadosDump.cc, RadosImport.cc and PoolDump.cc
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-06-15 11:39:17 +02:00
Kefu Chai
ac4477926f Merge pull request #4690 from branch-predictor/wip-radosbench-memjuggle
tools: improve the performance of rados and rest_bench

Don't delete, recreate and re-fill buffers in rados bench. Fixes the high CPU usage by rados bench on fast SSDs 
and ramdisks/memstore.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-15 00:03:45 +08:00
Sage Weil
a756a32d09 Merge pull request #4950 from SUSE/wip-osd-spelling
osd_types.{cc,h}: fix three typos in comments

Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-13 11:59:39 -07:00
Nathan Cutler
724c139cca osd_types.{cc,h}: fix three typos in comments
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-06-13 20:36:09 +02:00
Haomai Wang
e7c91c729e Merge pull request #4758 from xinxinsh/wip-kv-dump-transaction
dump keyvaluestore transaction to a file

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
2015-06-13 22:49:44 +08:00
Loic Dachary
aa8a56391d Merge pull request #4940 from swamireddy/wip-v094-mailmap
mailmap: Yuri Weinstein affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-13 11:26:43 +02:00
Yehuda Sadeh
df4d4b42ea Merge pull request #4947 from oritwas/fix-cmake
cmake: Remove rados_sync.cc, rados_import.cc and rados_export.cc deleted files

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-06-12 18:45:46 -07:00
Orit Wasserman
f620a8a648 Remove rados_sync.cc, rados_import.cc and rados_export.cc deleted files
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-06-13 03:25:20 +02:00
Michal Jarzabek
55d9747e81 mon: add 'PGs' column to 'ceph osd df'
Fixes: #11882

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-12 16:00:51 -04:00
Yehuda Sadeh
69989ffa3c Merge pull request #4752 from wuxingyi/wip-11749
rgw: fix data corruption when race condition

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-06-12 11:19:50 -07:00
Yehuda Sadeh
21f850eb68 Merge pull request #4900 from abhidixit/trans_id
Transaction Id added in response for S3 and Swift requests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-06-12 10:17:31 -07:00
Swami Reddy
45392a2de2 mailmap: Yuri Weinstein affiliation
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2015-06-12 20:19:58 +05:30
Kefu Chai
95ba9677ba Merge pull request #4726 from tchaikov/wip-11680-check-empty-crushmap
mon: check new crush for unknown name/type

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-12 09:19:51 +08:00
Loic Dachary
0698bde96a Merge pull request #4932 from dzafman/wip-cot-import
test, tools: Improve ceph-objectstore-tool import error handling and …

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-12 00:35:21 +02:00
Sage Weil
f784db0b74 Merge pull request #4933 from dachary/wip-releases
doc: add v0.94.2 to the release timeline

Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-11 13:54:07 -07:00
Loic Dachary
5b29a57b9d doc: add v0.94.2 to the release timeline
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-06-11 22:35:25 +02:00
David Zafman
ddc4d52782 test, tools: Improve ceph-objectstore-tool import error handling and add tests
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-11 12:57:10 -07:00
David Zafman
0db3ba157e Merge pull request #4926 from dzafman/wip-omaptool
ceph-osdomap-tool: Fix argument handling

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-11 10:56:56 -07:00
Sage Weil
7594963378 Merge pull request #4914 from liewegas/wip-mon-pg-by-osd
mon: fix pg_by_osd in PGMap

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-11 10:01:07 -07:00
Yan, Zheng
8b47a62583 Merge pull request #4930 from ceph/wip-11959
qa: use "sudo cp" in multiple_rsync.sh
2015-06-11 21:28:11 +08:00
John Spray
832f33ad5e qa: use "sudo cp" in multiple_rsync.sh
VirtualBox has some files with weird
permissions in its /usr/lib, which was
tripping up this usually-safe operation
when run as an unprivileged user.

Fixes: #11959
Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-11 11:11:44 +01:00
Kefu Chai
393c624189 Merge pull request #4921 from dachary/wip-11952-test-ceph-disk
tests: ceph-disk tests need to install pip > 6.1

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-11 16:42:36 +08:00
David Zafman
f23ff731ed ceph-osdomap-tool: Fix argument handling
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-10 18:49:00 -07:00
Sage Weil
b4ad260128 mon/PGMap: fix pgmap stat adjustment during map_pg_creates()
PGMonitor::map_pg_creates() is the only caller that passes sumonly=true,
which is necessary to avoid modifying creating_pgs while it is iterating
over it. However, everything else we *do* want to update--especially the
osd counts.

Rename the arg and skip only the creating bit.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-10 17:41:57 -07:00
David Zafman
2671775437 Merge pull request #4863 from ceph/wip-9964-nosharding
rados import/export (minus pgls sharding)

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2015-06-10 16:57:15 -07:00
David Zafman
c0c6efb9ce test: Add --dry-run and --no-overwrite testing of rados import
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-10 23:50:49 +01:00
John Spray
14819507e1 tools/rados: dry-run/no-overwrite args for import
These were supported by the old objectstoretool
hook into RadosImport: wire them up here too.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 23:50:49 +01:00
John Spray
d1d6196346 tools: better error message in objectstoretool
...for the case where someone exports a pool
with "rados export" and then tries to import
it into a PG.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 23:50:49 +01:00
David Zafman
83a42203c4 test: Switch ceph-objectstore-tool import-rados to rados import
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-10 23:50:46 +01:00
John Spray
460200c7bd tools: remove objectstoretool's rados-import
Same functionality now exposed as "rados import".

This removes objectstoretool's librados dependency.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:42 +01:00
John Spray
288331468c tools: remove old rados_sync code
This is the code that used to sit behind the
old import/export commands that have been
disabled for some time.

Replaced by the new import/export commands.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:42 +01:00
John Spray
391c72f38c tools: implement rados import/export
New PoolDump (export) class to dump pool contents
in format compatible with ceph-objectstore-tool,
and wire up RadosImport class (import).

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:41 +01:00
John Spray
a45f8fe11b tools: refactor RadosImport to pass ioctx
Callers from rados.cc will already have an ioctx,
whereas objectstoretool passes in a pool name.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:41 +01:00
John Spray
2991beebad tools: remove RadosDump::debug in favour of dout
This attribute was a hangover from objectstore-tool

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:41 +01:00
John Spray
f477b4458d tools: add support for pool exports in RadosImport
Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:41 +01:00
John Spray
8e5594da29 tools: clean up errors in ceph-objectstore-tool
We use negative error codes everywhere else, should
use them here too.  Also add a couple of strategically
placed prints.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:41 +01:00
John Spray
d26086d35a tools: refactor objectstore tool
...to expose the definitions of the object dump
format (RadosDump) for use in rados import/export.

The serialized->RADOS code is now RadosImport, and
the serialized->ObjectStore code is ObjectStoreTool.

This is a step toward #9964, which should use the
same on serialization format as the existing
objectstore-tool dumps.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-06-10 22:37:41 +01:00
Sage Weil
6490850080 Merge pull request #4922 from dachary/wip-releases
doc: add v9.0.1 to the release timeline

Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-10 12:59:54 -07:00
Loic Dachary
488c042ff0 doc: add v9.0.1 to the release timeline
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-06-10 21:50:07 +02:00
Sage Weil
306345b29c doc/release-notes: v0.94.2
Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-10 12:48:41 -07:00
Sage Weil
f5da2fc5c8 doc/release-notes: v9.0.1
Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-10 12:42:48 -07:00
Loic Dachary
1e77fcfd98 tests: ceph-disk tests need to install pip > 6.1
Otherwise it will not be able to use the wheelhouse.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-06-10 21:00:42 +02:00
Loic Dachary
9c6da3b087 Merge pull request #4915 from ceph/wip-cot-list
tools: For ec pools list objects in all shards if the pgid doesn't sp…

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-10 20:28:05 +02:00
Sage Weil
c06fd71a1a Merge remote-tracking branch 'gh/next' 2015-06-10 13:14:46 -04:00
Loic Dachary
1c1f2c3243 Merge pull request #4910 from dachary/wip-11932-non-regression-typo
tests: ceph_erasure_code_non_regression s/stipe/stripe/
2015-06-10 17:43:55 +02:00
Yehuda Sadeh
20f49348a3 Merge pull request #4873 from liewegas/wip-rgw-civetweb-port
rgw: strip off port from HTTP_HOST when determining bucket from URL

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-06-10 08:12:05 -07:00
Gregory Farnum
5441f89c02 Merge pull request #4838 from ceph/wip-10950
#10950: Fix confusing errors using "mds rm"

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-06-10 07:18:48 -07:00
Gregory Farnum
04a11f0f2f Merge pull request #4835 from ceph/wip-11746
tools: chunk reads in Dumper

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-06-10 07:17:43 -07:00
Gregory Farnum
b408f009b6 Merge pull request #4825 from tchaikov/wip-drop-ignored-mdsbeacon
mon: drop ignored mdsbeacon

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-06-10 07:15:38 -07:00
Loic Dachary
2d76e2cbba tests: erasure-code non regression tests must skip isa on i386
When the isa plugin is not present, the isa plugin payloads are not
tested. When that happens, remember that it was intentional by storing
the path that would have been tested so that the inventory is complete.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-06-10 15:26:37 +02:00