Commit Graph

42188 Commits

Author SHA1 Message Date
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
Kefu Chai
5a5dc5f0aa Merge pull request #4707 from stiopaa1/IosFwdNew
Removed unnecessary inclusion of iostream in several files

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-10 13:22:00 +08:00
David Zafman
1aa9655f10 tools: For ec pools list objects in all shards if the pgid doesn't specify
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-06-09 18:14:09 -07:00
Sage Weil
98e77d592f mon/PGMap: access num pgs by osd
Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-09 17:56:42 -04:00
Sage Weil
fa0483385b mon/PGMap: fix pg_by_osd
Broken since it was introduced in 7a04762fe0.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-09 17:56:42 -04:00
Sage Weil
abe4ec293d rgw: remove trailing :port from host for purposes of subdomain matching
Some clients (ahem, CrossFTP) include the :port in the HTTP_HOST header.
Strip it out.

Switch req_info field to a std::string and avoid copying it in preprocess.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-09 14:15:10 -04:00
Sage Weil
8d7024a20e Merge pull request #4775 from yuyuyu101/wip-async-crc-decouple
AsyncMessenger: Make send/receive logic independent

Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-09 10:54:11 -07:00
Loic Dachary
e4011158e7 tests: ceph_erasure_code_non_regression s/stipe/stripe/
Synchronize withe the ceph-erasure-code-corpus submodule in which all
file names were modified to fix the typo.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-06-09 16:35:02 +02:00
Loic Dachary
7e0536af25 Merge pull request #4815 from dachary/wip-9720-erasure-code-corpus-variants
tests: sync ceph-erasure-code-corpus to verify jerasure variants 

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
2015-06-09 16:28:48 +02:00
Loic Dachary
b239945374 Merge pull request #4908 from dachary/wip-11931-parallel-tests
tests: automake 1.11 needs parallel-tests

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-06-09 15:50:12 +02:00
Loic Dachary
9193afd3d2 tests: automake 1.11 needs parallel-tests
Prior to automake 1.13 the default behavior was serial-tests meaning
tests from make check were run one after the other and their output sent
to stdout/stderr. From automake 1.13 up the default became
parallel-tests which logs the output of each individual test in a
separate .log file and allows them to run in parallel.

http://lists.gnu.org/archive/html/automake/2012-12/msg00038.html

Enable parallel-tests so that tests can always run in parallel, even
with automake 1.11 which is the version found in CentOS 6.5 and Ubuntu
12.04 precise.

A nice side effect of always having the logs in separate files is that
tests do not need to worry about being too verbose because their output
will only be read for diagnostic purposes.

http://tracker.ceph.com/issues/11931 Fixes: #11931
http://tracker.ceph.com/issues/11906 Fixes: #11906

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-06-09 14:56:49 +02:00
Michal Jarzabek
83f819877f Removed unnecessary inclusion of iostream
In several files the iostream wasn't being used, so it got removed.
In other files the iostream inclusion was replaced by including iosfwd
(for forward declarations), which is much smaller header than iostream,
  so in theory should reduce compilation time.
To make this work some of the functions must have been moved from .h to .cc file.
3 functions also needed to have inline removed - this shouldn't affect
performance in any way: two of them are
probably too long to have been inlined anyway and the third one is for
error reporting, so probably won't be called too often.

test/Makefile-client.am: added linker libs

This was required to avoid linker error when linking
src/test/cls_rbd/test_cls_rbd.cc file. Makefile was specyfing
libcommon.a as a part of a linker command even though this wasn't
required and wasn't being linked against. When inline functions from
buffer.h were moved to buffer.cc(and inline was removed) the
libcommon.a library became necessary. This wouldn't link without also
including additional libraries(CRYPTO_LIBS and EXTRA_LIBS)

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2015-06-09 07:26:56 +01:00
Loic Dachary
bfb92bd14b Merge pull request #4879 from SUSE/wip-master-specfile-cleanup
ceph.spec.in: remove duplicate BuildRequires

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-09 07:32:17 +02:00