Commit Graph

31213 Commits

Author SHA1 Message Date
John Spray
ce0e3bd188 qa/workunits/snaps: New allow_new_snaps syntax
These were probably just obscuring other failures.

Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: John Spray <john.spray@inktank.com>
2014-02-05 21:00:12 +00:00
Sage Weil
eb18c0a8d3 Merge pull request #1183 from ceph/wip-7336
rgw: fix rgw_read_user_buckets() use of max param

Reviewed-by: Sage Weil <sage@inktank.com>
2014-02-04 21:33:54 -08:00
Yehuda Sadeh
04b1ae466e rgw: fix rgw_read_user_buckets() use of max param
Fixes: #7336

The rgw_read_user_buckets() treated the max param as the max number of
entries to request in a single op, but always fetched the entire list
of buckets. This is wrong, as it should have treated it as the total
number of entries requested. All the callers assume the latter.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2014-02-04 10:37:11 -08:00
Sage Weil
60ca6f699b client: fix warnings
client/Client.cc: In member function 'int Client::_read(Fh*, int64_t, uint64_t, ceph::bufferlist*)':
warning: client/Client.cc:5893:27: comparison between signed and unsigned integer expressions [-Wsign-compare]
client/Client.cc: In member function 'int Client::_write(Fh*, int64_t, uint64_t, const char*)':
warning: client/Client.cc:6235:30: comparison between signed and unsigned integer expressions [-Wsign-compare]

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-03 21:12:41 -08:00
Sage Weil
a23a2c8f01 os/KeyValueStore: fix warning
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-03 17:50:32 -08:00
Sage Weil
8e30db8f2a rest: add a few rest api tests
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-03 17:50:32 -08:00
Sage Weil
eb9ffd5a79 mon: use 'mds set inline_data ...' for enable/disable of inline data
This makes the management interface a bit more consistent.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-03 17:50:32 -08:00
Sage Weil
408b0c8e75 mon: fix 'mds set allow_new_snaps'
We had already added this as a flag (set/unset) when I generalized the
'mds set_max_mds' to be 'ceph mds set <var> <val>'.  Switch the snaps
flag to be a key/value to with true/false (similar to the hashpspool
pool flag) since there are fewer users and the var/val approach is more
general.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2014-02-03 17:50:18 -08:00
Ken Dreyer
f9b9f52420 Merge branch 'next' 2014-02-03 22:39:26 +00:00
Ken Dreyer
3b990136bf v0.76 2014-02-03 18:26:25 +00:00
Sage Weil
7ff2b541c2 client: use 64-bit value in sync read eof logic
The file size can jump to a value that is very much larger than our current
position (for example, it could be a disk image file that gets a sparse
write at a large offset).  Use a 64-bit value so that 'some' doesn't
overflow.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: John Spray <john.spray@inktank.com>
2014-02-03 08:54:14 -08:00
Sage Weil
e4ff4720d5 Merge remote-tracking branch 'gh/next'
Conflicts:
	src/mon/OSDMonitor.cc
	src/osd/OSDMap.h
2014-02-02 09:40:11 -08:00
Sage Weil
29eac1d14e Merge remote-tracking branch 'gh/wip-inline'
Passed fs suite, sage-2014-02-01_22:18:10-fs-wip-inline-testing-basic-plana,
modulo a snap test error in the suite.

Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2014-02-02 09:16:06 -08:00
Sage Weil
9c3a4d8af6 Merge pull request #1165 from mo22/client_fuse_multithreading
client: ceph-fuse use fuse_session_loop_mt to allow multithreaded operat...

Reviewed-by: Sage Weil <sage@inktank.com>
2014-02-01 21:00:41 -08:00
John Wilkins
b717e11b52 Merge pull request #1174 from alram/master
doc: rgw: el6 documentation fixes
2014-01-31 14:20:37 -08:00
Alexandre Marangone
ee4cfda151 doc: rgw: el6 documentation fixes
- fix a couple of typo for repo configuration and service restart
- the ceph package must be installed on RPM distro since the init
script relies on ceph-conf
- Note on radosgw service name for RPM distro

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
2014-01-31 13:55:55 -08:00
David Zafman
dffe6019c3 Merge pull request #1162 from ceph/wip-5997
Fixes: #5997

 Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-01-31 12:35:56 -08:00
David Zafman
48fbccece5 osd: Change some be_compare_scrub_objects() args to const
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
ce1ea619f6 osd: Change be_scan_list() arg to const
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
e1bfed52f9 common: buffer::ptr::cmp() is a const function
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
34eb549cd4 osd: Move the rest of scrubbing routines to the backend
Move enum scrub_error_type to osd_types.h
Move PG::_compare_scrub_objects to ReplicatedBackend::be_compare_scrub_objects
Move PG::_select_auth_object to ReplicatedBackend::be_select_auth_object
Move PG::_compare_scrubmaps to ReplicatedBackend::be_compare_scrubmaps

Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
f9128e89a3 osd: Move PG::_scan_list() to backend as ReplicatedBackend::be_scan_list()
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
David Zafman
37447e758e osd: Add scrub_supported() backend interface
Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-01-31 11:00:22 -08:00
Sage Weil
560f5f1f88 OSDMap: fix deepish_copy_from
Start with a shallow copy!

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit d0f13f5414)

Conflicts:

	src/osd/OSDMap.h
2014-01-31 07:57:20 -08:00
Sage Weil
d5080799c8 OSDMonitor: use deepish_copy_from for remove_down_pg_temp
This is a backport of 368852f6c0.

Make a deep copy of the OSDMap to avoid clobbering the in-memory copy with
the call to apply_incremental.

Fixes: #7060
Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-31 07:57:04 -08:00
Sage Weil
61914d82bf OSDMap: deepish_copy_from()
Make a deep(ish) copy of another OSDMap.  Unfortunatley we can't make the
compiler-generated copy operator/constructors private until c++11.  :(

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit bd54b9841b)
2014-01-31 07:57:01 -08:00
Sage Weil
802692ed8e os/KeyValueStore: fix warning
./os/KeyValueStore.h: In member function ‘std::string KeyValueStore::strip_object_key(uint64_t)’:
warning: ./os/KeyValueStore.h:173:31: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘uint64_t {aka long long unsigned int}’ [-Wformat=]

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-31 07:19:10 -08:00
Sage Weil
f8316f1a1a Merge branch 'wip-inline' of git://github.com/kylinstorage/ceph
Conflicts:
	src/include/ceph_features.h
2014-01-31 07:00:49 -08:00
Sage Weil
3a53d6deae Merge pull request #1171 from ceph/wip-osdmap-features
mon: encode full osdmap with same feature bits as the incremental

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-01-30 21:01:16 -08:00
Josh Durgin
abcc17bf3f Merge pull request #1169 from dachary/wip-ceph-disk
Reviewed-by: Sage Weil <sage.weil@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-01-30 16:04:09 -08:00
Josh Durgin
3665815738 Merge remote-tracking branch 'origin/next'
Conflicts:
	src/test/ceph-disk.sh
2014-01-30 15:40:09 -08:00
Sage Weil
0389f1d62d mon/OSDMonitor: encode full OSDMap with same feature bits as the Incremental
Each monitor is independently encoding the full OSDMap and storing it in
its local store.  Sometime this happens when we do not have a valid value
for quorum_features (for example, it can happen during sync).

Instead, use the feature bits the Incremental was encoded with for the full
OSDMap so that they always match.

Note that this conveniently the *only* place in the mon where we encode
the full OSDMap, so we're capturing all paths.  Yay!

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-30 15:13:05 -08:00
Sage Weil
b9208b4774 OSDMap: note encoding features in Incremental encoding
The monitor will need to know what features the incremental was encoded
with so that it can encode the OSDMap using the same bits.  Introduce a
member that is set during decode.  During encode, encoding the value passed
in by the caller.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-01-30 15:09:58 -08:00
Josh Durgin
ab649919f2 Merge pull request #1170 from ceph/wip-pybind-enverr
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-01-30 13:10:37 -08:00
Ilya Dryomov
e4dd1beae5 pybind: improve EnvironmentError output
Follow 70c7c9e600 ("pybind/rados.py: improve error output") and
improve EnvironmentError output for librbd and libcephfs too.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-01-30 23:04:12 +02:00
Yehuda Sadeh
754ddb16cb rgw: fix build on centos
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2014-01-30 12:17:20 -08:00
Loic Dachary
d11d1880a7 Merge pull request #1145 from dachary/wip-mailmap
mailmap: organization affiliations

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
2014-01-30 12:15:21 -08:00
Loic Dachary
1628423036 mailmap: Rutger ter Borg affiliation
Reviewed-by: Rutger ter Borg <rutger@terborg.net>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
3a1a8c3e8a mailmap: Laurent Barbe affiliation
Reviewed-by: Laurent Barbe <laurent@ksperis.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
5b5bc0bc3e mailmap: anonymous contributions are unaffiliated
there only are a few of them

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
b0fe2a944b mailmap: Andras Elso affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
93a62d73b7 mailmap: Ma Jianpeng affiliation
and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
74d5bf506b mailmap: Simon Leinen is with SWITCH
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
f9132e0a9a mailmap: John Spray is with Inktank
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
49842db15b mailmap: Alan Somers affiliation
Reviewed-by: Alan Somers <asomers@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
79563e1905 mailmap: Jonathan Dieter affiliation
Reviewed-by: Jonathan Dieter <jdieter@lesbg.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
a28f1fa243 mailmap: Christian Marie affiliation
and name normalization

Reviewed-by: Christian Marie <pingu@anchor.net.au>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:07 +01:00
Loic Dachary
aa7fc3bbb1 mailmap: Dan Chai is unaffiliated
and name normalization

Reviewed-by: Dan Chai <tengweicai@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:13:06 +01:00
Loic Dachary
cb9792eeec mailmap: Kai Zhang affiliation
Reviewed-by: Kai Zhang <zakir.exe@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:48 +01:00
Loic Dachary
30f4969f07 mailmap: Ron Allred name normalization
Signed-off-by: Loic Dachary <loic@dachary.org>
2014-01-30 21:12:24 +01:00