Commit Graph

44713 Commits

Author SHA1 Message Date
Josh Durgin
6799f44fa8 Merge pull request #5956 from xinxinsh/wip-13124
unify order limit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-09-22 03:07:43 -04:00
Josh Durgin
de9149d77e Merge pull request #5976 from yuyuyu101/wip-fix-metadata-conf
Librbd: Fix incorrect metadata filter behavior

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-09-22 01:19:58 -04:00
Josh Durgin
19a480b76d Merge pull request #5750 from wonzhq/rbd-write-full
librbd: do write_full for whole object write

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-09-21 19:13:37 -04:00
Gregory Farnum
ac2953a4d7 Merge pull request #5416 from zhouyuan/ceph_fuse_12204
ceph-fuse: warn and shut down when there is no MDS present

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 16:02:33 -07:00
Gregory Farnum
42c657a6a9 Merge pull request #5826 from ukernel/wip-osx-port
fix compilation on OSX/FreeBSD

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:57:13 -07:00
Greg Farnum
fe54bd1bbe Merge branch 'wip-12971' of git://github.com/jcsp/ceph
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Conflicts:
	src/osdc/Objecter.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:55:04 -07:00
Gregory Farnum
2c5dcd34c1 Merge pull request #5644 from majianpeng/mds-support-iohint
Mds journal support iohint

Reviewed-by: John Spray <john.spray@redhat.com>
2015-09-21 15:52:10 -07:00
Gregory Farnum
76e2e6271c Merge pull request #5966 from ukernel/wip-12506
Wip 12506

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:50:28 -07:00
Gregory Farnum
cb7786b17b Merge pull request #5962 from majianpeng/client-fix
Client fix mini bugs.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-21 15:49:34 -07:00
Sage Weil
e664547c22 Merge pull request #6014 from athanatos/wip-13108
Revert "osd: purge the object from the cache when proxying and not pr…

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:51:50 -04:00
Sage Weil
4e7fb86e29 Merge pull request #6015 from athanatos/wip-13143
osd/: find_object_context: return obc for head for snapdir if non null

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:51:07 -04:00
Sage Weil
6f2c2aa6fa Merge pull request #6017 from athanatos/wip-13150
ReplicatedPG::get_snapset_context: set exists to false for new ssc wi…

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:46:33 -04:00
Sage Weil
0bfefdf5b6 Merge pull request #6013 from athanatos/wip-12828
Wip 12828

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-21 14:43:55 -04:00
Yehuda Sadeh
7bb316fbc8 Merge pull request #5918 from oritwas/wip-5378
rgw: make radosgw-admin user rm idempotent

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-09-21 08:35:30 -07:00
Yehuda Sadeh
63be27977e Merge pull request #5996 from rzarzynski/wip-12780
rgw: don't read actual data on user manifest HEAD
2015-09-21 08:22:29 -07:00
Yehuda Sadeh
17b68616c3 Merge pull request #5974 from Sandy4999/wip-rgw-errmsg
rgw: add a new error message for user conflict when using Admin Ops API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-09-21 08:20:55 -07:00
John Spray
07aa448062 Merge pull request #6003 from ukernel/wip-13166
Wip 13166

Reviewed-by: John Spray <john.spray@redhat.com>
2015-09-21 10:25:39 +01:00
Yan, Zheng
e65fb1ba70 mds: adjust MDSRank::incarnation according to mdsmap
When a standby-replay MDS replace failed MDS, we need update its
incarnation.

Fixes: #13166
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-09-21 15:42:10 +08:00
Sage Weil
c4b2d12ad5 Merge pull request #6001 from dachary/wip-13182-crushtool
tests: update to match crushmap validation message
2015-09-20 20:57:13 -04:00
Loic Dachary
21a1e75d8a tests: update to match crushmap validation message
http://tracker.ceph.com/issues/13182 Fixes: #13182

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-21 00:13:08 +02:00
Sage Weil
5e8299f012 Merge remote-tracking branch 'gh/infernalis' 2015-09-20 13:54:19 -04:00
Sage Weil
782855e7d6 Merge pull request #5979 from ceph/wip-crushtest
mon: fix crush testing for new pools

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-09-20 13:50:26 -04:00
Sage Weil
b41408302b Merge pull request #5950 from tchaikov/wip-13112-infernalis
mon/PGMap: calc min_last_epoch_clean when decode

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-20 13:49:36 -04:00
Loic Dachary
642cbd880a Merge pull request #5998 from dachary/wip-13136-python3-coverage
install-deps: enable python3
2015-09-20 17:12:32 +02:00
Loic Dachary
4da6793d8d install-deps: enable python3
The upstream regression has been fixed, we can re-enable python3
support.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-20 13:18:40 +02:00
Sage Weil
f7eb1d8ce6 Merge pull request #5994 from SUSE/wip-13175
doc: do not promise backports to Dumpling

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-19 17:21:10 -04:00
Nathan Cutler
170f9add76 doc: do not promise backports to Dumpling
Dumpling was retired in May 2015.

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

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
2015-09-19 22:30:59 +02:00
John Spray
210156f3d2 Merge pull request #5965 from jcsp/wip-get-or-create-output
mon: fix auth get-or-create output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-09-19 12:03:57 +01:00
Ken Dreyer
498006b390 Merge pull request #5984 from ceph/wip-packages
Fixes locations from ceph.com to download.ceph.com

(For the record, this is to fix http://tracker.ceph.com/issues/13162)

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-18 12:42:15 -06:00
Alfredo Deza
a6f07e9fa3 doc: remove mention of ceph-extra as a requirement
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-09-18 14:20:12 -04:00
Alfredo Deza
c0ef84fd22 doc: remove ceph-extras
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-09-18 14:19:31 -04:00
Alfredo Deza
387d780035 doc: correct links to download.ceph.com
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-09-18 14:19:27 -04:00
John Spray
c1172cadab mon: fix auth get-or-create output
Previously the caps were omitted from the
output: they should be present for this
to fulfil the 'get' part of get-or-create.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-18 18:46:05 +01:00
Samuel Just
7b2fa67a93 ReplicatedPG::get_snapset_context: set exists to false for new ssc with can_create
Otherwise, if we do a proxy_write and don't promote it, the ssc will
stick around with exists = true and cause future reads on snaps for the
object to fail to fall through to the base tier.

Fixes: #13150
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-09-18 10:03:22 -07:00
Yehuda Sadeh
4a8b08d1dd rgw: don't read actual data on user manifest HEAD
Fixes: #12780
We unconditionally read all the data, which is not needed
when doing HEAD operation on user manifest objects.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2015-09-18 18:56:36 +02:00
Sage Weil
bf9c00580f ceph-osd-prestart.sh: no ceph-disk chown
chown -R ceph:ceph $1 is easy enough.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-18 11:40:26 -04:00
Sage Weil
a484bca60a Merge pull request #5980 from liewegas/wip-13059
ceph.spec: fix up /var/run/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-18 11:06:24 -04:00
Boris Ranto
e44d1e07a7 ceph.spec.in: Fix up (/var)/run/ceph creation
Fixes: #13059
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-09-18 11:02:46 -04:00
Kefu Chai
4ec586b8b4 Merge pull request #5977 from tchaikov/wip-size_t-monstore-txn
mon: return size_t from MonitorDBStore::Transaction::size()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-09-18 22:32:41 +08:00
Sage Weil
1b3090d50e mon/OSDMonitor: fix crush injection error message
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-18 09:42:47 -04:00
Sage Weil
524b0bdcc4 mon/OSDMonitor: only test crush ruleset for the newly created pool
Otherwise, we test *all* crush rules.. which might be a lot, and
which is a big waste of time and effort.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-18 09:41:25 -04:00
Sage Weil
aa238e5ed5 crush/CrushTester: allow testing by ruleset
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-18 09:40:13 -04:00
Haomai Wang
4f553b0e2b Librbd: Fix incorrect metadata filter behavior
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-09-18 17:20:23 +08:00
Kefu Chai
3971274b34 mon: return size_t from MonitorDBStore::Transaction::size()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-09-18 17:05:09 +08:00
Sangdi
f25b67faf4 rgw: add a new error message for user conflict when using Admin Ops API
Add a new error message to indicate user conflict, which was using the error code for bucket conflict.

Signed-off-by: Sangdi Xu <xu.sangdi@h3c.com>
2015-09-18 11:18:52 +08:00
Sage Weil
fd5ed1531d Merge pull request #5948 from flyd1005/master
doc: delete wrong description of installing RPMs
2015-09-17 22:14:56 -04:00
Samuel Just
490938e3a9 osd/: find_object_context: return obc for head for snapdir if non null
The head obc may have an in progress operation holding a lock, we
need to block on the lock for ordering reasons.

Fixes: #13143
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-09-17 16:53:07 -07:00
Sage Weil
c37311054d Merge pull request #5926 from dillaman/wip-13082
include/inline_memory: out-of-bounds read on unaligned memory

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-17 15:09:17 -04:00
Yan, Zheng
bdb2fa241b mds: Make sure wanted_state of first MDSBeacon is MDSMap::STATE_BOOT
Fixes: #12506
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-09-18 00:50:53 +08:00
Sage Weil
85bece775c new release key
The previous release key,

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

may have been compromised.

The new release key is

pub   4096R/460F3994 2015-09-15
uid                  Ceph.com (release key) <security@ceph.com>

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-17 12:28:25 -04:00